diff options
18 files changed, 137 insertions, 80 deletions
diff --git a/.travis.yml b/.travis.yml index 7e54d3335..c88267206 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ addons: - 127.0.0.1 dockerhost before_deploy: - sudo rm -rf dist/mattermost + - sudo chown `whoami` dist/mattermost.tar.gz + - sudo chmod 777 dist/mattermost.tar.gz - rvm 1.9.3 do gem install mime-types -v 2.6.2 deploy: # Github releases, builds only on tags diff --git a/CHANGELOG.md b/CHANGELOG.md index 25d188397..a9dad1798 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,8 +70,8 @@ Multiple settings were added to [`config.json`](./config/config.json). These opt - Removed: `"ApplePushServer": ""` which is replaced with `SendPushNotifications` and `PushNotificationServer` - Removed: `"ApplePushCertPublic": ""` which is replaced with `SendPushNotifications` and `PushNotificationServer` - Removed: `"ApplePushCertPrivate": ""` which is replaced with `SendPushNotifications` and `PushNotificationServer` - - Added: `"SendPushNotifications": true` to control whether mobile push notifications are sent to the server specified in `PushNotificationServer` - - Added: `"PushNotificationServer": "https://push.mattermost.com"` to specify the address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services) + - Added: `"SendPushNotifications": false` to control whether mobile push notifications are sent to the server specified in `PushNotificationServer` + - Added: `"PushNotificationServer": ""` to specify the address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services) #### Known Issues @@ -81,6 +81,7 @@ Multiple settings were added to [`config.json`](./config/config.json). These opt - No scroll bar in center channel - Pasting images into text box fails to upload on Firefox, Safari, and IE11 - Slack import @mentions break +- Usernames containing a "." do not get mention notifications #### Contributors diff --git a/doc/install/Configuration-Settings.md b/doc/install/Configuration-Settings.md index 46a6defdf..5f9b3b62d 100644 --- a/doc/install/Configuration-Settings.md +++ b/doc/install/Configuration-Settings.md @@ -146,10 +146,10 @@ Port of SMTP email server. #### Push Notification Settings -```"SendPushNotifications": true``` +```"SendPushNotifications": false``` "true": Your mattermsot server sends mobile push notifications to the server specified in **PushNotificationServer**; "false": Mobile push notifications are disabled. -```"PushNotificationServer": "https://push.mattermost.com"``` +```"PushNotificationServer": ""``` Address of the proxy server that re-sends push notifications to their respective services like APNS (Apple Push Notification Services). diff --git a/doc/process/release-process.md b/doc/process/release-process.md index 96bd2b050..294f5aa79 100644 --- a/doc/process/release-process.md +++ b/doc/process/release-process.md @@ -1,68 +1,81 @@ -We're working on making internal processes in the Mattermost core team more transparent for the community. Below is a working draft of our software development process, which will be updated live as we refine our process. - -Questions, feedback, comments always welcome, - ----------- +# Mattermost Release Process Mattermost core team works on a monthly release process, with a new version shipping on the 16th of each month. This document outlines the development process for the Mattermost core team, which draws from what we find works best for us from Agile, Scrum and Software Development Lifecycle approaches. -This is a working document that will update as our process evolves. - +Notes: +- All cut-off dates are based on 10am PST (UTC-07/08) on the day stated. +- T-minus counts are measured in "working days" (weekdays other than major holidays concurrent in US and Canada) prior to release day. -### - Beginning of release -- (Ops) Queue an agenda item for first team meeting of the release to review Roadmap +### (Code complete date of previous release) Beginning of release +- Pre-work for the current release begins at the code complete date of the previous release. See "Code Complete" section below for details. -### - (10 weekdays before release date) Cut-off for major features -- No major features can be committed to the current release after this date -- (Dev) Prioritize reviewing, updating, and merging of all pull requests that are going to make it into the release - - There should be no more tickets in the [pull request queue](https://github.com/mattermost/platform/pulls) marked for the current release +### (T-minus 10 working days) Cut-off for major features +- No pull requests for major features should be submitted to the current release after this date (except if release manager decides to add "release-exception" label) +- (Ops) Post this checklist in Release channel +- (PM) Write compatibility updates for config.json and database changes [See example](https://github.com/mattermost/platform/blob/master/CHANGELOG.md#compatibility) +- (PM) Confirm changes to config.json in compatibility section of Changelog are written back to [settings documentation](https://github.com/mattermost/platform/blob/master/doc/install/Configuration-Settings.md) +- (Dev) Prioritize reviewing, updating, and merging of pull requests for current release until there are no more tickets in the [pull request queue](https://github.com/mattermost/platform/pulls) marked for the current release - (Leads) Meets to prioritize the final tickets of the release - Backlog is reviewed and major features that won’t make it are moved to next release - Triage tickets - - Review roadmap for next release -- (Marketing) Writes the "Highlights" section of the Changelog -- (PM) Write compatibility updates for config.json and database changes [See example](https://github.com/mattermost/platform/blob/master/CHANGELOG.md#compatibility) + - Finalize roadmap for next release + - Draft roadmap for release after next (used to prioritize design tasks) +- (Marketing) Drafts marketing bullet points for next release based off of roadmap +- (Marketing) Submits pull request for "Highlights" section of the Changelog +- (Marketing) Notes date of announcements in release channel - (PM) Update [Upgrade Guide](https://github.com/mattermost/platform/blob/master/doc/install/Upgrade-Guide.md) for any steps needed to upgrade to new version -- (PM) Prepare tickets for cutting RCs builds, filing issue in GitLab omnibus to take RC candidate, testing GitLab RC with Mattermost -- (Stand-up) Each team member discusses worst bug - -### - (8 weekdays before release date) Feature Complete and Stabilization -- After the cut-off time for Feature Complete, Dev prioritizes reviewing PRs and committing to master so Stabilization period can begin, with testing and high priority bug fixes -- During Stabilization period only BUGS can be committed to master, non-bug tickets are tagged for next version and wait until after a release candidate is cut to be added to master - - (PM) Review all [S1 bugs](https://mattermost.atlassian.net/secure/IssueNavigator.jspa?mode=hide&requestId=10600) and mark important ones as high priority - - (Dev + PM) Exceptions can be made by triage team consensus across PM and Dev. List of approved changes for release candidate 1 here: https://mattermost.atlassian.net/issues/?filter=10204 -- (PM) Documentation +- (PM) Prepare tickets for [cutting RC builds](https://mattermost.atlassian.net/browse/PLT-985), [creating the final release candidate](https://mattermost.atlassian.net/browse/PLT-986), [creating AMIs](https://mattermost.atlassian.net/browse/PLT-1213), and [testing GitLab RC with Mattermost](https://mattermost.atlassian.net/browse/PLT-1013) +- (Stand-up) Each team member discusses worst bug (10-15s) + +### (T-minus 8 working days) Feature Complete and Stabilization +- No pull requests for features can be submitted to the current release after this date (except if release manager add "release-exception" label to Jira ticket) +- (Ops) Post this checklist in Release channel +- (Dev) Prioritize reviewing, updating, and merging of pull requests for current release until there are no more tickets in the [pull request queue](https://github.com/mattermost/platform/pulls) marked for the current release +- **Stablization** period begins when all features for release have been committed. + - During this period, only **bugs** can be committed to master. Non-bug pull requests are tagged for next version and wait until after a release candidate is cut to be committed to master + - (RM) Exceptions can be made by release manager by setting priority to "Highest" and labelling "release-exception", which will add ticket to [Hotfix list for release candidate](https://mattermost.atlassian.net/issues/?filter=10204). + - (PM) Review all [Severity 1 bugs (data loss or security)](https://mattermost.atlassian.net/secure/IssueNavigator.jspa?mode=hide&requestId=10600) to consider for adding to Hotfix list. +- (PM) Complete documentation - (PM) Make Changelog PR with updates for latest feature additions and changes - (PM) Make Changelog PR with updates to contributors - (PM) Make NOTICE.txt PR for any new libraries added from dev, if not added already - (PM) Prioritize any developer documentation tickets -- (PM and devs) Sign-off testing of their feature areas (i.e. PM/dev either signs-off that their area is well tested, or they flag that potential quality issues may exist) -- (Ops) Mail out mugs to any new contributors -- (Team) Select "Top Contributor" for the release from external contributions to be mentioned in release announcement -- (Marketing) Decides announce date (discuss in meeting) + - (PM) Draft [GitLab ticket](https://gitlab.com/gitlab-org/omnibus-gitlab/issues/942) to take next Mattermost version in the Omnibus, but do not post until RC1 is cut +- (PM) Check testing is complete + - (PM) Works with Ops to check the [Quality Gate](https://github.com/mattermost/process/blob/master/release/quality-gates.md) for feature complete + - (PM + Dev) Sign-off testing of their feature areas (i.e. PM/dev either signs-off that their area is well tested, or they flag that potential quality issues may exist) +- **(Team) Feature Complete Meeting (10:15am PST)** + - (PM) Leads review of Changelog + - (Team) Each team member discusses worst bug (10-15s) + - (PM) Review feature list for next release + - (Marketing) Share draft of marketing announce for next release +- (Marketing) Communicates checklist of items needed by specific dates to write the blog post announce (e.g. screenshots, GIFs, - (Ops) Post Announce Date in Release channel + update the channel header to reflect date -- (Marketing) Communicates checklist of items needed by specific dates to write the blog post announce (e.g. screenshots, GIFs, documentation) and begins to write the blog post, tweet, and email for the release announcement -- (PM) Works with Ops to check the Quality Gate for feature complete -- (PM) Communicate to team the plan for next release -- (Stand-up) Each team member discusses worst bug +- (Ops) Mail out mugs to any new contributors -### - (5 weekdays before release date) Code Complete and Release Candidate Cut -- (Team) Meets to discuss release at 10am PST - - (PM) Each area changed in latest release is assigned a PM owner to lead testing - - (Ops) Walks through each item of the **Code Complete and Release Candidate Cut** checklist +### (T-minus 5 working days) Code Complete and Release Candidate Cut +- (Ops) Post this checklist in Release channel +- (Ops) For the next release, create team meetings on Feature Complete and Code Complete dates +- (PM) Remove "Under Development" notice for current release from Changelog on master +- **(Team) Code Complete Meeting (10:15am PST meeting)** + - (Ops) Walks through each item of this checklist + - (PM) Assigns each area of the release testing spreadsheet to a team member - (Dev) Last check of tickets that need to be merged before RC1 - - (Team) Each team member discusses worst bug -- After 10am PST meeting the release is considered “Code Complete”. - - (Dev) Completes final reviews and updates of PRs marked for the release version - - There should be no more tickets in the [pull request queue](https://github.com/mattermost/platform/pulls) marked for the current release - - Master is tagged and branched and “Release Candidate 1″ is cut (e.g. 1.1.0-RC1) according to the Release Candidate Checklist + - (Team) Each team member discusses worst bug (10-15s) +- **Code Complete** is declared after meeting + - (Dev) Prioritize reviewing, updating, and merging of pull requests for current release until there are no more tickets in the [pull request queue](https://github.com/mattermost/platform/pulls) marked for the current release + - (Build) Master is tagged and branched and “Release Candidate 1″ is cut (e.g. 1.1.0-RC1) according to the [Release Candidate Checklist](https://github.com/mattermost/process/blob/master/release/create-release-candidate.md) - (PM) Create meta issue for regressions in GitHub (see [example](https://github.com/mattermost/platform/issues/574)) - -### - (4 weekdays before release date) Release Candidate Testing -- Final testing is conducted by the team on the acceptance server and any issues found are filed - - (Dev) Tests upgrade from previous version to current version, following the [Upgrade Guide](https://github.com/mattermost/platform/blob/master/doc/install/Upgrade-Guide.md) + - (PM) Include link to meta-issue in release notes of RC1 + - (PM) Tweet announcement that RC1 is ready (see [example](https://twitter.com/mattermosthq/status/664172166368264192)) + - (PM) Submit GitLab ticket to take next Mattermost version in the Omnibus + +### (T-minus 4 working days) Release Candidate Testing +- (Team) Final testing is conducted by the team on the acceptance server and any issues found are filed +- (Build) Tests upgrade from previous version to current version, following the [Upgrade Guide](https://github.com/mattermost/platform/blob/master/doc/install/Upgrade-Guide.md) + - Database upgrade should be tested on both MySQL and Postgres - (Ops) Posts copy of the **Release Candidate Testing** checklist into Town Square in PRODUCTION - (Ops) Moves meeting, test and community channels over to the production version of RC, and posts in Town Square asking everyone to move communication over to the new team for testing purposes - (PM) Test feature areas and post bugs to Bugs/Issues in PRODUCTION @@ -72,6 +85,7 @@ This is a working document that will update as our process evolves. - (PM) Posts links to all issues found in RC as comments on the meta issue - (PM) Updates description to include approved fixes - (PM) Posts screenshot and link to final tickets for next RC to the Release room + - (PM) Updates Release Notes with any new issues that will not be fixed for the current version - (PM & DEV leads) Triage hotfix candidates and decide on whether and when to cut next RC or final - (Dev) PRs for hotfixes made to release branch, and changes from release branch are merged into master - (Ops) Tests approved fixes on master @@ -81,19 +95,28 @@ This is a working document that will update as our process evolves. - (Ops) verifies each of the issues in meta ticket is fixed - (PM) If no blocking issues are found, PM, Dev and Ops signs off on the release -### - (2 weekdays before release date) Release - - (Dev) Tags a new release (e.g. 1.1.0) and runs an official build which should be essentially identical to the last RC +### (T-minus 2 working days) Release Build Cut +- (Ops) Post this checklist in Release channel +- (Build) Tags a new release (e.g. 1.1.0) and runs an official build which should be essentially identical to the last RC - (PM) Any significant issues that were found and not fixed for the final release are noted in the release notes - - If an urgent and important issue needs to be addressed between major releases, a hotfix release (e.g. 1.1.1) may be released, however this should be very rare, given a monthly cadence - - (PM) Copy and paste the Release Notes from the Changelog to the Release Description - - (PM) Update the mattermost.org/download page - - (Dev) Delete RCs after final version is shipped - - (PM) Close final GitHub RC meta ticket - -### - (0 weekdays before release date) End of Release -- (PM) Makes sure marketing has been posted (animated GIFs, screenshots, mail announcement, Tweets, blog posts) + - If an urgent and important issue needs to be addressed between major releases, a bug fix release (e.g. 1.1.1) may be created +- (PM) Copy and paste the Release Notes from the Changelog to the Release Description +- (PM) Update the mattermost.org/download page +- (PM) Update the AMI links on mattermost.org/installation +- (PM) Close final GitHub RC meta ticket +- (Dev) Delete RCs after final version is shipped +- (Marketing) Finalize marketing + - (Marketing) Finalize mailchimp email blast + - (Marketing) Finalize blog post and put on timer for release + - (Marketing) Finalize tweet announcement + - (Marketing) Finalize announcement on general mailing list + - (Marketing) Finalize announcement for gitlab.mattermost.com + +### (T-minus 0 working days) Release Day +- (Ops) Post this checklist in Release channel +- (PM) Confirm marketing has been posted (animated GIFs, screenshots, mail announcement, Tweets, blog posts) - (PM) Close the release in Jira +- (PM) Set header of next release as UNDER DEVELOPMENT in CHANGELOG on master - (Dev) Check if any libraries need to be updated for the next release, and if so bring up in weekly team meeting -- (Ops) Post important dates for the next release in the header of the Release channel -- (Ops) Queue an agenda item for next team meeting for "Stepping Back" Q&A -- (Ops) Queue an agenda item for next team meeting for Roadmap review +- (Ops) Post key dates for the next release in the header of the Release channel +- (Ops) Queue an agenda item for next team meeting for Release Process Kaizen/Q&A diff --git a/docker/1.1/Dockerrun.aws.zip b/docker/1.1/Dockerrun.aws.zip Binary files differdeleted file mode 100644 index 945168a71..000000000 --- a/docker/1.1/Dockerrun.aws.zip +++ /dev/null diff --git a/docker/1.1/Dockerfile b/docker/1.3/Dockerfile index 92bac6a04..55b69673a 100644 --- a/docker/1.1/Dockerfile +++ b/docker/1.3/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v1.1.0/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.3.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.3/Dockerrun.aws.zip b/docker/1.3/Dockerrun.aws.zip Binary files differnew file mode 100644 index 000000000..dd201d990 --- /dev/null +++ b/docker/1.3/Dockerrun.aws.zip diff --git a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config index 7f40a8b34..7f40a8b34 100644 --- a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config +++ b/docker/1.3/Dockerrun.aws/.ebextensions/01_files.config diff --git a/docker/1.1/Dockerrun.aws/Dockerrun.aws.json b/docker/1.3/Dockerrun.aws/Dockerrun.aws.json index 042e79bd3..d4027e67c 100755 --- a/docker/1.1/Dockerrun.aws/Dockerrun.aws.json +++ b/docker/1.3/Dockerrun.aws/Dockerrun.aws.json @@ -1,7 +1,7 @@ {
"AWSEBDockerrunVersion": "1",
"Image": {
- "Name": "mattermost/platform:1.1",
+ "Name": "mattermost/platform:1.3",
"Update": "true"
},
"Ports": [
diff --git a/docker/1.3/README.md b/docker/1.3/README.md new file mode 100644 index 000000000..f737a1554 --- /dev/null +++ b/docker/1.3/README.md @@ -0,0 +1,23 @@ +Mattermost +========== + +http:/mattermost.org + +Mattermost is an open-source team communication service. It brings team messaging and file sharing into one place, accessible across PCs and phones, with archiving and search. + +Installing Mattermost +===================== + +To run an instance of the latest version of mattermost on your local machine you can run: + +`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform` + +To update this image to the latest version you can run: + +`docker pull mattermost/platform` + +To run an instance of the latest code from the master branch on GitHub you can run: + +`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:dev` + +Any questions, please visit http://forum.mattermost.org diff --git a/docker/1.1/config_docker.json b/docker/1.3/config_docker.json index 653b6ffd7..a35abb9da 100644 --- a/docker/1.1/config_docker.json +++ b/docker/1.3/config_docker.json @@ -5,7 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableIncomingWebhooks": true, + "EnableIncomingWebhooks": false, + "EnableOutgoingWebhooks": false, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, "EnableTesting": false, @@ -16,7 +17,9 @@ "MaxUsersPerTeam": 50, "EnableTeamCreation": true, "EnableUserCreation": true, - "RestrictCreationToDomains": "" + "RestrictCreationToDomains": "", + "RestrictTeamNames": true, + "EnableTeamListing": false }, "SqlSettings": { "DriverName": "mysql", @@ -65,9 +68,8 @@ "ConnectionSecurity": "", "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS", "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL", - "ApplePushServer": "", - "ApplePushCertPublic": "", - "ApplePushCertPrivate": "" + "SendPushNotifications": false, + "PushNotificationServer": "" }, "RateLimitSettings": { "EnableRateLimiter": true, diff --git a/docker/1.1/docker-entry.sh b/docker/1.3/docker-entry.sh index 6bd2a1263..6bd2a1263 100755 --- a/docker/1.1/docker-entry.sh +++ b/docker/1.3/docker-entry.sh diff --git a/model/version.go b/model/version.go index af99717cd..5e41a28d1 100644 --- a/model/version.go +++ b/model/version.go @@ -12,6 +12,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "1.3.0", "1.2.1", "1.2.0", "1.1.0", diff --git a/store/sql_post_store.go b/store/sql_post_store.go index be770c09e..40dca9930 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -38,8 +38,6 @@ func NewSqlPostStore(sqlStore *SqlStore) PostStore { } func (s SqlPostStore) UpgradeSchemaIfNeeded() { - s.RemoveColumnIfExists("Posts", "ImgCount") // remove after 1.3 release - s.GetMaster().Exec(`UPDATE Preferences SET Type = :NewType WHERE Type = :CurrentType`, map[string]string{"NewType": model.POST_JOIN_LEAVE, "CurrentType": "join_leave"}) // remove after 1.3 release } func (s SqlPostStore) CreateIndexesIfNotExists() { diff --git a/web/react/components/post_attachment_oembed.jsx b/web/react/components/post_attachment_oembed.jsx index 13c32f744..4b12ee95e 100644 --- a/web/react/components/post_attachment_oembed.jsx +++ b/web/react/components/post_attachment_oembed.jsx @@ -14,7 +14,14 @@ export default class PostAttachmentOEmbed extends React.Component { } componentWillReceiveProps(nextProps) { - this.fetchData(nextProps.link); + if (nextProps.link !== this.props.link) { + this.isLoading = false; + this.fetchData(nextProps.link); + } + } + + componentDidMount() { + this.fetchData(this.props.link); } fetchData(link) { diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index 35a7727e9..dcbe56399 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -214,14 +214,14 @@ export default class PostBody extends React.Component { } createYoutubeEmbed(link) { - const ytRegex = /.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|watch\?(?:[a-zA-Z-_]+=[a-zA-Z0-9-_]+&)+v=)([^#\&\?]*).*/; + const ytRegex = /(?:http|https):\/\/(?:www\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(\/u\/\w\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^\/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#\&\?]*)/; const match = link.trim().match(ytRegex); - if (!match || match[1].length !== 11) { + if (!match || match[2].length !== 11) { return null; } - const youtubeId = match[1]; + const youtubeId = match[2]; const time = this.handleYoutubeTime(link); function onClick(e) { diff --git a/web/react/components/providers.json b/web/react/components/providers.json index 33e377a39..b5899c225 100644 --- a/web/react/components/providers.json +++ b/web/react/components/providers.json @@ -11,7 +11,7 @@ "https?://soundcloud.com/.*/.*" ], "name": "SoundCloud", - "height": 110 + "height": 140 }, { "patterns": [ @@ -349,7 +349,7 @@ "https?://vine.co/v/[a-zA-Z0-9]+" ], "name": "Vine", - "height": 110 + "height": 490 }, { "patterns": [ diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index eb1d36ced..c2e4276b0 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -300,7 +300,7 @@ export function extractLinks(text) { Autolinker.link(text, { replaceFn, - urls: true, + urls: {schemeMatches: true, wwwMatches: true, tldMatches: false}, emails: false, twitter: false, phone: false, @@ -1253,4 +1253,4 @@ export function isFeatureEnabled(feature) { export function isSystemMessage(post) { return post.type && (post.type.lastIndexOf(Constants.SYSTEM_MESSAGE_PREFIX) === 0); -}
\ No newline at end of file +} |