summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md5
-rw-r--r--README.md35
-rw-r--r--api/context.go3
-rw-r--r--docker/dev/README.md28
4 files changed, 46 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5876dc894..7aac49ff2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@ Documentation
- Updated software and hardware requirements documentation
- Re-organized install instructions out of README and into separate files
+- Added Code Contribution Guidelines
+- Added new hardware sizing recommendations
- Consolidated licensing information into LICENSE.txt and NOTICE.txt
Performance
@@ -33,7 +35,8 @@ Code Quality
### Bug Fixes
-- Fixed performance issue with slow typing on iOS
+- Fixed performance issue with slow typing on iOS
+- Fixed issue so that SSO option automatically set EmailVerified=true (it was false previously)
### Contributors
diff --git a/README.md b/README.md
index 3c9d5d408..8cbddc1c6 100644
--- a/README.md
+++ b/README.md
@@ -57,3 +57,38 @@ Prior to production installation, please review [Mattermost system requirements]
- [GitLab Mattermost Production Installation](https://gitlab.com/gitlab-org/gitlab-mattermost) - Install Mattermost for production environments bundled with GitLab, a leading open source Git repository, using an omnibus package for Ubuntu 12.04, Ubuntu 14.04, Debian 7, Debian 8, and CentOS 6 (and RedHat/Oracle/Scientific Linux 6), CentOS 7 (and RedHat/Oracle/Scientific Linux 7).
For technical questions and answers, please visit the [Mattermost forum](http://forum.mattermost.org).
+
+## Get Involved with Mattermost
+
+Joining the Mattermost community is a great way to build relationships with other talented and like-minded professionals, increase awareness of the interesting work you are doing, and sharpen your skills. Here are some of the ways that you can make a difference in the Mattermost ecosystem:
+
+#### Discuss
+
+- Visit the [Mattermost Forum](http://forum.mattermost.org/) for technical questions and answers.
+- [Join](https://groups.google.com/a/mattermost.com/forum/#!forum/general/join) the [Mattermost User Mailing List](https://groups.google.com/a/mattermost.com/forum/#!forum/general) for general, open-ended questions and software announcements.
+- [Join](https://groups.google.com/a/mattermost.com/forum/#!forum/developer/join) the [Mattermost Developers Mailing List](https://groups.google.com/a/mattermost.com/forum/#!forum/developer) for discussing contributing code to Mattermost.
+
+#### Review
+
+- Share feedback on [Mattermost Design Feedback Requests](http://forum.mattermost.org/c/feature-ideas/specifications), which offer early previews of designs community comments and feedback.
+- Visit the [Feature Ideas Forum](http://mattermost.uservoice.com/forums/306457-general) and consider upvoting community feature ideas, which are reviewed for each monthly release.
+
+#### Share
+
+- Blog about your Mattermost experiences and use cases, either on your personal blog, the [Mattermost forum](http://forum.mattermost.org), or contribute a guest post to the [Mattermost blog](http://www.mattermost.org/category/blog/). If you write about Mattermost. please contact our community team at info@mattermost.com for help promoting your content.
+- Tweet to share with your community and friends why you use Mattermost. Follow [@MattermostHQ](https://twitter.com/mattermosthq) on Twitter and conversations on [#mattermost](https://twitter.com/search?q=%23mattermost&src=typd).
+
+#### Write
+
+- As with most open source projects, Mattermost documentation is maintained in a public repository. You can propose changes by [submitting pull requests (no programming skills required)](http://forum.mattermost.org/t/help-improve-mattermost-documentation/194). We highly welcome you to add improvements, write guides and tutorials, and expand on sections.
+- Prior to contributing, please review [Mattermost Documentation Guidelines](http://www.mattermost.org/documentation-guidelines/), which include standards on writing Mattermost documentation for a global audience, who might not use English as their first language.
+
+#### Contribute
+
+- Share [feature ideas](http://www.mattermost.org/feature-requests/) with the Mattermost community
+- Review the [Mattermost Code Contribution Guidelines](doc/developer/code-contribution.md) to submit patches for the core product
+- Consider building tools that help developers and IT professionals manage Mattermost more effectively (API documentation coming in Beta2)
+
+#### Have other ideas or suggestions?
+
+If there’s some other way you’d like to contribute, please contact us at info@mattermost.com. We’d love to meet you!
diff --git a/api/context.go b/api/context.go
index aaf304e2c..ac5dbc7ec 100644
--- a/api/context.go
+++ b/api/context.go
@@ -106,6 +106,9 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if !h.isApi {
w.Header().Set("X-Frame-Options", "DENY")
w.Header().Set("Content-Security-Policy", "frame-ancestors none")
+ } else {
+ // All api response bodies will be JSON formatted
+ w.Header().Set("Content-Type", "application/json")
}
sessionId := ""
diff --git a/docker/dev/README.md b/docker/dev/README.md
index a4b6fb9bb..f737a1554 100644
--- a/docker/dev/README.md
+++ b/docker/dev/README.md
@@ -1,28 +1,13 @@
-**Mattermost Alpha**
-**Team Communication Service**
-**Development Build**
+Mattermost
+==========
-
-About 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
=====================
-You're installing "Mattermost Alpha", a pre-released version providing an early look at what we're building. While the core team runs this version internally, it's not recommended for production since we can't guarantee API stability or backwards compatibility.
-
-That said, any issues at all, please let us know on the Mattermost forum.
-
-Notes:
-- For Alpha, Docker is intentionally setup as a single container, since production deployment is not yet recommended.
-
-Local Machine Setup (Docker)
------------------------------
-
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`
@@ -35,9 +20,4 @@ To run an instance of the latest code from the master branch on GitHub you can r
`docker run --name mattermost-dev -d --publish 8065:80 mattermost/platform:dev`
-
-License
--------
-
-Mattermost is licensed under an "Apache-wrapped AGPL" model inspired by MongoDB. Similar to MongoDB, you can run and link to the system using Configuration Files and Admin Tools licensed under Apache, version 2.0, as described in the LICENSE file, as an explicit exception to the terms of the GNU Affero General Public License (AGPL) that applies to most of the remaining source files. See individual files for details.
-
+Any questions, please visit http://forum.mattermost.org