Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / | |||||
| * | | 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 #2023 from ZBoxApp/PLT-7-templates | Christopher Speller | 2016-01-29 | 9 | -70/+176 |
| |\ \ | | |/ | |/| | |||||
| | * | Remove author | Elias Nahum | 2016-01-29 | 2 | -6/+0 |
| | * | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-29 | 9 | -70/+182 |
| * | | Improvements to system console | Asaad Mahmood | 2016-01-29 | 1 | -0/+9 |
| |/ | |||||
| * | PLT-7: Refactoring frontend (chunk 5) | Elias Nahum | 2016-01-29 | 12 | -99/+700 |
| * | Merge pull request #2013 from mattermost/plt-1749 | Christopher Speller | 2016-01-29 | 1 | -1/+2 |
| |\ | |||||
| | * | Return channel type in new post websocket events | JoramWilander | 2016-01-28 | 1 | -1/+2 |
| * | | Merge pull request #2015 from ZBoxApp/PLT-7-pages | Joram Wilander | 2016-01-29 | 22 | -93/+791 |
| |\ \ | |||||
| | * | | Fix docs route to include the user locale | Elias Nahum | 2016-01-28 | 3 | -2/+93 |
| | * | | PLT-7: Refactoring frontend (chunk 4) | Elias Nahum | 2016-01-28 | 21 | -92/+699 |
| | |/ | |||||
| * | | Adding reply icon | Asaad Mahmood | 2016-01-29 | 2 | -10/+36 |
| * | | Adding reply functionality | Asaad Mahmood | 2016-01-28 | 5 | -22/+34 |
| |/ | |||||
| * | Merge pull request #2010 from ZBoxApp/PLT-7-tutorial | Corey Hulen | 2016-01-28 | 9 | -44/+297 |
| |\ | |||||
| | * | PLT-7: Refactoring frontend (chunk 3) | Elias Nahum | 2016-01-28 | 9 | -44/+297 |
| * | | Merge pull request #2009 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-28 | 6 | -5/+22 |
| |\ \ | |||||
| | * | | Fixing code block and comment icon in Firefox | Asaad Mahmood | 2016-01-28 | 2 | -1/+9 |
| | * | | Improving jump to recent messages UI | Asaad Mahmood | 2016-01-28 | 2 | -4/+3 |
| | * | | Fixing modals for IE | Asaad Mahmood | 2016-01-28 | 2 | -0/+10 |
| * | | | Merge pull request #2002 from ZBoxApp/PLT-7-react | Harrison Healey | 2016-01-28 | 20 | -437/+2485 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | PLT-7: Refactoring frontend (chunk 2) | Elias Nahum | 2016-01-27 | 20 | -437/+2485 |
| * | | Updating tutorial gif for sidebar | Asaad Mahmood | 2016-01-27 | 2 | -1/+2 |
| |/ | |||||
| * | Merge pull request #1996 from mattermost/plt-1768 | Harrison Healey | 2016-01-27 | 2 | -2/+5 |
| |\ | |||||
| | * | Clear deleted messages after channel leave and fix missig postlist error | JoramWilander | 2016-01-27 | 2 | -2/+5 |
| * | | Merge pull request #1998 from mattermost/plt-1139 | Harrison Healey | 2016-01-27 | 1 | -3/+11 |
| |\ \ |