summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge branch 'master' into PLT-1765=Corey Hulen2016-01-2835-490/+2820
| | |\ \
| | * | | PLT-1765 allowing support of 2 previous versions=Corey Hulen2016-01-285-50/+93
| | | |/ | | |/|
| * | | Merge pull request #2013 from mattermost/plt-1749Christopher Speller2016-01-292-1/+3
| |\ \ \ | | | | | | | | | | PLT-1749 Return channel type in new post websocket events
| | * | | Return channel type in new post websocket eventsJoramWilander2016-01-282-1/+3
| | | |/ | | |/|
| * | | Merge pull request #2011 from mattermost/plt-1837Christopher Speller2016-01-293-18/+2
| |\ \ \ | | | | | | | | | | PLT-1837 Remove expiry from public links
| | * | | Removed translation for unneeded link expiryJoramWilander2016-01-282-10/+2
| | | | |
| | * | | Remove expiry from public linksJoramWilander2016-01-281-8/+0
| | | | |
| * | | | Merge pull request #2015 from ZBoxApp/PLT-7-pagesJoram Wilander2016-01-2924-107/+766
| |\ \ \ \ | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 4)
| | * | | | Removed duplicates Messaging md files from doc folderElias Nahum2016-01-282-84/+0
| | | | | |
| | * | | | Fix docs route to include the user localeElias Nahum2016-01-283-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | - Move Messaging_{locale}.md files to static/help
| | * | | | PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-2824-106/+758
| | | |/ / | | |/| |
| * | | | Merge pull request #2014 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-285-31/+69
| |\ \ \ \ | | |/ / / | |/| | | Adding reply icon
| | * | | Adding reply iconAsaad Mahmood2016-01-292-10/+36
| | | | |
| | * | | Adding reply functionalityAsaad Mahmood2016-01-285-22/+34
| |/ / /
| * | | 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
| | | | |