Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 25 | -268/+788 |
|\ | |||||
| * | Merge pull request #2060 from ZBoxApp/PLT-7-channel | Harrison Healey | 2016-02-03 | 25 | -268/+788 |
| |\ | |||||
| | * | Fix socketError message in spanish | Elias Nahum | 2016-02-03 | 1 | -1/+1 |
| | * | Add missing translations | Elias Nahum | 2016-02-03 | 2 | -99/+110 |
| | * | Messages for SocketStore and small fixes | Elias Nahum | 2016-02-03 | 8 | -43/+96 |
| | * | PLT-7: Refactoring frontend (chunk 11) | Elias Nahum | 2016-02-03 | 19 | -126/+582 |
* | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 52 | -842/+2399 |
|\| | | |||||
| * | | Fix katex sanitization | JoramWilander | 2016-02-03 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2055 from khoa-le/PLT-1693 | Christopher Speller | 2016-02-03 | 1 | -1/+2 |
| |\ | |||||
| | * | Clear the password input boxes when user enter incorrect Retype New Password. | Khoa, Le Ngoc | 2016-02-03 | 1 | -1/+2 |
| * | | Merge pull request #2054 from khoa-le/PLT-1433 | Christopher Speller | 2016-02-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | OGG files render as audio files with preview | Khoa, Le Ngoc | 2016-02-03 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #2049 from mattermost/plt-1856 | Christopher Speller | 2016-02-03 | 10 | -583/+823 |
| |\ \ | |||||
| | * | | Add basic server audit tab to system console for EE | JoramWilander | 2016-02-02 | 10 | -584/+824 |
| * | | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 8 | -89/+354 |
| |\ \ \ | |||||
| | * | | | Remove missing ES translations | JoramWilander | 2016-02-02 | 1 | -7/+0 |
| | * | | | Added extra system-wide statistics for EE | JoramWilander | 2016-02-02 | 8 | -89/+361 |
| | |/ / | |||||
| * | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modals | Joram Wilander | 2016-02-03 | 20 | -119/+821 |
| |\ \ \ | |||||
| | * | | | PLT-7: Refactoring frontend (chunk 10) | Elias Nahum | 2016-02-02 | 20 | -119/+821 |
| | |/ / | |||||
| * | | | Merge pull request #2048 from rgarmsen2295/plt-1317 | Joram Wilander | 2016-02-03 | 6 | -28/+31 |
| |\ \ \ | |||||
| | * | | | Changed clock icon in repeat posts to simple timestamp | Reed Garmsen | 2016-02-02 | 6 | -24/+31 |
| | * | | | Removed css clock from sub-posts | Reed Garmsen | 2016-02-02 | 1 | -4/+0 |
| | |/ / | |||||
| * | | | Merge pull request #2047 from hmhealey/helpurl | Joram Wilander | 2016-02-03 | 1 | -8/+2 |
| |\ \ \ | |||||
| | * | | | Updated post help link | hmhealey | 2016-02-02 | 1 | -8/+2 |
| | |/ / | |||||
| * | | | Merge pull request #2044 from khoa-le/PLT-1864 | Joram Wilander | 2016-02-03 | 1 | -0/+10 |
| |\ \ \ | |||||
| | * | | | Fixed Eslint validation. | Khoa, Le Ngoc | 2016-02-02 | 1 | -2/+2 |
| | * | | | Added help text indicating valid email required when user sign up from link. | Khoa, Le Ngoc | 2016-02-02 | 1 | -0/+10 |
| | |/ / | |||||
| * | | | Merge pull request #1991 from rgarmsen2295/plt-976 | Joram Wilander | 2016-02-03 | 6 | -2/+322 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Added ability to sign in via username; separated email sign in and sign up co... | Reed Garmsen | 2016-02-02 | 6 | -2/+322 |
| | |/ | |||||
| * | | Update center_panel.jsx | Eric Sethna | 2016-02-02 | 1 | -1/+1 |
| * | | Merge pull request #2026 from rgarmsen2295/plt-1720 | Corey Hulen | 2016-02-02 | 3 | -8/+28 |
| |\ \ | |||||
| | * | | Properly disable the get team link functionality when user creation is disabled | Reed Garmsen | 2016-02-02 | 3 | -8/+28 |
| | |/ | |||||
| * / | Fixed React invalid prop warning in Team Settings | Reed Garmsen | 2016-02-02 | 1 | -1/+3 |
| |/ | |||||
* | | Fixing console | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
* | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 3 | -12/+108 |
* | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 3 | -51/+302 |
* | | Fixing merge | =Corey Hulen | 2016-02-01 | 153 | -1784/+9627 |
|\| | |||||
| * | Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-right | Corey Hulen | 2016-02-01 | 16 | -76/+446 |
| |\ | |||||
| | * | fix hour12 React warning for FormattedDate | Elias Nahum | 2016-02-01 | 6 | -5/+10 |
| | * | PLT-7: Refactoring frontend (chunk 9) | Elias Nahum | 2016-02-01 | 16 | -75/+440 |
| * | | Removed escope and upgraded babel-eslint | JoramWilander | 2016-02-01 | 1 | -2/+1 |
| |/ | |||||
| * | Merge branch 'master' into fix-email | =Corey Hulen | 2016-02-01 | 1 | -7/+8 |
| |\ | |||||
| | * | Temporary fix for babel-eslint | JoramWilander | 2016-02-01 | 1 | -7/+8 |
| * | | Merge branch 'master' into fix-email | =Corey Hulen | 2016-02-01 | 2 | -3/+10 |
| |\| | |||||
| | * | Merge pull request #2037 from mattermost/plt-1862 | Corey Hulen | 2016-02-01 | 2 | -3/+10 |
| | |\ | |||||
| | | * | Fix console errors | JoramWilander | 2016-02-01 | 2 | -3/+10 |
| * | | | Fixing email unit tests | =Corey Hulen | 2016-02-01 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #2039 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-02-01 | 5 | -54/+53 |
| |\ \ | |||||
| | * | | Fixing system console and changing swapping icon with reply icon | Asaad Mahmood | 2016-02-01 | 5 | -54/+53 |
| * | | | PLT-7: Refactoring frontend (chunk 8) | Elias Nahum | 2016-02-01 | 23 | -224/+1307 |
| |/ / |