merging

api/post.go

@@ -632,15 +632,22 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team,
 							alreadySeen := make(map[string]string)
 
 							for _, session := range sessions {
-								if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" && strings.HasPrefix(session.DeviceId, "apple:") {
+								if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" &&
+									(strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_APPLE+":") || strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_ANDROID+":")) {
 									alreadySeen[session.DeviceId] = session.DeviceId
 
 									msg := model.PushNotification{}
-									msg.Platform = model.PUSH_NOTIFY_APPLE
 									msg.Badge = 1
-									msg.DeviceId = strings.TrimPrefix(session.DeviceId, "apple:")
 									msg.ServerId = utils.CfgDiagnosticId
 
+									if strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_APPLE+":") {
+										msg.Platform = model.PUSH_NOTIFY_APPLE
+										msg.DeviceId = strings.TrimPrefix(session.DeviceId, model.PUSH_NOTIFY_APPLE+":")
+									} else if strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_ANDROID+":") {
+										msg.Platform = model.PUSH_NOTIFY_ANDROID
+										msg.DeviceId = strings.TrimPrefix(session.DeviceId, model.PUSH_NOTIFY_ANDROID+":")
+									}
+
 									if channel.Type == model.CHANNEL_DIRECT {
 										msg.Message = senderName + " sent you a direct message"
 									} else {

config/config.json

@@ -109,28 +109,5 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
-    },
-    "GoogleSettings": {
-        "Enable": false,
-        "Secret": "",
-        "Id": "",
-        "Scope": "",
-        "AuthEndpoint": "",
-        "TokenEndpoint": "",
-        "UserApiEndpoint": ""
-    },
-    "LdapSettings": {
-        "Enable": false,
-        "LdapServer": null,
-        "LdapPort": 389,
-        "BaseDN": null,
-        "BindUsername": null,
-        "BindPassword": null,
-        "FirstNameAttribute": null,
-        "LastNameAttribute": null,
-        "EmailAttribute": null,
-        "UsernameAttribute": null,
-        "IdAttribute": null,
-        "QueryTimeout": 60
     }
-}
+}

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-rc2/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 /

web/react/components/user_settings/user_settings_security.jsx

@@ -206,7 +206,7 @@ export default class SecurityTab extends React.Component {
                     <div>
                         <a
                             className='btn btn-primary'
-                            href={'/' + teamName + '/claim?email=' + user.email}
+                            href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email)}
                         >
                             {'Switch to using email and password'}
                         </a>
@@ -221,7 +221,7 @@ export default class SecurityTab extends React.Component {
                     <div>
                         <a
                             className='btn btn-primary'
-                            href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GITLAB_SERVICE}
+                            href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GITLAB_SERVICE}
                         >
                             {'Switch to using GitLab SSO'}
                         </a>
@@ -236,7 +236,7 @@ export default class SecurityTab extends React.Component {
                     <div>
                         <a
                             className='btn btn-primary'
-                            href={'/' + teamName + '/claim?email=' + user.email + '&new_type=' + Constants.GOOGLE_SERVICE}
+                            href={'/' + teamName + '/claim?email=' + encodeURIComponent(user.email) + '&new_type=' + Constants.GOOGLE_SERVICE}
                         >
                             {'Switch to using Google SSO'}
                         </a>