Merge branch 'master' into typos

2015-10-12 12:06:55 -04:00
--- 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. 
-
-- **Final release anticipated:** 2015-10-16
+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

@@ -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 

--- a/15
+++ b/15
@@ -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
--- a/doc/README.md
+++ b/doc/README.md
@@ -26,14 +26,16 @@ 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

+_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 
-   - [Slack Import](usage/Slack-Import.md)
+   - [Slack Import](help/Slack-Import.md)

 - Messaging
 - [Mattermost Markdown Formatting](usage/Markdown.md)
--- 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.
--- 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 <branch name> set to the ID of the ticket you're working on, for example ```PLT-394```, using command: 

--- a/doc/usage/Slack-Import.md
+++ b/doc/usage/Slack-Import.md
@@ -1,8 +1,8 @@
-#### Slack Import (Preview)
+#### 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).

--- 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)
--- a/docker/0.7/Dockerrun.aws.zip
+++ b/docker/0.7/Dockerrun.aws.zip
--- a/docker/0.7/config_docker.json
+++ b/docker/0.7/config_docker.json
@@ -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": ""
-    }
-}
--- a/docker/1.1/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 /
--- a/docker/1.1/Dockerrun.aws.zip
+++ b/docker/1.1/Dockerrun.aws.zip
--- a/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config
+++ b/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config
--- a/docker/1.1/Dockerrun.aws/Dockerrun.aws.json
+++ b/docker/1.1/Dockerrun.aws/Dockerrun.aws.json
@@ -1,7 +1,7 @@
 {
  "AWSEBDockerrunVersion": "1",
  "Image": {
-    "Name": "mattermost/platform:0.7",
+    "Name": "mattermost/platform:1.1",
    "Update": "true"
  },
  "Ports": [
--- a/docker/1.1/config_docker.json
+++ b/docker/1.1/config_docker.json
@@ -0,0 +1,92 @@
+{
+    "ServiceSettings": {
+        "ListenAddress": ":80",
+        "MaximumLoginAttempts": 10,
+        "SegmentDeveloperKey": "",
+        "GoogleDeveloperKey": "",
+        "EnableOAuthServiceProvider": false,
+        "EnableIncomingWebhooks": true,
+        "EnablePostUsernameOverride": false,
+        "EnablePostIconOverride": false,
+        "EnableTesting": false
+    },
+    "TeamSettings": {
+        "SiteName": "Mattermost",
+        "MaxUsersPerTeam": 50,
+        "EnableTeamCreation": true,
+        "EnableUserCreation": true,
+        "RestrictCreationToDomains": ""
+    },
+    "SqlSettings": {
+        "DriverName": "mysql",
+        "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8",
+        "DataSourceReplicas": [],
+        "MaxIdleConns": 10,
+        "MaxOpenConns": 10,
+        "Trace": false,
+        "AtRestEncryptKey": "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QVg"
+    },
+    "LogSettings": {
+        "EnableConsole": false,
+        "ConsoleLevel": "INFO",
+        "EnableFile": true,
+        "FileLevel": "INFO",
+        "FileFormat": "",
+        "FileLocation": ""
+    },
+    "FileSettings": {
+        "DriverName": "local",
+        "Directory": "/mattermost/data/",
+        "EnablePublicLink": true,
+        "PublicLinkSalt": "A705AklYF8MFDOfcwh3I488G8vtLlVip",
+        "ThumbnailWidth": 120,
+        "ThumbnailHeight": 100,
+        "PreviewWidth": 1024,
+        "PreviewHeight": 0,
+        "ProfileWidth": 128,
+        "ProfileHeight": 128,
+        "InitialFont": "luximbi.ttf",
+        "AmazonS3AccessKeyId": "",
+        "AmazonS3SecretAccessKey": "",
+        "AmazonS3Bucket": "",
+        "AmazonS3Region": ""
+    },
+    "EmailSettings": {
+        "EnableSignUpWithEmail": true,
+        "SendEmailNotifications": false,
+        "RequireEmailVerification": false,
+        "FeedbackName": "",
+        "FeedbackEmail": "",
+        "SMTPUsername": "",
+        "SMTPPassword": "",
+        "SMTPServer": "",
+        "SMTPPort": "",
+        "ConnectionSecurity": "",
+        "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
+        "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
+        "ApplePushServer": "",
+        "ApplePushCertPublic": "",
+        "ApplePushCertPrivate": ""
+    },
+    "RateLimitSettings": {
+        "EnableRateLimiter": true,
+        "PerSec": 10,
+        "MemoryStoreSize": 10000,
+        "VaryByRemoteAddr": true,
+        "VaryByHeader": ""
+    },
+    "PrivacySettings": {
+        "ShowEmailAddress": true,
+        "ShowFullName": true,
+        "EnableSecurityFixAlert": true
+    },
+    "GitLabSettings": {
+        "Enable": false,
+        "Secret": "",
+        "Id": "",
+        "Scope": "",
+        "AuthEndpoint": "",
+        "TokenEndpoint": "",
+        "UserApiEndpoint": ""
+    }
+}
--- a/docker/1.1/docker-entry.sh
+++ b/docker/1.1/docker-entry.sh
--- 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",
--- 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 (
            <div key='addIncomingHook'>
-                {'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 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.'}
                <br/>
                <label className='control-label'>{'Add a new incoming webhook'}</label>
                <div className='padding-top'>
--- 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 = (
                <SettingItemMin
                    title='Incoming Webhooks'
-                    describe='Manage your incoming webhooks'
+                    describe='Manage your incoming webhooks (Developer feature)'
                    updateSection={function updateNameSection() {
                        this.updateSection('incoming-hooks');
                    }.bind(this)}
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -37,7 +37,7 @@
    <script src="/static/js/bootstrap-3.3.5.js"></script>
    <script src="/static/js/bootstrap-colorpicker.min.js"></script>
    <script src="/static/js/react-bootstrap-0.25.1.js"></script>
-    <script src="/static/js/perfect-scrollbar-0.6.5.jquery.js"></script>
+    <script src="/static/js/perfect-scrollbar-0.6.5.jquery.min.js"></script>
    <script src="/static/js/jquery-dragster/jquery.dragster.js"></script>

    <style id="antiClickjack">body{display:none !important;}</style>