Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
* | | | | Merge pull request #1999 from mattermost/plt-1700 | Joram Wilander | 2016-01-27 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | PLT-1700 Only set store preferences if not null in head.html | ||||
| * | | | Only set store preferences if not null in head.html | JoramWilander | 2016-01-27 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #1995 from mattermost/PLT-1586b | Christopher Speller | 2016-01-27 | 3 | -2/+7 |
|\ \ \ | | | | | | | | | Fixing small issue with displaying activity log | ||||
| * | | | Fixing small issue with displaying activity log | =Corey Hulen | 2016-01-27 | 3 | -2/+7 |
| |/ / | |||||
* | | | Merge pull request #1992 from ZBoxApp/PLT-7-react | Corey Hulen | 2016-01-27 | 10 | -105/+651 |
|\ \ \ | |/ / |/| | | PLT-7: Refactoring frontend (chunk 1) | ||||
| * | | Update mm-intl reference | Elias Nahum | 2016-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | PLT-7: Refactoring frontend (chunk 1) | Elias Nahum | 2016-01-26 | 10 | -105/+651 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - System console sidebar - Sytem console email settings - Error Bar - Loading Screen - Select Team Modal - Add npm mm-intl package | ||||
* | | | Merge pull request #1988 from mattermost/plt-1475 | Christopher Speller | 2016-01-27 | 3 | -7/+19 |
|\ \ \ | | | | | | | | | PLT-1475 Update search query to ignore system messages | ||||
| * | | | Updated search test cases | JoramWilander | 2016-01-27 | 1 | -4/+10 |
| | | | | |||||
| * | | | Update search query to ignore system messages | JoramWilander | 2016-01-26 | 3 | -8/+14 |
| | |/ | |/| | |||||
* | | | Merge pull request #1990 from hmhealey/plt1722 | Christopher Speller | 2016-01-27 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | PLT-1772 Changed page to just reload when another tab logs in | ||||
| * | | | Changed page to just reload when another tab logs in | hmhealey | 2016-01-26 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #1993 from mattermost/PLT-1586 | Christopher Speller | 2016-01-27 | 16 | -56/+199 |
|\ \ \ \ | | | | | | | | | | | PLT-1586 adding LDAP/OAuth to iOS | ||||
| * | | | | Fixing naming | =Corey Hulen | 2016-01-26 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fixing version | =Corey Hulen | 2016-01-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | PLT-1586 Changing session reporting | =Corey Hulen | 2016-01-26 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | PLT-1586 adding attach device id method | =Corey Hulen | 2016-01-26 | 9 | -11/+145 |
| | | | | | |||||
| * | | | | PLT-1586 adding LDAP/OAuth to iOS | =Corey Hulen | 2016-01-26 | 8 | -43/+49 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1984 from hmhealey/plt1103 | Joram Wilander | 2016-01-27 | 4 | -25/+54 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1103 Updated serverside hashtag regex to ignore more punctuation around words | ||||
| * | | | Updated serverside hashtag regex to ignore more punctuation around words | hmhealey | 2016-01-26 | 4 | -25/+54 |
| | | | | |||||
* | | | | Merge pull request #1989 from mattermost/plt-1373 | Harrison Healey | 2016-01-26 | 1 | -28/+28 |
|\ \ \ \ | | | | | | | | | | | PLT-1373 Renamed all functions starting with p in client channel store | ||||
| * | | | | Renamed all functions starting with p in client channel store | JoramWilander | 2016-01-26 | 1 | -28/+28 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1978 from hmhealey/plt1484 | Corey Hulen | 2016-01-26 | 6 | -26/+29 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1484 Changed first preference load to be done synchronously |