summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-2824-106/+758
|
* Merge pull request #2010 from ZBoxApp/PLT-7-tutorialCorey Hulen2016-01-289-44/+297
|\ | | | | PLT-7: Refactoring frontend (chunk 3)
| * PLT-7: Refactoring frontend (chunk 3)Elias Nahum2016-01-289-44/+297
| | | | | | | | | | | | - Tutorial components - Claim components - Suggestion components
* | Merge pull request #2007 from mattermost/PLT-7-server-fallbackJoram Wilander2016-01-281-5/+17
|\ \ | | | | | | PLT-7 Adding english fallback to server
| * | Adding english fallback=Corey Hulen2016-01-281-8/+10
| | |
| * | Adding english fallback to server=Corey Hulen2016-01-281-5/+15
| | |
* | | Merge pull request #2009 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-286-5/+22
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Fixing code block and comment icon in FirefoxAsaad Mahmood2016-01-282-1/+9
| | | |
| * | | Improving jump to recent messages UIAsaad Mahmood2016-01-282-4/+3
| | | |
| * | | Fixing modals for IEAsaad Mahmood2016-01-282-0/+10
| |/ /
* | | Merge pull request #2002 from ZBoxApp/PLT-7-reactHarrison Healey2016-01-2820-437/+2485
|\ \ \ | | |/ | |/| PLT-7: Refactoring frontend (chunk 2)
| * | PLT-7: Refactoring frontend (chunk 2)Elias Nahum2016-01-2720-437/+2485
| | | | | | | | | | | | - System Console complete
* | | Merge pull request #2004 from hmhealey/plt1820Christopher Speller2016-01-281-1/+1
|\ \ \ | |_|/ |/| | Updated makefile to repackage client libraries when package.json changes
| * | Updated makefile to repackage client libraries when package.json changeshmhealey2016-01-271-1/+1
|/ /
* | Merge pull request #2003 from ZBoxApp/PLT-7-missingCorey Hulen2016-01-271-0/+16
|\ \ | | | | | | PLT-7: Missing server translations
| * | PLT-7: Missing server translationsElias Nahum2016-01-271-0/+16
| |/
* | Merge pull request #2001 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-272-1/+2
|\ \ | |/ |/| Updating tutorial gif for sidebar
| * Updating tutorial gif for sidebarAsaad Mahmood2016-01-272-1/+2
|/
* Merge pull request #1996 from mattermost/plt-1768Harrison Healey2016-01-272-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 errorJoramWilander2016-01-272-2/+5
| |
* | Merge pull request #1997 from mattermost/PLT-7-server-finalHarrison Healey2016-01-276-16/+19
|\ \ | | | | | | PLT-7 Removing AppError ctor
| * | Fixing build=Corey Hulen2016-01-272-4/+3
| | |
| * | PLT-7 Removing AppError ctor=Corey Hulen2016-01-275-14/+18
| | |
* | | Merge pull request #1998 from mattermost/plt-1139Harrison Healey2016-01-271-3/+11
|\ \ \ | | | | | | | | PLT-1139 Clear user typing text on channel switch
| * | | Clear user typing text on channel switchJoramWilander2016-01-271-3/+11
| | | |
* | | | Merge pull request #1999 from mattermost/plt-1700Joram Wilander2016-01-271-1/+3
|\ \ \ \ | |/ / / |/| | | PLT-1700 Only set store preferences if not null in head.html
| * | | Only set store preferences if not null in head.htmlJoramWilander2016-01-271-1/+3
|/ / /
* | | Merge pull request #1995 from mattermost/PLT-1586bChristopher Speller2016-01-273-2/+7
|\ \ \ | | | | | | | | Fixing small issue with displaying activity log
| * | | Fixing small issue with displaying activity log=Corey Hulen2016-01-273-2/+7
| |/ /
* | | Merge pull request #1992 from ZBoxApp/PLT-7-reactCorey Hulen2016-01-2710-105/+651
|\ \ \ | |/ / |/| | PLT-7: Refactoring frontend (chunk 1)
| * | Update mm-intl referenceElias Nahum2016-01-271-1/+1
| | |
| * | PLT-7: Refactoring frontend (chunk 1)Elias Nahum2016-01-2610-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-1475Christopher Speller2016-01-273-7/+19
|\ \ \ | | | | | | | | PLT-1475 Update search query to ignore system messages
| * | | Updated search test casesJoramWilander2016-01-271-4/+10
| | | |
| * | | Update search query to ignore system messagesJoramWilander2016-01-263-8/+14
| | |/ | |/|
* | | Merge pull request #1990 from hmhealey/plt1722Christopher Speller2016-01-271-3/+3
|\ \ \ | | | | | | | | PLT-1772 Changed page to just reload when another tab logs in
| * | | Changed page to just reload when another tab logs inhmhealey2016-01-261-3/+3
| | | |
* | | | Merge pull request #1993 from mattermost/PLT-1586Christopher Speller2016-01-2716-56/+199
|\ \ \ \ | | | | | | | | | | PLT-1586 adding LDAP/OAuth to iOS
| * | | | Fixing naming=Corey Hulen2016-01-262-2/+2
| | | | |
| * | | | Fixing version=Corey Hulen2016-01-261-1/+1
| | | | |
| * | | | PLT-1586 Changing session reporting=Corey Hulen2016-01-261-3/+6
| | | | |
| * | | | PLT-1586 adding attach device id method=Corey Hulen2016-01-269-11/+145
| | | | |
| * | | | PLT-1586 adding LDAP/OAuth to iOS=Corey Hulen2016-01-268-43/+49
| | |/ / | |/| |
* | | | Merge pull request #1984 from hmhealey/plt1103Joram Wilander2016-01-274-25/+54
|\ \ \ \ | |_|_|/ |/| | | PLT-1103 Updated serverside hashtag regex to ignore more punctuation around words
| * | | Updated serverside hashtag regex to ignore more punctuation around wordshmhealey2016-01-264-25/+54
| | | |
* | | | Merge pull request #1989 from mattermost/plt-1373Harrison Healey2016-01-261-28/+28
|\ \ \ \ | | | | | | | | | | PLT-1373 Renamed all functions starting with p in client channel store
| * | | | Renamed all functions starting with p in client channel storeJoramWilander2016-01-261-28/+28
| | |/ / | |/| |
* | | | Merge pull request #1978 from hmhealey/plt1484Corey Hulen2016-01-266-26/+29
|\ \ \ \ | |_|_|/ |/| | | PLT-1484 Changed first preference load to be done synchronously
| * | | Moved PreferenceStore initialization into head.htmlhmhealey2016-01-263-6/+7
| | | |
| * | | Changed first preference load to be done synchronouslyhmhealey2016-01-265-24/+26
|/ / /