summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-0315-587/+908
|\ \
| * | Add basic server audit tab to system console for EEJoramWilander2016-02-0215-588/+909
* | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-0316-95/+630
|\ \ \
| * | | Remove missing ES translationsJoramWilander2016-02-022-15/+0
| * | | Added extra system-wide statistics for EEJoramWilander2016-02-0217-95/+645
| |/ /
* | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0322-153/+887
|\ \ \
| * | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0222-153/+887
* | | | 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 #2028 from mozilla/Makefile-fixesJoram Wilander2016-02-031-3/+3
|\ \ \ \
| * | | | Adjustments to makefileAlan Mooiman2016-01-291-3/+3
* | | | | Merge pull request #1991 from rgarmsen2295/plt-976Joram Wilander2016-02-0314-4/+407
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added ability to sign in via username; separated email sign in and sign up co...Reed Garmsen2016-02-0214-4/+407
| | |_|/ | |/| |
* | | | Update center_panel.jsxEric Sethna2016-02-021-1/+1
* | | | Merge pull request #2050 from mattermost/lfbrock-patch-2Corey Hulen2016-02-021-3/+4
|\ \ \ \
| * | | | Update test-attachments.mdlfbrock2016-02-021-3/+4
| |/ / /
* | | | 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
| |/ / /
* | | | Merge pull request #2025 from rgarmsen2295/plt-1721Corey Hulen2016-02-021-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed React invalid prop warning in Team SettingsReed Garmsen2016-02-021-1/+3
|/ / /
* | / EE FixesChristopher Speller2016-02-022-0/+34
| |/ |/|
* | 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
* | | Merge pull request #2043 from mattermost/upgrade-babel-eslintJoram Wilander2016-02-011-2/+1
|\ \ \ | |/ / |/| |
| * | Removed escope and upgraded babel-eslintJoramWilander2016-02-011-2/+1
|/ /
* | Merge pull request #2040 from mattermost/fix-emailHarrison Healey2016-02-0114-130/+130
|\ \
| * \ Merge branch 'master' into fix-email=Corey Hulen2016-02-011-7/+8
| |\ \ | |/ / |/| |
* | | Merge pull request #2041 from mattermost/temp-babel-eslint-fixChristopher Speller2016-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-0114-130/+130
| |/ / |/| |
* | | 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
|\ \ \ | |_|/ |/| |