summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updating dockerfiles to allow for previewing of latest master and fixing loca...Christopher Speller2015-08-117-9/+317
* Merge pull request #364 from mattermost/release-0.6.0Christopher Speller2015-08-112-2/+2
|\
| * Updating Dockerfile and Dockerrun.aws.json to point at releaseChristopher Speller2015-08-052-2/+2
* | Merge pull request #348 from nickago/MM-1550Christopher Speller2015-08-103-299/+233
|\ \
| * | further cosmetic refactoringnickago2015-08-101-67/+65
| * | Removed vetigial argument and properly aligned post_storenickago2015-08-101-176/+176
| * | Added cosmetic refactoringnickago2015-08-051-46/+49
| * | Removed all functionality required for removing used mentions from auto-completenickago2015-08-053-76/+9
* | | Merge pull request #356 from nickago/MM-1646Christopher Speller2015-08-101-1/+1
|\ \ \
| * | | Fixed typo in channel/group namingnickago2015-08-071-1/+1
* | | | Merge pull request #351 from rgarmsen2295/mm-1759Christopher Speller2015-08-102-32/+45
|\ \ \ \
| * | | | Cosmetic refactoringReed Garmsen2015-08-061-31/+43
| * | | | Correct sign up link now displays on ie10 in the 'Team Invite Link' modal; re...Reed Garmsen2015-08-062-2/+3
| |/ / /
* | | | Merge pull request #349 from mattermost/makefile-redis-removeHarrison Healey2015-08-071-20/+0
|\ \ \ \
| * | | | Removing redis from makefileChristopher Speller2015-08-061-20/+0
| |/ / /
* | | | Merge pull request #347 from mattermost/it33-patch-1Harrison Healey2015-08-071-5/+4
|\ \ \ \
| * | | | Removing note on creating new .bash_profileit332015-08-061-2/+1
| * | | | MM-1898 Updates to Mac OSX instructionsit332015-08-051-5/+5
* | | | | Merge pull request #341 from rgarmsen2295/mm-1643Harrison Healey2015-08-071-61/+72
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Cosmetic refactoring of the Security Setting subsectionReed Garmsen2015-08-051-61/+72
| * | | | Fixed issue with password field not being cleared after canceling out of chan...Reed Garmsen2015-08-041-1/+1
* | | | | Merge pull request #346 from hmhealey/mm1613Christopher Speller2015-08-062-75/+128
|\ \ \ \ \
| * | | | | 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 #344 from nickago/MM-1646Christopher Speller2015-08-062-5/+15
|\ \ \ \ \
| * | | | | Changes the word channel to group for priavte groupsnickago2015-08-052-5/+15
| | |_|/ / | |/| | |
* | | | | Merge pull request #340 from nickago/MM-1769Christopher Speller2015-08-061-1/+1
|\ \ \ \ \
| * | | | | Changed max number of displayed direct message channels to 20nickago2015-08-051-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #335 from mattermost/it33-patch-4Christopher Speller2015-08-061-2/+2
|\ \ \ \ \
| * | | | | Typo and case correctionit332015-08-041-2/+2
| |/ / / /
* | | | | Merge pull request #333 from nickago/MM-1181Christopher Speller2015-08-061-0/+8
|\ \ \ \ \
| * | | | | Drawing all images onto a white background, thus removing transparencynickago2015-08-041-0/+8
* | | | | | Merge pull request #332 from nickago/MM-1720Christopher Speller2015-08-061-55/+62
|\ \ \ \ \ \
| * | | | | | Added cosmetic refactoringnickago2015-08-041-45/+49
| * | | | | | Added listening to the Team Store and removed current team name from team swa...nickago2015-08-041-11/+14
| |/ / / / /
* | | | | | Merge pull request #330 from hmhealey/mm1579Christopher Speller2015-08-061-2/+1
|\ \ \ \ \ \
| * | | | | | Added a date separator before the first post displayed in a channelhmhealey2015-08-041-2/+1
| |/ / / / /
* | | | | | Merge pull request #329 from asaadmahmoodspin/ui-changesChristopher Speller2015-08-0612-37/+102
|\ \ \ \ \ \
| * | | | | | Adding tooltip to email in user popoverAsaad Mahmood2015-08-052-0/+7
| * | | | | | Fixing style guide stuff in post_listAsaad Mahmood2015-08-051-5/+3
| * | | | | | Removing console.logAsaad Mahmood2015-08-051-1/+0
| * | | | | | Fixing mentions scroll again due to merge conflictAsaad Mahmood2015-08-051-0/+7
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-0512-295/+359
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Updating channel header tooltip placementAsaad Mahmood2015-08-041-1/+1
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-042-190/+223
| |\ \ \ \ \ \
| * | | | | | | Fixing scrolling of mention box in RHSAsaad Mahmood2015-08-041-1/+3
| * | | | | | | Adding bootstrap tooltip for channel membersAsaad Mahmood2015-08-041-1/+1
| * | | | | | | UI ImprovementsAsaad Mahmood2015-08-0412-41/+99
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #324 from rgarmsen2295/mm-1617Christopher Speller2015-08-062-56/+81
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Minor cosmetic refactoring to the General Tab of user settingsReed Garmsen2015-08-042-57/+77