Merge pull request #1876 from mattermost/release-1.4

Release 1.4 RC2

6 files changed, 10 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42b485742..5849b30b9 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 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
+- 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 
 
diff --git a/api/user.go b/api/user.go
index 6c0ce86d6..d014ab995 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/docker/1.4/Dockerfile b/docker/1.4/Dockerfile
index 0e8b8853f..97a863897 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-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
--- a/docker/1.4/Dockerrun.aws.zip
+++ b/docker/1.4/Dockerrun.aws.zip
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": [

diff --git a/web/web.go b/web/web.go
index 5cc0e288d..634a9d851 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")  // 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")
@@ -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