summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* PLT-1429 Fixing code review comments=Corey Hulen2016-02-041-1/+0
* Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0323-145/+518
|\
| * Merge pull request #2060 from ZBoxApp/PLT-7-channelHarrison Healey2016-02-0323-145/+518
| |\
| | * Messages for SocketStore and small fixesElias Nahum2016-02-036-42/+81
| | * PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0317-103/+437
* | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0348-771/+2139
|\| |
| * | Fix katex sanitizationJoramWilander2016-02-031-1/+1
| |/
| * Merge pull request #2055 from khoa-le/PLT-1693Christopher Speller2016-02-031-1/+2
| |\
| | * Clear the password input boxes when user enter incorrect Retype New Password.Khoa, Le Ngoc2016-02-031-1/+2
| * | Merge pull request #2054 from khoa-le/PLT-1433Christopher Speller2016-02-031-1/+1
| |\ \
| | * | OGG files render as audio files with previewKhoa, Le Ngoc2016-02-031-1/+1
| | |/
| * | Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-039-536/+772
| |\ \
| | * | Add basic server audit tab to system console for EEJoramWilander2016-02-029-536/+772
| * | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-035-85/+342
| |\ \ \
| | * | | Added extra system-wide statistics for EEJoramWilander2016-02-025-85/+342
| | |/ /
| * | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0318-119/+641
| |\ \ \
| | * | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0218-119/+641
| | |/ /
| * | | Merge pull request #2048 from rgarmsen2295/plt-1317Joram Wilander2016-02-035-8/+27
| |\ \ \
| | * | | Changed clock icon in repeat posts to simple timestampReed Garmsen2016-02-025-8/+27
| | |/ /
| * | | Merge pull request #2047 from hmhealey/helpurlJoram Wilander2016-02-031-8/+2
| |\ \ \
| | * | | Updated post help linkhmhealey2016-02-021-8/+2
| | |/ /
| * | | Merge pull request #2044 from khoa-le/PLT-1864Joram Wilander2016-02-031-0/+10
| |\ \ \
| | * | | Fixed Eslint validation.Khoa, Le Ngoc2016-02-021-2/+2
| | * | | Added help text indicating valid email required when user sign up from link.Khoa, Le Ngoc2016-02-021-0/+10
| | |/ /
| * | | Merge pull request #1991 from rgarmsen2295/plt-976Joram Wilander2016-02-035-2/+310
| |\ \ \ | | |_|/ | |/| |
| | * | Added ability to sign in via username; separated email sign in and sign up co...Reed Garmsen2016-02-025-2/+310
| | |/
| * | Update center_panel.jsxEric Sethna2016-02-021-1/+1
| * | Merge pull request #2026 from rgarmsen2295/plt-1720Corey Hulen2016-02-022-8/+27
| |\ \
| | * | Properly disable the get team link functionality when user creation is disabledReed Garmsen2016-02-022-8/+27
| | |/
| * / Fixed React invalid prop warning in Team SettingsReed Garmsen2016-02-021-1/+3
| |/
* | Fixing console=Corey Hulen2016-02-021-1/+1
* | Adding props to admin console=Corey Hulen2016-02-021-4/+100
* | Adding loc to front-end=Corey Hulen2016-02-022-51/+269
* | Fixing merge=Corey Hulen2016-02-01126-1589/+7199
|\|
| * Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-rightCorey Hulen2016-02-0114-75/+355
| |\
| | * fix hour12 React warning for FormattedDateElias Nahum2016-02-014-4/+8
| | * PLT-7: Refactoring frontend (chunk 9)Elias Nahum2016-02-0114-74/+350
| * | Removed escope and upgraded babel-eslintJoramWilander2016-02-011-2/+1
| |/
| * Temporary fix for babel-eslintJoramWilander2016-02-011-7/+8
| * 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