Merge branch 'master' into golang-version

17 files changed, 263 insertions, 180 deletions

diff --git a/Makefile b/Makefile
index b03ed5cba..12b209c84 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/doc/README.md b/doc/README.md
index 4c7c4cc0e..fcda4fd08 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -2,17 +2,23 @@
 
 ## Installation 
 
+#### Preview Installation
+Get up and running quickly with Docker-based install
+
 - [AWS Elastic Beanstalk Setup](install/Amazon-Elastic-Beanstalk.md)
 - [Docker Single Container Preview Setup](install/Docker-Single-Container.md)
-- [Production Ubuntu Setup](install/Production-Ubuntu.md)
-- [Mattermost Release Numbering Scheme](install/Release-Numbering.md)
-- [Software and Hardware Requirements](install/Requirements.md)
 - [SMTP Email Setup](install/SMTP-Email-Setup.md)
 
-## Integrations
+#### Production Installation
+Set up Mattermost in your data center 
+- [Software and Hardware Requirements](install/Requirements.md)
+- [Production Ubuntu Setup](install/Production-Ubuntu.md)
+- [SMTP Email Setup](install/SMTP-Email-Setup.md)
 
-- [GitLab SSO Configuration](integrations/Single-Sign-On/Gitlab.md) 
-- [Incoming Webhooks](integrations/webhooks/Incoming.md) 
+#### Configuration and Management 
+- Configuration Settings Overview 
+  - [GitLab SSO Configuration](integrations/Single-Sign-On/Gitlab.md) 
+- [Mattermost Release Numbering Scheme](install/Release-Numbering.md)
 
 ## Developer Documentation 
 
@@ -20,8 +26,17 @@
 - [Developer Machine Setup](developer/Setup.md)
 - [Mattermost Style Guide](developer/Style-Guide.md)
 - [API Overview](api/Overview.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](help/Slack-Import.md)
 
-## Usage Help
+- Messaging
+ - [Mattermost Markdown Formatting](usage/Markdown.md)
 
-- [Slack Import](usage/Slack-Import.md)
-- [Mattermost Markdown Formatting](usage/Markdown.md)
diff --git a/doc/help/Manage-Team.md b/doc/help/Manage-Team.md
new file mode 100644
index 000000000..b45ea4283
--- /dev/null
+++ b/doc/help/Manage-Team.md
@@ -0,0 +1,37 @@
+# Manage Team 
+
+The Manage Team menu is used to change the user roles assigned to members belonging to a team. 
+
+## User Roles 
+
+The following user roles are assigned from the **Manage Team** menu option in the team site main menu. 
+
+### System Admin
+
+The System Administrator is typically a member of the IT staff and has the follow privileges: 
+
+- Access to the System Console from the main menu in any team site. 
+- Change any setting on the Mattermost server available in the System Console.
+- Promote and demote other users to and from the System Admin role.
+- This role also has all the privileges of the Team Administrator as described below
+
+The first user added to a newly installed Mattermost system is assigned the System Admin role. 
+
+### Team Admin 
+
+The Team Administrator is typically a non-technical end user and has the following privileges: 
+
+- Access to the "Team Settings" menu from the team site main menu
+- Ability to change the team name and import data from Slack export files
+- Access to the "Manage Team" menu and change user roles to the levels of Team Administrator, Member and Inactive
+
+### Member 
+
+This is the default role given to end users who join the system. Members have basic permissions to use the Mattermost team site.
+
+### Inactive 
+
+This status is given to users whose accounts are marked inactive. These users can no longer log into the system. 
+
+Because Mattermost is designed as a system-of-record, there is not an option to delete users from the Mattermost system, as such an operation could compromise the integrity of message archives. 
+
diff --git a/doc/help/README.md b/doc/help/README.md
new file mode 100644
index 000000000..d07424c70
--- /dev/null
+++ b/doc/help/README.md
@@ -0,0 +1,12 @@
+# Help
+
+The help section of the Mattermost documentation is intended for use by end users learning about the Mattermost concepts, usage, terminology and user interface.
+
+_Note: Help documentation is a work-in-progress. Community contributions highly welcome. Please see [guidelines for contributing](https://forum.mattermost.org/t/help-improve-mattermost-documentation/194)._
+
+## Team Site Main Menu 
+
+You can access the **Team Site Main Menu** by clicking on the three vertical dots at the top of the left sidebar in a team site. Here we describe the various options available from the menu: 
+
+- [Manage Teams](Manage-Team.md)
+
diff --git a/doc/usage/Slack-Import.md b/doc/help/Slack-Import.md
index c30de0567..d8d6170c4 100644
--- a/doc/usage/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).*
 
