summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Solving conflicts and also fixing css for MM-1752Asaad Mahmood2015-08-213-2/+5
* Merge branch 'master' of https://github.com/mattermost/platform into ui-changesAsaad Mahmood2015-08-215-211/+552
|\
| * 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
* | | | | Updating intro text for channelsAsaad Mahmood2015-08-211-2/+2
* | | | | Removing getDOMNode from view_imageAsaad Mahmood2015-08-211-2/+2
* | | | | Multiple UI ImprovementsAsaad Mahmood2015-08-2111-30/+73
|/ / / /
* | | | 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
| * | | Url parameters are now removed after logging inReed Garmsen2015-08-191-2/+8
* | | | Merge pull request #412 from mattermost/sidebar-patchJoram Wilander2015-08-202-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixing a few refactoring errors.Christopher Speller2015-08-202-7/+7
| | |/ | |/|
* | | Merge pull request #406 from mattermost/mm-1281Christopher Speller2015-08-194-5/+23
|\ \ \
| * | | Track channel creator in DB and show in channel intro message.JoramWilander2015-08-194-5/+23
* | | | Merge pull request #400 from nickago/MM-1829Christopher Speller2015-08-195-1187/+1245
|\ \ \ \ | |_|/ / |/| | |
| * | | Further cosmetic refactoringnickago2015-08-181-153/+176
| * | | Cosmetic refactoringnickago2015-08-181-5/+11
| * | | Clear state info on section changenickago2015-08-182-9/+13
| * | | Split up user settings filesnickago2015-08-185-1182/+1207
* | | | Merge pull request #394 from mattermost/mm-1410Joram Wilander2015-08-1916-805/+1428
|\ \ \ \
| * | | | Requiring team admin to import and fixing a few style issuesChristopher Speller2015-08-193-9/+5
| * | | | Cosmetic refactoring for ESLintChristopher Speller2015-08-199-877/+952