Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | Tatsuya Niwa | 2016-01-30 | 2 | -25/+177 |
| | | | | another role. | ||||
* | Merge pull request #2022 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-01-29 | 1 | -0/+9 |
|\ | | | | | Improvements to system console | ||||
| * | 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) | ||||
| * | PLT-7: Refactoring frontend (chunk 5) | Elias Nahum | 2016-01-29 | 12 | -99/+700 |
|/ | | | | | | - Signup Team Complete - Signup User Complete - Email Verify | ||||
* | Merge pull request #2018 from fallenby/PLT-1592 | Christopher Speller | 2016-01-29 | 1 | -4/+4 |
|\ | | | | | PLT-1592 String changes to make password reset expiry experience more obvious and forgiving | ||||
| * | Revised PLT-1592 | Frank Allenby | 2016-01-29 | 2 | -5/+1 |
| | | |||||
| * | Completed PLT-1592 | Frank Allenby | 2016-01-29 | 2 | -6/+10 |
| | | |||||
* | | Merge pull request #2016 from mattermost/PLT-1765 | Christopher Speller | 2016-01-29 | 5 | -50/+93 |
|\ \ | | | | | | | PLT-1765 allowing support of 2 previous versions | ||||
| * \ | Merge branch 'master' into PLT-1765 | =Corey Hulen | 2016-01-28 | 35 | -490/+2820 |
| |\ \ | |||||
| * | | | PLT-1765 allowing support of 2 previous versions | =Corey Hulen | 2016-01-28 | 5 | -50/+93 |
| | |/ | |/| | |||||
* | | | Merge pull request #2013 from mattermost/plt-1749 | Christopher Speller | 2016-01-29 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | PLT-1749 Return channel type in new post websocket events | ||||
| * | | | Return channel type in new post websocket events | JoramWilander | 2016-01-28 | 2 | -1/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #2011 from mattermost/plt-1837 | Christopher Speller | 2016-01-29 | 3 | -18/+2 |
|\ \ \ | | | | | | | | | PLT-1837 Remove expiry from public links | ||||
| * | | | Removed translation for unneeded link expiry | JoramWilander | 2016-01-28 | 2 | -10/+2 |
| | | | | |||||
| * | | | Remove expiry from public links | JoramWilander | 2016-01-28 | 1 | -8/+0 |
| | | | | |||||
* | | | | Merge pull request #2015 from ZBoxApp/PLT-7-pages | Joram Wilander | 2016-01-29 | 24 | -107/+766 |
|\ \ \ \ | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 4) | ||||
| * | | | | Removed duplicates Messaging md files from doc folder | Elias Nahum | 2016-01-28 | 2 | -84/+0 |
| | | | | | |||||
| * | | | | Fix docs route to include the user locale | Elias Nahum | 2016-01-28 | 3 | -2/+93 |
| | | | | | | | | | | | | | | | | | | | | - Move Messaging_{locale}.md files to static/help | ||||
| * | | | | PLT-7: Refactoring frontend (chunk 4) | Elias Nahum | 2016-01-28 | 24 | -106/+758 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2014 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-01-28 | 5 | -31/+69 |
|\ \ \ \ | |/ / / |/| | | | Adding reply icon | ||||
| * | | | 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) | ||||
| * | | PLT-7: Refactoring frontend (chunk 3) | Elias Nahum | 2016-01-28 | 9 | -44/+297 |
| | | | | | | | | | | | | | | | | | | - Tutorial components - Claim components - Suggestion components | ||||
* | | | Merge pull request #2007 from mattermost/PLT-7-server-fallback | Joram Wilander | 2016-01-28 | 1 | -5/+17 |
|\ \ \ | | | | | | | | | PLT-7 Adding english fallback to server | ||||
| * | | | Adding english fallback | =Corey Hulen | 2016-01-28 | 1 | -8/+10 |
| | | | | |||||
| * | | | Adding english fallback to server | =Corey Hulen | 2016-01-28 | 1 | -5/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #2009 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-28 | 6 | -5/+22 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | 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) | ||||
| * | | PLT-7: Refactoring frontend (chunk 2) | Elias Nahum | 2016-01-27 | 20 | -437/+2485 |
| | | | | | | | | | | | | - System Console complete | ||||
* | | | Merge pull request #2004 from hmhealey/plt1820 | Christopher Speller | 2016-01-28 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Updated makefile to repackage client libraries when package.json changes | ||||
| * | | Updated makefile to repackage client libraries when package.json changes | hmhealey | 2016-01-27 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2003 from ZBoxApp/PLT-7-missing | Corey Hulen | 2016-01-27 | 1 | -0/+16 |
|\ \ | | | | | | | PLT-7: Missing server translations | ||||
| * | | PLT-7: Missing server translations | Elias Nahum | 2016-01-27 | 1 | -0/+16 |
| |/ | |||||
* | | Merge pull request #2001 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-27 | 2 | -1/+2 |
|\ \ | |/ |/| | Updating tutorial gif for sidebar | ||||
| * | 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 |
|\ | | | | | PLT-1768 Clear deleted messages after channel leave and fix missig postlist error | ||||
| * | Clear deleted messages after channel leave and fix missig postlist error | JoramWilander | 2016-01-27 | 2 | -2/+5 |
| | | |||||
* | | Merge pull request #1997 from mattermost/PLT-7-server-final | Harrison Healey | 2016-01-27 | 6 | -16/+19 |
|\ \ | | | | | | | PLT-7 Removing AppError ctor | ||||
| * | | Fixing build | =Corey Hulen | 2016-01-27 | 2 | -4/+3 |
| | | | |||||
| * | | PLT-7 Removing AppError ctor | =Corey Hulen | 2016-01-27 | 5 | -14/+18 |
| | | | |||||
* | | | Merge pull request #1998 from mattermost/plt-1139 | Harrison Healey | 2016-01-27 | 1 | -3/+11 |
|\ \ \ | | | | | | | | | PLT-1139 Clear user typing text on channel switch | ||||
| * | | | Clear user typing text on channel switch | JoramWilander | 2016-01-27 | 1 | -3/+11 |
| | | | |