From c0e4b1e79715a096dd9aa827e7eda06a7bcc9e52 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 8 Oct 2015 16:10:27 -0400 Subject: [PATCH 01/17] Creating dockerfiles for release 1.1.0 --- docker/0.7/Dockerrun.aws.zip | Bin 867 -> 0 bytes docker/0.7/config_docker.json | 103 ------------------ docker/{0.7 => 1.1}/Dockerfile | 2 +- docker/1.1/Dockerrun.aws.zip | Bin 0 -> 710 bytes .../.ebextensions/01_files.config | 0 .../Dockerrun.aws/Dockerrun.aws.json | 2 +- docker/1.1/config_docker.json | 92 ++++++++++++++++ docker/{0.7 => 1.1}/docker-entry.sh | 0 8 files changed, 94 insertions(+), 105 deletions(-) delete mode 100644 docker/0.7/Dockerrun.aws.zip delete mode 100644 docker/0.7/config_docker.json rename docker/{0.7 => 1.1}/Dockerfile (93%) create mode 100644 docker/1.1/Dockerrun.aws.zip rename docker/{0.7 => 1.1}/Dockerrun.aws/.ebextensions/01_files.config (100%) rename docker/{0.7 => 1.1}/Dockerrun.aws/Dockerrun.aws.json (75%) create mode 100644 docker/1.1/config_docker.json rename docker/{0.7 => 1.1}/docker-entry.sh (100%) diff --git a/docker/0.7/Dockerrun.aws.zip b/docker/0.7/Dockerrun.aws.zip deleted file mode 100644 index bba04cca523a4669c29c01edbc49d5a52d340238..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmWIWW@h1H0D;dA^6p>;l;C5KVbDuWO06hK%`48#&nwms4dG;9?s9$-3c{ro+zgB? zFPIq^SW^iInskl1<60J3F-{PiIcPbolzx#0|_o`cCs( zew??PP{ytis+ihsQx$iSYkqdS;mKWB*DtKP&k%DYkUjLWNqlbfTMhGNR~&^-?(XrN z_QUkDGeklDty5_G!-s`LPId46CUVUEKP?>e{&D)JU*=C8yJX69<46V8x z&3YC|+WwAt{Y78X-oD^sOLMx)zC#HmzwY*4TyalEhIfLktoTwEzc(?r9&#c=&K1C zAExbGtKl&5AXD1nf)6ipbgFy}=U>QX=~tR&yESQ+)KZmiu6FUuLcgp#E1hc6YR!F% z@8#o}5w|$xPX4j)OYnBwz%}jag{NBWEbO-DP3$KXhZdYVD}M9J6Q3)KJ~0P)Gcw6B z<4QjgK)-^30K;2H5RIOiSRtti&94wMait}QnZRVlu%yug!%U2n1+)T`vhY}e894|m h-Zn-7ZNe5+Ky$G~Q-C)s8_1)~K*$f&X~zWO0RXI77p(vQ diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json deleted file mode 100644 index cbac2ea69c..0000000000 --- a/docker/0.7/config_docker.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "LogSettings": { - "ConsoleEnable": true, - "ConsoleLevel": "INFO", - "FileEnable": true, - "FileLevel": "INFO", - "FileFormat": "", - "FileLocation": "" - }, - "ServiceSettings": { - "SiteName": "Mattermost", - "Mode" : "dev", - "AllowTesting" : true, - "UseSSL": false, - "Port": "80", - "Version": "developer", - "Shards": { - }, - "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", - "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", - "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", - "AnalyticsUrl": "", - "UseLocalStorage": true, - "StorageDirectory": "/mattermost/data/", - "AllowedLoginAttempts": 10, - "DisableEmailSignUp": false - }, - "SSOSettings": { - "gitlab": { - "Allow": false, - "Secret" : "", - "Id": "", - "Scope": "", - "AuthEndpoint": "", - "TokenEndpoint": "", - "UserApiEndpoint": "" - } - }, - "SqlSettings": { - "DriverName": "mysql", - "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8", - "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8"], - "MaxIdleConns": 10, - "MaxOpenConns": 10, - "Trace": false, - "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS" - }, - "AWSSettings": { - "S3AccessKeyId": "", - "S3SecretAccessKey": "", - "S3Bucket": "", - "S3Region": "" - }, - "ImageSettings": { - "ThumbnailWidth": 120, - "ThumbnailHeight": 100, - "PreviewWidth": 1024, - "PreviewHeight": 0, - "ProfileWidth": 128, - "ProfileHeight": 128, - "InitialFont": "luximbi.ttf" - }, - "EmailSettings": { - "ByPassEmail" : true, - "SMTPUsername": "", - "SMTPPassword": "", - "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, - "FeedbackEmail": "", - "FeedbackName": "", - "ApplePushServer": "", - "ApplePushCertPublic": "", - "ApplePushCertPrivate": "" - }, - "RateLimitSettings": { - "UseRateLimiter": true, - "PerSec": 10, - "MemoryStoreSize": 10000, - "VaryByRemoteAddr": true, - "VaryByHeader": "" - }, - "PrivacySettings": { - "ShowEmailAddress": true, - "ShowPhoneNumber": true, - "ShowSkypeId": true, - "ShowFullName": true - }, - "TeamSettings": { - "MaxUsersPerTeam": 150, - "AllowPublicLink": true, - "AllowValetDefault": false, - "TermsLink": "/static/help/configure_links.html", - "PrivacyLink": "/static/help/configure_links.html", - "AboutLink": "/static/help/configure_links.html", - "HelpLink": "/static/help/configure_links.html", - "ReportProblemLink": "/static/help/configure_links.html", - "TourLink": "/static/help/configure_links.html", - "DefaultThemeColor": "#2389D7", - "DisableTeamCreation": false, - "RestrictCreationToDomains": "" - } -} diff --git a/docker/0.7/Dockerfile b/docker/1.1/Dockerfile similarity index 93% rename from docker/0.7/Dockerfile rename to docker/1.1/Dockerfile index 202d42dbc4..600d33308e 100644 --- a/docker/0.7/Dockerfile +++ b/docker/1.1/Dockerfile @@ -34,7 +34,7 @@ VOLUME /var/lib/mysql WORKDIR /mattermost # Copy over files -ADD https://github.com/mattermost/platform/releases/download/v0.7.1/mattermost.tar.gz / +ADD https://github.com/mattermost/platform/releases/download/v1.1.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.1/Dockerrun.aws.zip b/docker/1.1/Dockerrun.aws.zip new file mode 100644 index 0000000000000000000000000000000000000000..945168a714b636ba64e27d5b5ca47a0bedd2ed00 GIT binary patch literal 710 zcmWIWW@Zs#U|`^2IN0Ffe*E&Wzte%dOF%5dAj9C2pPZdqR8*R$msnn`msOmf7aGFJ zz`W{=SlBKgF0J5ZU}Sm0%)r2s0@R_~vzzOXgMe%G!FrD9?rba1=gO@LN*z%hM;E*n zI`gjO&B+stOxu-8lRqS5qf`XPow+fmBnti6>Dvj3$-6iJo9p6gREPdmQ|4R z^w(283od;2`K(+O@4EiZzlNONdtGX$OSR6-S|yyL&vR{ct}u-Di$<#hU<)A4-3ZuKBBw_xkF6 z&Rfr(SD#llRAya#^L8Uowprpa&y+9|L#r-Fvz|qgw!dRuf6>>pw=cNZ(wwfc?@&U? zue-e$SKO14;hkVBE54M)?@i3DhnxZ4j7)OOxT0MG7&;6Lz~Etc+X!M|O9ZTtM1U3~ n$mU{(HNxB_jgNum5(s&q6<9(&z?+o~ Date: Thu, 8 Oct 2015 16:14:19 -0400 Subject: [PATCH 02/17] Adding release 1.1.0 version --- model/version.go | 1 + 1 file changed, 1 insertion(+) diff --git a/model/version.go b/model/version.go index d03f64ba2f..a61004fdee 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.1.0", "1.0.0", "0.7.1", "0.7.0", From 12cd7c03d6676466f7b10b8e80b4e05edab0cf2a Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 8 Oct 2015 16:46:45 -0400 Subject: [PATCH 03/17] Fixing broken travis release build --- Makefile | 15 +++++++++++++-- web/templates/head.html | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b03ed5cbae..12b209c847 100644 --- a/Makefile +++ b/Makefile @@ -88,6 +88,11 @@ travis: mkdir -p $(DIST_PATH)/web/static/js cp -L web/static/js/*.min.js $(DIST_PATH)/web/static/js/ + cp -RL web/static/config $(DIST_PATH)/web/static + cp -RL web/static/css $(DIST_PATH)/web/static + cp -RL web/static/fonts $(DIST_PATH)/web/static + cp -RL web/static/help $(DIST_PATH)/web/static + cp -RL web/static/images $(DIST_PATH)/web/static cp -RL web/static/js/jquery-dragster $(DIST_PATH)/web/static/js/ cp -RL web/templates $(DIST_PATH)/web @@ -265,8 +270,14 @@ dist: install cd web/sass-files && compass compile -e production --force - mkdir -p $(DIST_PATH)/web - cp -RL web/static $(DIST_PATH)/web + mkdir -p $(DIST_PATH)/web/static/js + cp -L web/static/js/*.min.js $(DIST_PATH)/web/static/js/ + cp -RL web/static/config $(DIST_PATH)/web/static + cp -RL web/static/css $(DIST_PATH)/web/static + cp -RL web/static/fonts $(DIST_PATH)/web/static + cp -RL web/static/help $(DIST_PATH)/web/static + cp -RL web/static/images $(DIST_PATH)/web/static + cp -RL web/static/js/jquery-dragster $(DIST_PATH)/web/static/js/ cp -RL web/templates $(DIST_PATH)/web mkdir -p $(DIST_PATH)/api diff --git a/web/templates/head.html b/web/templates/head.html index 8039f48a19..e4f1b56b37 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -37,7 +37,7 @@ - + From 7906a9067faa87e4c1c96a4ca256aede1ba48721 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 8 Oct 2015 23:05:05 -0700 Subject: [PATCH 04/17] Rename doc/usage/Slack-Import.md to doc/help/Slack-Import.md --- doc/{usage => help}/Slack-Import.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{usage => help}/Slack-Import.md (100%) diff --git a/doc/usage/Slack-Import.md b/doc/help/Slack-Import.md similarity index 100% rename from doc/usage/Slack-Import.md rename to doc/help/Slack-Import.md From db1724fa9f7a4174e5d91f6704f9ba3834159131 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 8 Oct 2015 23:05:22 -0700 Subject: [PATCH 05/17] Update README.md --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index a45b670c04..0505877a73 100644 --- a/doc/README.md +++ b/doc/README.md @@ -33,7 +33,7 @@ Set up Mattermost in your data center - User Interface - [Manage Team](help/Manage-Team.md) - Team Settings - - [Slack Import](usage/Slack-Import.md) + - [Slack Import](help/Slack-Import.md) - Messaging - [Mattermost Markdown Formatting](usage/Markdown.md) From fd375a8ee737b873f3b8de3f695024031b417d3c Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 8 Oct 2015 23:05:48 -0700 Subject: [PATCH 06/17] Update Slack-Import.md --- doc/help/Slack-Import.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/help/Slack-Import.md b/doc/help/Slack-Import.md index c30de05670..d8d6170c4c 100644 --- a/doc/help/Slack-Import.md +++ b/doc/help/Slack-Import.md @@ -1,4 +1,4 @@ -#### Slack Import (Preview) +#### Slack Import (Alpha) *Note: As a SaaS service, Slack is able to change its export format quickly. If you encounter issues not mentioned in the documentation below, please let us know by [filing an issue](https://github.com/mattermost/platform/issues).* From 05ed5b08999c4d32f200c785b60b931d43b2b628 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 8 Oct 2015 23:07:20 -0700 Subject: [PATCH 07/17] Update README.md --- doc/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/README.md b/doc/README.md index 0505877a73..f106cdfc86 100644 --- a/doc/README.md +++ b/doc/README.md @@ -30,6 +30,8 @@ Set up Mattermost in your data center ## Help +_Note: End user help documentation is a new feature being completed for the v1.2 release. The materials below are work in progress._ + - User Interface - [Manage Team](help/Manage-Team.md) - Team Settings From b67bb7e6fe29aa39f5b2976b1ca1f119f459d4c1 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 9 Oct 2015 08:53:06 -0700 Subject: [PATCH 08/17] Update README.md --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index f106cdfc86..fcda4fd089 100644 --- a/doc/README.md +++ b/doc/README.md @@ -26,7 +26,7 @@ Set up Mattermost in your data center - [Developer Machine Setup](developer/Setup.md) - [Mattermost Style Guide](developer/Style-Guide.md) - [API Overview](api/Overview.md) - - [Incoming Webhooks](integrations/webhooks/Incoming.md) + - [Incoming Webhooks](integrations/webhooks/Incoming-Webhooks.md) ## Help From 3e7132cb72f4a180a0ba0b84bc60794e45c8a495 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Fri, 9 Oct 2015 15:56:00 -0400 Subject: [PATCH 09/17] Fixing incorrect markdown --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e430f7c0..03663392c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## UNDER DEVELOPMENT - Release v1.1.0 -The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release. -- + -- **Final release anticipated:** 2015-10-16 ### Release Highlights From acde3ebf98607e898519bd2b0001fa39156a6be1 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 9 Oct 2015 18:27:55 -0700 Subject: [PATCH 10/17] Update manage_incoming_hooks.jsx --- web/react/components/user_settings/manage_incoming_hooks.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx index 90b4039c74..b7f53be0ba 100644 --- a/web/react/components/user_settings/manage_incoming_hooks.jsx +++ b/web/react/components/user_settings/manage_incoming_hooks.jsx @@ -148,7 +148,7 @@ export default class ManageIncomingHooks extends React.Component { return (
- {'Create webhook URLs for channels and private groups. These URLs can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'} + {'For developers building integrations this page lets you create webhook URLs for channels and private groups. Please see http://mattermost.org/webhooks to learn about creating webhooks, view samples, and to let the community know about integrations you have ve built. The URLs created below can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'}
From b0d5b6a2e2e438aeece273dd453a247e250a2479 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 9 Oct 2015 18:28:57 -0700 Subject: [PATCH 11/17] Update user_settings_integrations.jsx --- .../components/user_settings/user_settings_integrations.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx index ea3f72f27e..5e20d41f18 100644 --- a/web/react/components/user_settings/user_settings_integrations.jsx +++ b/web/react/components/user_settings/user_settings_integrations.jsx @@ -49,7 +49,7 @@ export default class UserSettingsIntegrationsTab extends React.Component { incomingHooksSection = ( Date: Fri, 9 Oct 2015 18:39:34 -0700 Subject: [PATCH 12/17] Update manage_incoming_hooks.jsx --- web/react/components/user_settings/manage_incoming_hooks.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx index b7f53be0ba..8817e0d397 100644 --- a/web/react/components/user_settings/manage_incoming_hooks.jsx +++ b/web/react/components/user_settings/manage_incoming_hooks.jsx @@ -148,7 +148,7 @@ export default class ManageIncomingHooks extends React.Component { return (
- {'For developers building integrations this page lets you create webhook URLs for channels and private groups. Please see http://mattermost.org/webhooks to learn about creating webhooks, view samples, and to let the community know about integrations you have ve built. The URLs created below can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'} + {'For developers building integrations this page lets you create webhook URLs for channels and private groups. Please see http://mattermost.org/webhooks to learn about creating webhooks, view samples, and to let the community know about integrations you have built. The URLs created below can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'}
From ce55eb06bd8b0e18c2c46a19b2ad92f4c0d9362c Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 10 Oct 2015 15:55:12 -0700 Subject: [PATCH 13/17] Adding beta label to Slack Import --- doc/help/Slack-Import.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/help/Slack-Import.md b/doc/help/Slack-Import.md index d8d6170c4c..a3b672b04d 100644 --- a/doc/help/Slack-Import.md +++ b/doc/help/Slack-Import.md @@ -1,8 +1,8 @@ -#### Slack Import (Alpha) +#### Slack Import (Beta) *Note: As a SaaS service, Slack is able to change its export format quickly. If you encounter issues not mentioned in the documentation below, please let us know by [filing an issue](https://github.com/mattermost/platform/issues).* -The Slack Import feature in Mattermost is in "Preview" and focus is on supporting migration of teams of less than 100 registered users. The feature can be accessed from by Team Administrators and Team Owners via the `Team Settings -> Import` menu option. +The Slack Import feature in Mattermost is in "Beta" and focus is on supporting migration of teams of less than 100 registered users. The feature can be accessed from by Team Administrators and Team Owners via the `Team Settings -> Import` menu option. Mattermost currently supports the processing of an "Export" file from Slack containing account information and public channel archives from a Slack team. @@ -14,5 +14,5 @@ Limitations: - Newly added markdown suppport in Slack's Posts 2.0 feature announced on September 28, 2015 is not yet supported. - Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI. - Slack does not export any content from private groups or direct messages that your team has stored in Slack's database. -- The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still show Slack ID). +- The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still shows Slack ID). From 85716be6d6f5ce4859063a38040cbb774fb85605 Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 10 Oct 2015 16:10:14 -0700 Subject: [PATCH 14/17] Aligning heading with text --- doc/api/Overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/Overview.md b/doc/api/Overview.md index 02e11974e7..0a407b1e9a 100644 --- a/doc/api/Overview.md +++ b/doc/api/Overview.md @@ -77,7 +77,7 @@ X-Ratelimit-Reset: 1441983590 These headers are telling you your current rate limit status. Header | Description ---------------------- | ----------- +:--------------------- |:----------- X-Ratelimit-Limit | The maximum number of requests you can make per second. X-Ratelimit-Remaining | The number of requests remaining in the current window. X-Ratelimit-Reset | The remaining UTC epoch seconds before the rate limit resets. From ed8b1aa00c4fb7fa4277df0506f2944f5892e966 Mon Sep 17 00:00:00 2001 From: it33 Date: Sat, 10 Oct 2015 16:11:47 -0700 Subject: [PATCH 15/17] bugfix should be two words --- doc/install/Release-Numbering.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install/Release-Numbering.md b/doc/install/Release-Numbering.md index 71374f7ef0..3b0391cff4 100644 --- a/doc/install/Release-Numbering.md +++ b/doc/install/Release-Numbering.md @@ -14,4 +14,4 @@ Major Build Number: Minor Build Number: -- Indicates bugfix/security releases (e.g. 1.2.5, 1.2.6) +- Indicates a bug fix or security release (e.g. 1.2.5, 1.2.6) From 808238f7c663308b8926d205851e3277e2f4bd8a Mon Sep 17 00:00:00 2001 From: it33 Date: Sun, 11 Oct 2015 15:50:19 -0700 Subject: [PATCH 16/17] Update CHANGELOG.md --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03663392c7..eac1e61e53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ ## UNDER DEVELOPMENT - Release v1.1.0 --The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release. +The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release. --- **Final release anticipated:** 2015-10-16 +- **Final release anticipated:** 2015-10-16 ### Release Highlights @@ -20,7 +20,6 @@ Integrations Documentation -- Contents of `/docs` now hosted at docs.mattermost.org - Added documentation on config.json and System Console settings - Docker Toolbox replaces deprecated Boot2Docker instructions in container install documentation From f55416d9f45afcb310246426366cd261f138029f Mon Sep 17 00:00:00 2001 From: it33 Date: Mon, 12 Oct 2015 07:37:40 -0700 Subject: [PATCH 17/17] Update Code-Contribution-Guidelines.md --- doc/developer/Code-Contribution-Guidelines.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/developer/Code-Contribution-Guidelines.md b/doc/developer/Code-Contribution-Guidelines.md index 80676f107f..363934818a 100644 --- a/doc/developer/Code-Contribution-Guidelines.md +++ b/doc/developer/Code-Contribution-Guidelines.md @@ -5,7 +5,6 @@ Thank you for your interest in contributing to Mattermost. This guide provides a ## Choose a Ticket 1. Review the list of [Good First Contribution](https://mattermost.atlassian.net/issues/?filter=10206) tickets listed in Jira. - 2. These projects are intended to be a straight forward first pull requests from new contributors. If you don't find something appropriate for your interests, please see the full list of tickets [Accepting Pull Requests](https://mattermost.atlassian.net/issues/?filter=10101). @@ -13,7 +12,7 @@ If you don't find something appropriate for your interests, please see the full ## Install Mattermost and set up a Fork -1. Follow [developer setup instructions](https://github.com/mattermost/platform/blob/master/doc/install/dev-setup.md) to install Mattermost. +1. Follow [developer setup instructions](https://github.com/mattermost/platform/blob/master/doc/developer/Setup.md) to install Mattermost. 2. Create a branch with set to the ID of the ticket you're working on, for example ```PLT-394```, using command: