From 51bd6808bf7ce9fff438e154271e33978e1cd9bc Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 11 Jan 2016 14:19:47 -0500 Subject: Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42b485742..59aca0436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,9 +112,12 @@ The following options are not present in the System Console, and can be modified - Searching for a phrase in quotations returns more than just the phrase on Mattermost installations with a Postgres database - Deleted/Archived channels are not removed from the "More" menu of the person that deleted/archived the channel until after refresh - Search results don't highlight searches for @username, non-latin characters, or terms inside Markdown code blocks +- Searching for a username or hashtag containing a dot returns replaces the dot with an "or" +- Browser tab * to indicate Unreads does not work on IE11 - Hashtags less than three characters long are not searchable - After deactivating a team member, the person remains in the channel counter - Certain symbols (<,>,-,+,=,%,^,#,*,|) directly before or after a hashtag cause the message to not show up in a hashtag search +- Security tab > Active Sessions reports iOS devices as "unknown" #### Contributors -- cgit v1.2.3-1-g7c22 From 0b9570d059aa694fc1ce02863de5fee7e461b2dc Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 11 Jan 2016 14:22:07 -0500 Subject: Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59aca0436..087439923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -113,7 +113,6 @@ The following options are not present in the System Console, and can be modified - Deleted/Archived channels are not removed from the "More" menu of the person that deleted/archived the channel until after refresh - Search results don't highlight searches for @username, non-latin characters, or terms inside Markdown code blocks - Searching for a username or hashtag containing a dot returns replaces the dot with an "or" -- Browser tab * to indicate Unreads does not work on IE11 - Hashtags less than three characters long are not searchable - After deactivating a team member, the person remains in the channel counter - Certain symbols (<,>,-,+,=,%,^,#,*,|) directly before or after a hashtag cause the message to not show up in a hashtag search -- cgit v1.2.3-1-g7c22 From 63b5182150ac03af41700e016e048cffcce293fc Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 11 Jan 2016 14:25:28 -0500 Subject: Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 087439923..0a4447a02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,7 +112,7 @@ The following options are not present in the System Console, and can be modified - Searching for a phrase in quotations returns more than just the phrase on Mattermost installations with a Postgres database - Deleted/Archived channels are not removed from the "More" menu of the person that deleted/archived the channel until after refresh - Search results don't highlight searches for @username, non-latin characters, or terms inside Markdown code blocks -- Searching for a username or hashtag containing a dot returns replaces the dot with an "or" +- Searching for a username or hashtag containing a dot returns a search where the dot is replaced with the "or" operator - Hashtags less than three characters long are not searchable - After deactivating a team member, the person remains in the channel counter - Certain symbols (<,>,-,+,=,%,^,#,*,|) directly before or after a hashtag cause the message to not show up in a hashtag search -- cgit v1.2.3-1-g7c22 From a457a83c6152049e2a1871944bf8a9e8c688d981 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Mon, 11 Jan 2016 16:50:15 -0500 Subject: Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a4447a02..5849b30b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -117,6 +117,7 @@ The following options are not present in the System Console, and can be modified - After deactivating a team member, the person remains in the channel counter - Certain symbols (<,>,-,+,=,%,^,#,*,|) directly before or after a hashtag cause the message to not show up in a hashtag search - Security tab > Active Sessions reports iOS devices as "unknown" +- Getting a permalink for the second message or later consecutively sent in a group by the same author displaces the copy link popover or causes an error #### Contributors -- cgit v1.2.3-1-g7c22 From 16263f4e260765b3f48cc98f72c7a50cbb40278c Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 11 Jan 2016 16:52:30 -0600 Subject: Fixing dockerfile --- docker/1.4/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/1.4/Dockerfile b/docker/1.4/Dockerfile index 0e8b8853f..8dcea3927 100644 --- a/docker/1.4/Dockerfile +++ b/docker/1.4/Dockerfile @@ -34,8 +34,8 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -RUN wget --no-check-certificate https://s3.amazonaws.com/mattermost-travis-master/mattermost.tar.gz -RUN tar -zxvf mattermost.tar.gz --strip-components=1 && rm mattermost.tar.gz +ADD https://github.com/mattermost/platform/releases/download/v1.4.0/mattermost.tar.gz / +RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh / -- cgit v1.2.3-1-g7c22 From 1763ff6d72bae7dc57475dc73a03a7c0f12acc90 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 12 Jan 2016 08:02:38 -0500 Subject: Support old oauth routes --- api/user.go | 2 +- web/web.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/user.go b/api/user.go index d4c7fcaf5..00d637ec2 100644 --- a/api/user.go +++ b/api/user.go @@ -1790,7 +1790,7 @@ func GetAuthorizationCode(c *Context, service, teamName string, props map[string props["team"] = teamName state := b64.StdEncoding.EncodeToString([]byte(model.MapToJson(props))) - redirectUri := c.GetSiteURL() + "/" + service + "/complete" + redirectUri := c.GetSiteURL() + "/signup/" + service + "/complete" // Remove /signup after a few releases (~1.8) authUrl := endpoint + "?response_type=code&client_id=" + clientId + "&redirect_uri=" + url.QueryEscape(redirectUri) + "&state=" + url.QueryEscape(state) diff --git a/web/web.go b/web/web.go index bf1208adc..337ed311d 100644 --- a/web/web.go +++ b/web/web.go @@ -70,6 +70,8 @@ func InitWeb() { mainrouter.Handle("/verify_email", api.AppHandlerIndependent(verifyEmail)).Methods("GET") mainrouter.Handle("/find_team", api.AppHandlerIndependent(findTeam)).Methods("GET") mainrouter.Handle("/signup_team", api.AppHandlerIndependent(signup)).Methods("GET") + mainrouter.Handle("/login/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") + mainrouter.Handle("/signup/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") mainrouter.Handle("/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") mainrouter.Handle("/admin_console", api.UserRequired(adminConsole)).Methods("GET") @@ -711,7 +713,7 @@ func completeOAuth(c *api.Context, w http.ResponseWriter, r *http.Request) { code := r.URL.Query().Get("code") state := r.URL.Query().Get("state") - uri := c.GetSiteURL() + "/" + service + "/complete" + uri := c.GetSiteURL() + "/signup/" + service + "/complete" // Remove /signup after a few releases (~1.8) if body, team, props, err := api.AuthorizeOAuthUser(service, code, state, uri); err != nil { c.Err = err -- cgit v1.2.3-1-g7c22 From d1eb3eef309fb6b859511123cf2507e92b3ced49 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 12 Jan 2016 08:04:55 -0500 Subject: Add removal comments --- web/web.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/web.go b/web/web.go index 337ed311d..c0fbb9808 100644 --- a/web/web.go +++ b/web/web.go @@ -70,8 +70,8 @@ func InitWeb() { mainrouter.Handle("/verify_email", api.AppHandlerIndependent(verifyEmail)).Methods("GET") mainrouter.Handle("/find_team", api.AppHandlerIndependent(findTeam)).Methods("GET") mainrouter.Handle("/signup_team", api.AppHandlerIndependent(signup)).Methods("GET") - mainrouter.Handle("/login/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") - mainrouter.Handle("/signup/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") + mainrouter.Handle("/login/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") // Remove after a few releases (~1.8) + mainrouter.Handle("/signup/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") // Remove after a few releases (~1.8) mainrouter.Handle("/{service:[A-Za-z]+}/complete", api.AppHandlerIndependent(completeOAuth)).Methods("GET") mainrouter.Handle("/admin_console", api.UserRequired(adminConsole)).Methods("GET") -- cgit v1.2.3-1-g7c22 From 6ce6115100aea3b11e113cc805abfaff89af12c4 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 12 Jan 2016 14:11:18 -0600 Subject: Update docker to 1.4 RC2 --- docker/1.4/Dockerfile | 2 +- docker/1.4/Dockerrun.aws.zip | Bin 1043 -> 1046 bytes docker/1.4/Dockerrun.aws/Dockerrun.aws.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/1.4/Dockerfile b/docker/1.4/Dockerfile index 8dcea3927..97a863897 100644 --- a/docker/1.4/Dockerfile +++ b/docker/1.4/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.4.0/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.4.0-rc1/mattermost.tar.gz / RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz ADD config_docker.json / ADD docker-entry.sh / diff --git a/docker/1.4/Dockerrun.aws.zip b/docker/1.4/Dockerrun.aws.zip index 272ea9c54..0ea2ad972 100644 Binary files a/docker/1.4/Dockerrun.aws.zip and b/docker/1.4/Dockerrun.aws.zip differ diff --git a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json b/docker/1.4/Dockerrun.aws/Dockerrun.aws.json index 654961589..2d107d41a 100755 --- a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json +++ b/docker/1.4/Dockerrun.aws/Dockerrun.aws.json @@ -1,7 +1,7 @@ { "AWSEBDockerrunVersion": "1", "Image": { - "Name": "mattermost/platform:1.4", + "Name": "mattermost/platform:1.4rc2", "Update": "true" }, "Ports": [ -- cgit v1.2.3-1-g7c22