summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2037 from mattermost/plt-1862Corey Hulen2016-02-012-3/+10
|\
| * Fix console errorsJoramWilander2016-02-012-3/+10
* | Merge pull request #2039 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-015-54/+53
|\ \
| * | Fixing system console and changing swapping icon with reply iconAsaad Mahmood2016-02-015-54/+53
* | | Merge pull request #2038 from ZBoxApp/PLT-7-sidebarJoram Wilander2016-02-0123-224/+1307
|\ \ \ | |/ / |/| |
| * | PLT-7: Refactoring frontend (chunk 8)Elias Nahum2016-02-0123-224/+1307
|/ /
* | Merge pull request #2029 from ZBoxApp/PLT-7-userChristopher Speller2016-02-0123-331/+2256
|\ \
| * | PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-313-18/+8
| * | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-3023-331/+2266
* | | Merge pull request #1966 from ttyniwa/feature/warning_when_demote_own_role_fr...Christopher Speller2016-02-013-24/+132
|\ \ \ | |_|/ |/| |
| * | fix text localization.Tatsuya Niwa2016-01-303-4/+28
| * | fix ESLint warnings.Tatsuya Niwa2016-01-301-4/+4
| * | fix role bug.Tatsuya Niwa2016-01-301-5/+12
| * | fix ESLint warnings.Tatsuya Niwa2016-01-301-1/+2
| * | delete DemoteOwnRoleModalTatsuya Niwa2016-01-302-109/+36
| * | fix ESLint warnings.Tatsuya Niwa2016-01-301-1/+1
| * | fix ESLint warnings.Tatsuya Niwa2016-01-301-4/+1
| * | PLT-588 Add a warning when a user demotes themselves from System Admin to ano...Tatsuya Niwa2016-01-302-25/+177
* | | Merge pull request #2031 from mattermost/Typos-and-tweaksCorey Hulen2016-01-311-2/+2
|\ \ \ | |_|/ |/| |
| * | occured > occurredit332016-01-311-2/+2
|/ /
* | Merge pull request #2023 from ZBoxApp/PLT-7-templatesChristopher Speller2016-01-2911-70/+208
|\ \ | |/ |/|
| * Remove authorElias Nahum2016-01-292-6/+0
| * PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-2911-70/+214
* | Merge pull request #2022 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-01-291-0/+9
|\ \ | |/ |/|
| * Improvements to system consoleAsaad Mahmood2016-01-291-0/+9
|/
* Merge pull request #2020 from ZBoxApp/PLT-7-pages2Harrison Healey2016-01-2912-99/+700
|\
| * PLT-7: Refactoring frontend (chunk 5)Elias Nahum2016-01-2912-99/+700
|/
* Merge pull request #2018 from fallenby/PLT-1592Christopher Speller2016-01-291-4/+4
|\
| * Revised PLT-1592Frank Allenby2016-01-292-5/+1
| * Completed PLT-1592Frank Allenby2016-01-292-6/+10
* | Merge pull request #2016 from mattermost/PLT-1765Christopher Speller2016-01-295-50/+93
|\ \
| * \ Merge branch 'master' into PLT-1765=Corey Hulen2016-01-2835-490/+2820
| |\ \
| * | | PLT-1765 allowing support of 2 previous versions=Corey Hulen2016-01-285-50/+93
| | |/ | |/|
* | | Merge pull request #2013 from mattermost/plt-1749Christopher Speller2016-01-292-1/+3
|\ \ \
| * | | Return channel type in new post websocket eventsJoramWilander2016-01-282-1/+3
| | |/ | |/|
* | | Merge pull request #2011 from mattermost/plt-1837Christopher Speller2016-01-293-18/+2
|\ \ \
| * | | Removed translation for unneeded link expiryJoramWilander2016-01-282-10/+2
| * | | Remove expiry from public linksJoramWilander2016-01-281-8/+0
* | | | Merge pull request #2015 from ZBoxApp/PLT-7-pagesJoram Wilander2016-01-2924-107/+766
|\ \ \ \
| * | | | Removed duplicates Messaging md files from doc folderElias Nahum2016-01-282-84/+0
| * | | | Fix docs route to include the user localeElias Nahum2016-01-283-2/+93
| * | | | PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-2824-106/+758
| | |/ / | |/| |
* | | | Merge pull request #2014 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-285-31/+69
|\ \ \ \ | |/ / / |/| | |
| * | | Adding reply iconAsaad Mahmood2016-01-292-10/+36
| * | | Adding reply functionalityAsaad Mahmood2016-01-285-22/+34
|/ / /
* | | Merge pull request #2010 from ZBoxApp/PLT-7-tutorialCorey Hulen2016-01-289-44/+297
|\ \ \ | |/ / |/| |
| * | PLT-7: Refactoring frontend (chunk 3)Elias Nahum2016-01-289-44/+297
* | | Merge pull request #2007 from mattermost/PLT-7-server-fallbackJoram Wilander2016-01-281-5/+17
|\ \ \
| * | | Adding english fallback=Corey Hulen2016-01-281-8/+10
| * | | Adding english fallback to server=Corey Hulen2016-01-281-5/+15
| | |/ | |/|