summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0325-268/+788
|\
| * Merge pull request #2060 from ZBoxApp/PLT-7-channelHarrison Healey2016-02-0325-268/+788
| |\
| | * Fix socketError message in spanishElias Nahum2016-02-031-1/+1
| | * Add missing translationsElias Nahum2016-02-032-99/+110
| | * Messages for SocketStore and small fixesElias Nahum2016-02-038-43/+96
| | * PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0319-126/+582
* | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0352-842/+2399
|\| |
| * | 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-0310-583/+823
| |\ \
| | * | Add basic server audit tab to system console for EEJoramWilander2016-02-0210-584/+824
| * | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-038-89/+354
| |\ \ \
| | * | | Remove missing ES translationsJoramWilander2016-02-021-7/+0
| | * | | Added extra system-wide statistics for EEJoramWilander2016-02-028-89/+361
| | |/ /
| * | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0320-119/+821
| |\ \ \
| | * | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0220-119/+821
| | |/ /
| * | | Merge pull request #2048 from rgarmsen2295/plt-1317Joram Wilander2016-02-036-28/+31
| |\ \ \
| | * | | Changed clock icon in repeat posts to simple timestampReed Garmsen2016-02-026-24/+31
| | * | | Removed css clock from sub-postsReed Garmsen2016-02-021-4/+0
| | |/ /
| * | | 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-036-2/+322
| |\ \ \ | | |_|/ | |/| |
| | * | Added ability to sign in via username; separated email sign in and sign up co...Reed Garmsen2016-02-026-2/+322
| | |/
| * | Update center_panel.jsxEric Sethna2016-02-021-1/+1
| * | Merge pull request #2026 from rgarmsen2295/plt-1720Corey Hulen2016-02-023-8/+28
| |\ \
| | * | Properly disable the get team link functionality when user creation is disabledReed Garmsen2016-02-023-8/+28
| | |/
| * / 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-023-12/+108
* | Adding loc to front-end=Corey Hulen2016-02-023-51/+302
* | Fixing merge=Corey Hulen2016-02-01153-1784/+9627
|\|
| * Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-rightCorey Hulen2016-02-0116-76/+446
| |\
| | * fix hour12 React warning for FormattedDateElias Nahum2016-02-016-5/+10
| | * PLT-7: Refactoring frontend (chunk 9)Elias Nahum2016-02-0116-75/+440
| * | Removed escope and upgraded babel-eslintJoramWilander2016-02-011-2/+1
| |/
| * Merge branch 'master' into fix-email=Corey Hulen2016-02-011-7/+8
| |\
| | * Temporary fix for babel-eslintJoramWilander2016-02-011-7/+8
| * | Merge branch 'master' into fix-email=Corey Hulen2016-02-012-3/+10
| |\|
| | * Merge pull request #2037 from mattermost/plt-1862Corey Hulen2016-02-012-3/+10
| | |\
| | | * Fix console errorsJoramWilander2016-02-012-3/+10
| * | | Fixing email unit tests=Corey Hulen2016-02-011-2/+2
| |/ /
| * | 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
| * | | PLT-7: Refactoring frontend (chunk 8)Elias Nahum2016-02-0123-224/+1307
| |/ /