summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #538 from hmhealey/mm2064Corey Hulen2015-09-0224-1233/+2086
|\ | | | | MM-2064 Cosmetic refactoring for ES6 and style guide
| * Refactored various React components to use ES6 syntax and to match the style ↵hmhealey2015-09-0125-1234/+2087
| | | | | | | | guide without any errors or warnings
* | Merge pull request #535 from nickago/MM-2067Corey Hulen2015-09-0228-995/+1496
|\ \ | | | | | | MM-2067 Cosmetic Refactoring
| * | Cosmetic Refactoringnickago2015-09-0228-995/+1496
| |/
* | Merge branch 'release-0.7.0'Christopher Speller2015-09-021-1/+1
|\ \
| * \ Merge pull request #537 from mattermost/mm-2091Christopher Speller2015-09-021-1/+1
| |\ \ | | | | | | | | HOTFIX for 0.7.0 - MM-2091 Fix bad user being set on team creation causing Manage Team modal to not work.
| | * | Fix bad user being set on team creation causing Manage Team modal to not work.JoramWilander2015-09-011-1/+1
| |/ /
* | | Merge pull request #552 from mattermost/it33-patch-12Christopher Speller2015-09-021-1/+3
|\ \ \ | | | | | | | | Breaking out AWS EBS instructions
| * | | Breaking out AWS EBS instructionsit332015-09-021-1/+3
| | | |
* | | | Merge pull request #551 from mattermost/it33-patch-11Christopher Speller2015-09-021-58/+5
|\ \ \ \ | | | | | | | | | | Update single-container-install.md
| * | | | Update single-container-install.mdit332015-09-021-58/+5
| |/ / / | | | | | | | | Breaking out AWS EBS setup into separate guide
* | | | Merge pull request #550 from mattermost/it33-patch-10Christopher Speller2015-09-021-0/+27
|\ \ \ \ | | | | | | | | | | Create aws-ebs-setup.md
| * | | | Create aws-ebs-setup.mdit332015-09-021-0/+27
| |/ / / | | | | | | | | Breaking AWS EBS install instructions out of single-container instructions
* | | | Merge pull request #549 from mattermost/it33-patch-9Christopher Speller2015-09-021-0/+38
|\ \ \ \ | |/ / / |/| | | Create smtp-email-setup.md
| * | | Create smtp-email-setup.mdit332015-09-021-0/+38
|/ / / | | | | | | Needed to be referenced by multiple setup instructions
* | | Merge pull request #543 from mattermost/it33-patch-10Christopher Speller2015-09-021-0/+173
|\ \ \ | | | | | | | | Create single-container-install.md
| * | | Create single-container-install.mdit332015-09-021-0/+173
| | |/ | |/| | | | Moving this out of README.md
* | | Merge pull request #544 from mattermost/it33-patch-10-1Christopher Speller2015-09-021-197/+36
|\ \ \ | | | | | | | | Re-organizing README and install instructions
| * | | Re-organizing README and install instructionsit332015-09-021-197/+36
| |/ / | | | | | | One of several updates as we build out /docs directory
* | | Merge pull request #542 from mattermost/it33-patch-9Christopher Speller2015-09-021-0/+0
|\ \ \ | | | | | | | | Moving requirements.md to /doc/install directory
| * | | Moving requirements.md to /doc/install directoryit332015-09-021-0/+0
| |/ /
* | | Merge pull request #541 from mattermost/it33-patch-8Christopher Speller2015-09-021-0/+5
|\ \ \ | |/ / |/| | Adding README.md to /doc directory
| * | Adding README.md to /doc directoryit332015-09-021-0/+5
|/ /
* | Merging release branch 'release-0.7.0'Christopher Speller2015-09-0120-20/+325
|\|
| * Also updating the position of the bottom unread indicatorAsaad Mahmood2015-09-012-2/+1
| |
| * MM-2046 - Updating momentum scroll on IOSAsaad Mahmood2015-09-011-0/+1
| |
| * Merge pull request #534 from mattermost/it33-patch-7Christopher Speller2015-09-011-0/+19
| |\ | | | | | | Adding documentation on configuring GitLab SSO
| | * Adding documentation on configuring GitLab SSOit332015-09-011-0/+19
| | |
| * | Merge pull request #528 from mattermost/MM-2056Christopher Speller2015-09-0110-18/+12
| |\ \ | | | | | | | | HOTFIX MM-2056 fixes problem with creating team
| | * | MM-2056 fixes problem with creating team=Corey Hulen2015-08-3110-18/+12
| | |/
| * | Merge pull request #527 from mattermost/mm-2082Christopher Speller2015-09-011-1/+3
| |\ \ | | |/ | |/| HOTFIX for 0.7.0 MM-2082 Fix missing forgot password link.
| | * Fix missing forgot password link.JoramWilander2015-08-311-1/+3
| |/
| * Creating dockerfiles for release 0.7.0Christopher Speller2015-08-316-0/+290
| |
* | Merge pull request #520 from zackify/masterJoram Wilander2015-08-311-1/+1
|\ \ | | | | | | Fix TLS warning due to insecure content
| * | fixed ssl warning on signup pageZach Silveira2015-08-291-1/+1
| | |
* | | Merge pull request #526 from mattermost/style-modsChristopher Speller2015-08-311-2/+2
|\ \ \ | | | | | | | | Removing complexity rule. Removing check of camel case from property names
| * | | Removing complexity rule. Removing check of camel case from property namesChristopher Speller2015-08-311-2/+2
|/ / /
* | | Merge pull request #523 from mattermost/it33-patch-6-1Christopher Speller2015-08-311-1/+1
|\ \ \ | | | | | | | | Updating text on "Find Teams" email
| * | | Updating text on "Find Teams" emailit332015-08-301-1/+1
| |/ / | | | | | | Making it clear that user requested email.
* | | Merge pull request #522 from mattermost/it33-patch-1Christopher Speller2015-08-311-1/+1
|\ \ \ | | | | | | | | Updated marketing text on email sign-up
| * | | Updated marketing text on email sign-upit332015-08-301-1/+1
| |/ /
* | | Merge pull request #508 from rgarmsen2295/reformat_user_generalChristopher Speller2015-08-312-79/+175
|\ \ \ | | | | | | | | [Cosmetic Reformatting] UserSettingsGeneralTab (and a few minor changes to PostInfo)
| * | | Reformats the user_settings_general.jsx file; also adds missing keys to ↵Reed Garmsen2015-08-272-79/+175
| | | | | | | | | | | | | | | | children in an array
* | | | Merge pull request #497 from nickago/MM-1842Christopher Speller2015-08-311-0/+8
|\ \ \ \ | | | | | | | | | | MM-1842 Added invite link to off-topic channel
| * | | | Added invite link to off-topic channelnickago2015-08-271-0/+8
| | | | |
* | | | | Merge pull request #494 from rgarmsen2295/mm-1628Christopher Speller2015-08-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | MM-1628 The navbar is no longer completely obscured by the status bar in full screen safari on iOS
| * | | | | When viewing the site on iOS from the home screen, the top of the screen is ↵Reed Garmsen2015-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | no longer obscured by the phone's status bar
* | | | | | Merge pull request #493 from asaadmahmoodspin/masterChristopher Speller2015-08-312-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1899 - Updating UI for commands in input box
| * | | | | | Removing console.log from command_listAsaad Mahmood2015-08-271-2/+0
| | | | | | |
| * | | | | | Reverting AllowTesting in config.jsAsaad Mahmood2015-08-271-1/+1
| | | | | | |