summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added ShowTermsDuringSignup config option on the client which toggles the Ter...hmhealey2015-08-052-1/+9
* Reformat signup_user_complete to match style guidehmhealey2015-08-051-76/+121
* Merge pull request #342 from mattermost/release-0.6.0Christopher Speller2015-08-058-58/+109
|\
| * Merge pull request #331 from mattermost/060-readme-updatesChristopher Speller2015-08-051-48/+52
| |\
| | * Correcting minor typos, formatting, wordingit332015-08-041-31/+30
| | * Fixing typeoChristopher Speller2015-08-041-1/+1
| | * Updates to the README for release.it332015-08-041-23/+28
| * | Merge pull request #328 from asaadmahmoodspin/mm-1874Christopher Speller2015-08-053-4/+31
| |\ \
| | * | Updating css for url input add-on and removing display flexAsaad Mahmood2015-08-052-3/+6
| | * | Fixing tooltip word-wrapAsaad Mahmood2015-08-051-0/+3
| | * | mm-1874 - Improving team url screen and fixing file attachments in IE 10Asaad Mahmood2015-08-043-2/+23
| | |/
| * | Merge pull request #337 from mattermost/docker-config-updatesChristopher Speller2015-08-052-5/+13
| |\ \
| | * | Updating docker configuration files for releaseChristopher Speller2015-08-052-5/+13
| |/ /
| * | Merge pull request #320 from rgarmsen2295/mm-1873Christopher Speller2015-08-041-1/+1
| |\ \
| | * | Fixed typo on landing page for sign-upReed Garmsen2015-08-031-1/+1
| | |/
| * | Merge pull request #319 from mattermost/fix-distChristopher Speller2015-08-041-0/+12
| |\ \ | | |/ | |/|
| | * Adding docs to build=Corey Hulen2015-08-031-0/+12
| |/
* | Merge pull request #338 from nickago/MM-1671Christopher Speller2015-08-051-1/+1
|\ \
| * | Fixed non-cosmetic refactoring typonickago2015-08-051-1/+1
|/ /
* | Merge pull request #326 from nickago/MM-1754Christopher Speller2015-08-046-6/+6
|\ \
| * | Added closing on ESC key pressnickago2015-08-046-6/+6
* | | Merge pull request #321 from rgarmsen2295/mm-1611Christopher Speller2015-08-041-84/+96
|\ \ \
| * | | Cosmetic changes to better follow style guideReed Garmsen2015-08-031-75/+95
| * | | Removes ability for the mention list to cycle from top to bottom and vice-versaReed Garmsen2015-08-031-13/+5
| | |/ | |/|
* | | Merge pull request #310 from nickago/MM-1671Christopher Speller2015-08-041-62/+70
|\ \ \
| * | | Cosmetic Refactoringnickago2015-08-041-59/+67
| * | | Changed 'Close' to 'Cancel'nickago2015-08-041-2/+2
| * | | Placed button inside of form to allow for submission on strike of enter keynickago2015-08-041-8/+8
| | |/ | |/|
* | | Merge pull request #325 from rgarmsen2295/mm-1618Christopher Speller2015-08-043-19/+37
|\ \ \
| * | | Fixed help text rendering on mobileReed Garmsen2015-08-042-9/+10
| * | | Added help text informing the user that the team invite link has been copied ...Reed Garmsen2015-08-033-18/+35
| | |/ | |/|
* | | Merge pull request #323 from rgarmsen2295/mm-1554Christopher Speller2015-08-041-119/+151
|\ \ \
| * | | Cosmetic refactoring to better fit style guideReed Garmsen2015-08-041-121/+151
| * | | The first field of the 'Invite New Member' field can no longer be cleared or ...Reed Garmsen2015-08-031-0/+2
| |/ /
* | | Merge pull request #318 from rgarmsen2295/mm-1592Christopher Speller2015-08-041-81/+99
|\ \ \
| * | | Cosmetic refactoring to be inline with the style guideReed Garmsen2015-08-021-84/+95
| * | | Searching for recent mentions no longer includes all or channel if those opti...Reed Garmsen2015-08-021-1/+8
* | | | Merge pull request #322 from nickago/MM-1679Christopher Speller2015-08-041-109/+124
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed variable naming conflict with msg and added cosmetic refactorsnickago2015-08-031-6/+6
| * | | Changed private channel list to use username and did semi-cosmetic refactoringnickago2015-08-031-108/+123
| | |/ | |/|
* | | Merge pull request #309 from nickago/MM-1691Christopher Speller2015-08-042-4/+14
|\ \ \ | |/ / |/| |
| * | User Settings modal resets to General tab with nothing open on closenickago2015-07-312-4/+14
* | | fixing docker file=Corey Hulen2015-08-021-1/+1
| |/ |/|
* | incrementing to rc2=Corey Hulen2015-08-021-1/+1
* | Merge pull request #311 from mattermost/mm-1619Corey Hulen2015-08-0214-8/+462
|\ \
| * \ Merge branch 'master' into mm-1619=Corey Hulen2015-08-02210-24938/+8377
| |\ \ | |/ / |/| |
* | | Fixing upgrade=Corey Hulen2015-08-021-1/+1
* | | Merge pull request #278 from mattermost/mm-1702Corey Hulen2015-08-027-28/+185
|\ \ \
| * | | Moving the handing of extra_info etag before the extra info is retrieved from...Christopher Speller2015-07-301-10/+14
| * | | Adding etag to channel extra_info api call.Christopher Speller2015-07-297-23/+176