summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2016-02-01113-1443/+6952
|\
| * fix hour12 React warning for FormattedDateElias Nahum2016-02-014-4/+8
| * PLT-7: Refactoring frontend (chunk 9)Elias Nahum2016-02-0114-74/+350
| * 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-013-32/+31
| |\ \
| | * | Fixing system console and changing swapping icon with reply iconAsaad Mahmood2016-02-013-32/+31
| * | | PLT-7: Refactoring frontend (chunk 8)Elias Nahum2016-02-0121-217/+999
| |/ /
| * | Merge pull request #2029 from ZBoxApp/PLT-7-userChristopher Speller2016-02-0121-329/+1728
| |\ \
| | * | PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-311-14/+6
| | * | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-3021-329/+1736
| | |/
| * | Merge pull request #1966 from ttyniwa/feature/warning_when_demote_own_role_fr...Christopher Speller2016-02-011-24/+126
| |\ \ | | |/ | |/|
| | * fix text localization.Tatsuya Niwa2016-01-301-4/+22
| | * 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
| * | Remove authorElias Nahum2016-01-291-3/+0
| * | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-292-43/+94
| |/
| * PLT-7: Refactoring frontend (chunk 5)Elias Nahum2016-01-2910-98/+539
| * Merge pull request #2015 from ZBoxApp/PLT-7-pagesJoram Wilander2016-01-2912-82/+498
| |\
| | * PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-2812-82/+498
| * | Adding reply iconAsaad Mahmood2016-01-291-1/+7
| * | Adding reply functionalityAsaad Mahmood2016-01-281-17/+16
| |/
| * Merge pull request #2010 from ZBoxApp/PLT-7-tutorialCorey Hulen2016-01-287-40/+227
| |\
| | * PLT-7: Refactoring frontend (chunk 3)Elias Nahum2016-01-287-40/+227
| * | Merge pull request #2009 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-282-4/+7
| |\ \
| | * | Improving jump to recent messages UIAsaad Mahmood2016-01-281-4/+2
| | * | Fixing modals for IEAsaad Mahmood2016-01-281-0/+5
| * | | Merge pull request #2002 from ZBoxApp/PLT-7-reactHarrison Healey2016-01-2818-437/+1857
| |\ \ \ | | |/ / | |/| / | | |/
| | * PLT-7: Refactoring frontend (chunk 2)Elias Nahum2016-01-2718-437/+1857
| * | Updating tutorial gif for sidebarAsaad Mahmood2016-01-271-1/+1
| |/
| * Clear user typing text on channel switchJoramWilander2016-01-271-3/+11
| * Merge pull request #1995 from mattermost/PLT-1586bChristopher Speller2016-01-272-2/+3
| |\
| | * Fixing small issue with displaying activity log=Corey Hulen2016-01-272-2/+3
| * | Merge pull request #1992 from ZBoxApp/PLT-7-reactCorey Hulen2016-01-277-99/+480
| |\ \ | | |/ | |/|
| | * PLT-7: Refactoring frontend (chunk 1)Elias Nahum2016-01-267-99/+480
| * | Fixing naming=Corey Hulen2016-01-261-1/+1
| * | PLT-1586 Changing session reporting=Corey Hulen2016-01-261-3/+6
| * | PLT-1586 adding attach device id method=Corey Hulen2016-01-261-9/+16
| * | PLT-1586 adding LDAP/OAuth to iOS=Corey Hulen2016-01-261-1/+1
| |/
| * Cleaning up=Corey Hulen2016-01-251-1/+2
| * Cleaning up=Corey Hulen2016-01-251-1/+5
| * Cleaning up a little=Corey Hulen2016-01-251-15/+3
| * PLT-7 fixing error bar msg=Corey Hulen2016-01-251-0/+27
* | merging=Corey Hulen2016-01-2510-236/+533
|\|
| * Merge pull request #1977 from hmhealey/plt1685Corey Hulen2016-01-251-3/+8
| |\