diff --git a/doc/integrations/webhooks/Incoming-Webhooks.md b/doc/integrations/webhooks/Incoming-Webhooks.md
new file mode 100644
index 000000000..645d4861e
--- /dev/null
+++ b/doc/integrations/webhooks/Incoming-Webhooks.md
@@ -0,0 +1,80 @@
+# Incoming Webhooks
+
+Incoming webhooks allow external applications, written in the programming language of your choice--to post messages into Mattermost channels and private groups by sending a specifically formatted JSON payload via HTTP POST request to a secret Mattermost URL generated specifically for each application. 
+
+A couple key points: 
+
+- **Mattermost incoming webhooks are Slack-compatible.** If you've used Slack's incoming webhooks to create integrations, you can copy and paste that code to create Mattermost integrations. Mattermost automatically translates Slack's propretiary JSON payload format into markdown to render in Mattermost messages. 
+- **Mattermost incoming webhooks support full markdown.** A rich range of formatting unavailable in Slack is made possible through [markdown support](../../usage/Markdown.md) in Mattermost, incuding headings, formatted fonts, tables, inline images and other options supported by [Mattermost Markdown].
+
+_Example:_
+
+Suppose you wanted to create a notification of the status of a daily build, with a table of total tests run and total tests failed by component category, with links to failed tests by category. You could create the following JSON payload to post to a Mattermost channel using webhooks: 
+
+```
+payload={"text": "
+*** 
+##### Build Break - Project X - December 12, 2015 - 15:32 GMT +0
+| Component  | Tests Run   | Tests Failed                                   |
+|:-----------|:------------|:-----------------------------------------------|
+| Server     | 948         | :white_check_mark: 0                           |
+| Web Client | 123         | :warning: [2 (see details)](http://linktologs) |
+| iOS Client | 78          | :warning: [3 (see details)](http://linktologs) |
+***
+"}
+```
+Which would render in a Mattermost message as follows:
+
+*** 
+##### Build Break - Project X - December 12, 2015 - 15:32 GMT +0
+| Component  | Tests Run   | Tests Failed |
+|:------------ |:---------------|:-----|
+| Server | 948       |  :white_check_mark: 0 |
+| Web Client | 123              |   :warning: [2 (see details)](http://linktologs) |
+| iOS Client | 78        |    :warning: [3 (see details)](http://linktologs) |
+*** 
+
+### Creating Integrations using Incoming Webhooks
+You can create a webhook integration to post into Mattermost channels and private groups using these steps: 
+
+1. Enable incoming webhooks from **System Console -> Service Settings**  
+
+ 1. Optionally configure the **Enable Overriding of Usernames from Webhooks** option to allow external applications to post messages under any name. If not enabled, the username of the creator of the webhook URL is used to post messages.
+ 2. Optionally configure the **Enable Overriding of Icon from Webhooks** option to allow external applciations to change the icon of the account posting messages. If not enabled, the icon of the creator of the webhook URL is used to post messages. 
+ 
+2. Create a Mattermost Incoming Webhook URL
+ 1. Login to your Mattermost team site and go to **Account Settings -> Integrations**
+ 2. Next to **Incoming Webhooks** click **Edit**
+ 3. Select the channel or private group to receive webhook payloads, then click **Add** to create the webhook
+
+3. Write a function to call the URL with a properly formatted JSON payload
+ 1. To make sure everything works, try a curl command from your terminal or command line to send a JSON string as the `payload` parameter in a HTTP POST request.
+     - _Example:_
+     ```
+curl -i -X POST -d 'payload={"text": "Hello, this is some text."}' http://yourmattermost.com/hooks/xxx-generatedkey-xxx
+```  
+     2. In addition, with **Enable Overriding of Usernames from Webhooks** turned on,  you can also override the username the message posts as by providing a `username` parameter in your JSON payload. For example, you might want your message looking like it came from a robot so you can use ```payload={"username": "robot", "text": "Hello, this is some text."}``` to change the username of the post to robot. Note, to combat any malicious users from trying to use this to perform [phishing attacks](https://en.wikipedia.org/wiki/Phishing) a `BOT` indicator appears next to posts coming from incoming webhooks.
+     3. With **Enable Overriding of Icon from Webhooks** turned on, you can similarly change the icon the message posts with by providing a link to an image in the `icon_url` parameter of your payload. For example, ```payload={"icon_url": "http://somewebsite.com/somecoolimage.jpg", "text": "Hello, this is some text."}``` will post using whatever image is located at `http://somewebsite.com/somecoolimage.jpg` as the icon for the post.
+
+ 2. Set up your integration running on your own machine or a hosting service like AWS or Heroku, to start sending real time updates to Mattermost channels and private groups.
+
+Additional Notes:
+
+1. For the JSON payload, if `Content-Type` is specified as `application/json` in the headers of the HTTP request then the body of the request can be direct JSON. ```{"text": "Hello, this is some text."}```  
+
+2. You can override the channel specified in the webhook definition by specifying a `channel` parameter in your payload. For example, you might have a single webhook created for _Town Square_, but you can use ```payload={"channel": "off-topic", "text": "Hello, this is some text."}``` to send a message to the _Off-Topic_ channel using the same webhook URL.  
+
+3. Also, as mentioned previously, [markdown](../../usage/Markdown.md) can be used to create richly formatted payloads, for example: ```payload={"text": "# A Header\nThe _text_ below **the** header."}``` creates a messages with a header, a carriage return and bold text for "the".  
+
+4. Just like regular posts, the text will be limited to 4000 characters at maximum.
+
+### Slack Compatibility 
+
+As mentioned above, Mattermost makes it easy to take integrations written for Slack's proprietary JSON payload format and repurpose them to become Mattermost integrations. The following automatic translations are supported: 
+
+1. Payloads designed for Slack using `<>` to note the need to hyperlink a URL, such as ```payload={"text": "<http://www.mattermost.com/>"}```, are translated to the equivalent markdown in Mattermost and rendered the same as you would see in Slack. 
+2. Similiarly, payloads designed for Slack using `|` within a `<>` to define linked text, such as ```payload={"text": "Click <http://www.mattermost.com/|here> for a link."}```, are also translated to the equivalent markdown in Mattermost and rendered the same as you would see in Slack. 
+3. Like Slack, by overriding the channel name with an @username, such as payload={"text": "Hi", channel: "@jim"}, you can send the message to a user through your direct message chat.
+4. Channel names can be prepended with a #, like they are in Slack incoming webhooks, and the message will still be sent to the correct channel.
+
+To learn more about Incoming Webhooks and to see samples and community contributions, please visit <http://mattermost.org/webhooks>
diff --git a/doc/integrations/webhooks/Incoming.md b/doc/integrations/webhooks/Incoming.md
deleted file mode 100644
index 0814eb420..000000000
--- a/doc/integrations/webhooks/Incoming.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Incoming Webhooks
-
-With incoming webhooks practically any external source - once given a URL by you - can post a message to any channel you have access to. This is done through a HTTP POST request with a simple JSON payload. The payload can contain some text, and some simple options to allow the external source to customize the post.
-
-## Creating the Webhook URL
-
-To get the incoming webhook URL - where all the HTTP requests will be sent - follow these steps:
-
-1. Login to your Mattermost account.
-2. Open the menu by clicking near your profile picture in the top-left and open Account Settings.
-3. Go to the Integrations tab and click the 'Edit' button next to 'Incoming Webhooks'.
-4. Use the selector to choose a channel and click the 'Add' button to create the webhook.
-5. Your webhook URL will be displayed below in the 'Existing incoming webhooks' section.
-
-
-## Posting a Message
-
-You can send the message by including a JSON string as the `payload` parameter in a HTTP POST request.
-```
-payload={"text": "Hello, this is some text."}
-```
-
-In addition, if `Content-Type` is specified as `application/json` in the headers of the HTTP request then the body of the request can be direct JSON.
-```
-{"text": "Hello, this is some text."}
-```
-
-It is also possible to post richly formatted messages using [Markdown](../../usage/Markdown.md).
-```
-payload={"text": "# A Header\nThe _text_ below **the** header."}
-```
-
-Just like regular posts, the text will be limited to 4000 characters at maximum.
-
-## Adding Links
-
-In addition to including links in the standard Markdown format, links can also be specified by enclosing the URL in `<>` brackets
-```
-payload={"text": "<http://www.mattermost.com/>"}
-```
-
-They can also include a `|` character to specify some clickable text.
-```
-payload={"text": "Click <http://www.mattermost.com/|here> for a link."}
-```
-
-## Channel Override
-
-You can use a single webhook URL to post messages to different channels by overriding the channel. You can do this by adding the channel name - as it is seen in the channel URL - to the request payload.
-```
-payload={"channel": "off-topic", "text": "Hello, this is some text."}
-```
-
-## Finishing up
-
-Combining everything above, here is an example message made using a curl command:
-
-```
-curl -i -X POST -d 'payload={"channel": "off-topic", "text": "Hello, this is some text."}' http://yourmattermost.com/hooks/xxxxxxxxxxxxxxxxxxxxxxxxxx
-```
-
-A post with that text will be made to the Off-Topic channel.
diff --git a/docker/0.7/Dockerrun.aws.zip b/docker/0.7/Dockerrun.aws.zip
deleted file mode 100644
index bba04cca5..000000000
--- a/docker/0.7/Dockerrun.aws.zip
+++ /dev/null
diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json
deleted file mode 100644
index cbac2ea69..000000000
--- 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
index 202d42dbc..600d33308 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 000000000..945168a71
--- /dev/null
+++ b/docker/1.1/Dockerrun.aws.zip
diff --git a/docker/0.7/Dockerrun.aws/.ebextensions/01_files.config b/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config
index 7f40a8b34..7f40a8b34 100644
--- a/docker/0.7/Dockerrun.aws/.ebextensions/01_files.config
+++ b/docker/1.1/Dockerrun.aws/.ebextensions/01_files.config
diff --git a/docker/0.7/Dockerrun.aws/Dockerrun.aws.json b/docker/1.1/Dockerrun.aws/Dockerrun.aws.json
index b53ec235c..042e79bd3 100755
--- a/docker/0.7/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": [

diff --git a/docker/1.1/config_docker.json b/docker/1.1/config_docker.json
new file mode 100644
index 000000000..ab5b0a7be
--- /dev/null
+++ 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": ""
+    }
+}
diff --git a/docker/0.7/docker-entry.sh b/docker/1.1/docker-entry.sh
index 6bd2a1263..6bd2a1263 100755
--- a/docker/0.7/docker-entry.sh
+++ b/docker/1.1/docker-entry.sh
diff --git a/model/version.go b/model/version.go
index d03f64ba2..a61004fde 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",
diff --git a/web/templates/head.html b/web/templates/head.html
index 8039f48a1..e4f1b56b3 100644
--- 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>