Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #2028 from mozilla/Makefile-fixes | Joram Wilander | 2016-02-03 | 1 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Adjustments to makefile | Alan Mooiman | 2016-01-29 | 1 | -3/+3 | |
* | | | | | Merge pull request #1991 from rgarmsen2295/plt-976 | Joram Wilander | 2016-02-03 | 14 | -4/+407 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Added ability to sign in via username; separated email sign in and sign up co... | Reed Garmsen | 2016-02-02 | 14 | -4/+407 | |
| | |_|/ | |/| | | ||||||
* | | | | Update center_panel.jsx | Eric Sethna | 2016-02-02 | 1 | -1/+1 | |
* | | | | Merge pull request #2050 from mattermost/lfbrock-patch-2 | Corey Hulen | 2016-02-02 | 1 | -3/+4 | |
|\ \ \ \ | ||||||
| * | | | | Update test-attachments.md | lfbrock | 2016-02-02 | 1 | -3/+4 | |
| |/ / / | ||||||
* | | | | 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 | |
| |/ / / | ||||||
* | | | | Merge pull request #2025 from rgarmsen2295/plt-1721 | Corey Hulen | 2016-02-02 | 1 | -1/+3 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fixed React invalid prop warning in Team Settings | Reed Garmsen | 2016-02-02 | 1 | -1/+3 | |
|/ / / | ||||||
* | / | EE Fixes | Christopher Speller | 2016-02-02 | 2 | -0/+34 | |
| |/ |/| | ||||||
* | | 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 | |
* | | | Merge pull request #2043 from mattermost/upgrade-babel-eslint | Joram Wilander | 2016-02-01 | 1 | -2/+1 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Removed escope and upgraded babel-eslint | JoramWilander | 2016-02-01 | 1 | -2/+1 | |
|/ / | ||||||
* | | Merge pull request #2040 from mattermost/fix-email | Harrison Healey | 2016-02-01 | 14 | -130/+130 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into fix-email | =Corey Hulen | 2016-02-01 | 1 | -7/+8 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #2041 from mattermost/temp-babel-eslint-fix | Christopher Speller | 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 | 14 | -130/+130 | |
| |/ / |/| | | ||||||
* | | | 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 | |
* | | | | Merge pull request #2038 from ZBoxApp/PLT-7-sidebar | Joram Wilander | 2016-02-01 | 23 | -224/+1307 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | PLT-7: Refactoring frontend (chunk 8) | Elias Nahum | 2016-02-01 | 23 | -224/+1307 | |
|/ / / | ||||||
* | | | Merge pull request #2029 from ZBoxApp/PLT-7-user | Christopher Speller | 2016-02-01 | 23 | -331/+2256 | |
|\ \ \ | ||||||
| * | | | PLT-7: Refactoring frontend (chunk 7) | Elias Nahum | 2016-01-31 | 3 | -18/+8 | |
| * | | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-30 | 23 | -331/+2266 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1966 from ttyniwa/feature/warning_when_demote_own_role_fr... | Christopher Speller | 2016-02-01 | 3 | -24/+132 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | fix text localization. | Tatsuya Niwa | 2016-01-30 | 3 | -4/+28 | |
| * | | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -4/+4 | |
| * | | fix role bug. | Tatsuya Niwa | 2016-01-30 | 1 | -5/+12 | |
| * | | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -1/+2 | |
| * | | delete DemoteOwnRoleModal | Tatsuya Niwa | 2016-01-30 | 2 | -109/+36 | |
| * | | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -1/+1 | |
| * | | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -4/+1 | |
| * | | PLT-588 Add a warning when a user demotes themselves from System Admin to ano... | Tatsuya Niwa | 2016-01-30 | 2 | -25/+177 | |
* | | | Merge pull request #2031 from mattermost/Typos-and-tweaks | Corey Hulen | 2016-01-31 | 1 | -2/+2 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | occured > occurred | it33 | 2016-01-31 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #2023 from ZBoxApp/PLT-7-templates | Christopher Speller | 2016-01-29 | 11 | -70/+208 | |
|\ \ | |/ |/| | ||||||
| * | Remove author | Elias Nahum | 2016-01-29 | 2 | -6/+0 | |
| * | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-29 | 11 | -70/+214 | |
* | | Merge pull request #2022 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-01-29 | 1 | -0/+9 | |
|\ \ | |/ |/| | ||||||
| * | Improvements to system console | Asaad Mahmood | 2016-01-29 | 1 | -0/+9 | |
|/ | ||||||
* | Merge pull request #2020 from ZBoxApp/PLT-7-pages2 | Harrison Healey | 2016-01-29 | 12 | -99/+700 | |
|\ | ||||||
| * | PLT-7: Refactoring frontend (chunk 5) | Elias Nahum | 2016-01-29 | 12 | -99/+700 | |
|/ |