summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into mm-1696Asaad Mahmood2015-08-217-45/+122
|\
| * Merge pull request #431 from nickago/MM-1797Christopher Speller2015-08-211-8/+2
| |\
| | * Removed state holding functionality when switching to access history or sessi...nickago2015-08-201-8/+2
| * | Merge pull request #432 from nickago/MM-1804Joram Wilander2015-08-211-0/+3
| |\ \
| | * | Updated navbar to more accurately mirror desktop preformancenickago2015-08-201-0/+3
| | |/
| * | Merge pull request #437 from mattermost/it33-patch-4Christopher Speller2015-08-211-2/+2
| |\ \
| | * | Adjusting "Find Your Team" instructionsit332015-08-211-2/+2
| * | | Merge pull request #435 from mattermost/it33-patch-2Christopher Speller2015-08-211-2/+2
| |\ \ \
| | * | | Fixing typo "Summery" -> "Summary"it332015-08-201-2/+2
| | |/ /
| * | | Merge pull request #434 from mattermost/it33-patch-1Christopher Speller2015-08-211-1/+1
| |\ \ \
| | * | | Fixing typo "SelectFile" -> "Select File"it332015-08-201-1/+1
| | |/ /
| * | | Merge pull request #425 from rgarmsen2295/mm-1901Joram Wilander2015-08-212-35/+91
| |\ \ \
| | * | | Fixed issue with channel name in url and added loading icon to replace 'Join'...Reed Garmsen2015-08-202-13/+35
| | * | | Cosmetic reformatting of more_channels.jsxReed Garmsen2015-08-201-29/+62
| | * | | Users are now placed in the channel after joining it from the 'More...' chann...Reed Garmsen2015-08-201-1/+2
| * | | | Merge pull request #429 from nickago/MM-1859Joram Wilander2015-08-211-0/+12
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Added updating of username based mentions on username changenickago2015-08-201-0/+12
| | | |/ | | |/|
* | / | MM-1696 - Improvements for Slack ImportAsaad Mahmood2015-08-213-9/+37
|/ / /
* | | Merge pull request #433 from nickago/MM-1840Corey Hulen2015-08-201-1/+1
|\ \ \
| * | | changed title of edit_channel modalnickago2015-08-201-1/+1
| |/ /
* | | Merge pull request #423 from nickago/MM-1888Corey Hulen2015-08-201-1/+1
|\ \ \
| * | | Added blank href to make tab recognize and jump to itnickago2015-08-201-1/+1
| |/ /
* | | Merge pull request #410 from rgarmsen2295/mm-1821bCorey Hulen2015-08-202-202/+506
|\ \ \
| * | | Reformats the user_settings_notifications.jsx fileReed Garmsen2015-08-201-98/+308
| * | | Cosmetic reformatting of the channel_notifications.jsx fileReed Garmsen2015-08-201-104/+198
| | |/ | |/|
* | | Merge pull request #413 from mattermost/mm-1940Corey Hulen2015-08-201-7/+44
|\ \ \
| * | | Adding updates section to READMEChristopher Speller2015-08-201-7/+44
* | | | Merge pull request #424 from mattermost/mm-1987Joram Wilander2015-08-201-2/+2
|\ \ \ \
| * | | | Fixing posts not being able to uploadChristopher Speller2015-08-201-2/+2
* | | | | Merge pull request #422 from mattermost/ampm-fixJoram Wilander2015-08-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixing AM-PM issueChristopher Speller2015-08-201-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #418 from mattermost/mm-1811Corey Hulen2015-08-201-29/+87
|\ \ \ \
| * | | | Skipping invite members step when email is disabled. Cosmetic refactoring inc...Christopher Speller2015-08-201-29/+87
* | | | | Merge pull request #421 from nickago/hotfixCorey Hulen2015-08-201-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed this/self typonickago2015-08-201-1/+1
* | | | | Merge pull request #404 from nickago/MM-1886Joram Wilander2015-08-201-78/+100
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Made state getter member function and fixed scu edge casenickago2015-08-201-39/+35
| * | | | Re-added state update on shownickago2015-08-191-0/+1
| * | | | Cosmetic refactoringnickago2015-08-191-56/+67
| * | | | Added loading screen to add more members modalnickago2015-08-191-20/+34
* | | | | Merge pull request #419 from mattermost/revert-416-ui-changesJoram Wilander2015-08-2011-52/+21
|\ \ \ \ \
| * | | | | Revert "Multiple UI Improvements"Joram Wilander2015-08-2011-52/+21
|/ / / / /
* | | | | Merge pull request #416 from asaadmahmoodspin/ui-changesHarrison Healey2015-08-2011-21/+52
|\ \ \ \ \
| * | | | | Multiple UI ImprovementsAsaad Mahmood2015-08-2011-21/+52
| | |_|/ / | |/| | |
* | | | | Merge pull request #417 from nickago/hotfixHarrison Healey2015-08-201-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fixed mixed case typonickago2015-08-201-1/+1
|/ / / /
* | | | Merge pull request #414 from mattermost/update-etag-versionChristopher Speller2015-08-202-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Update etag version for the addition of CreatorId field to channelsJoramWilander2015-08-202-2/+2
| |/ /
* | | Merge pull request #401 from rgarmsen2295/mm-1875Harrison Healey2015-08-201-14/+54
|\ \ \
| * | | Additional cosmetic reformatting to meet new es6 requirementsReed Garmsen2015-08-191-18/+52