summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1650 from mattermost/plt-1389Corey Hulen2015-12-081-0/+1
|\ \ | | | | | | PLT-1389 Fix edited posts not updating by websocket
| * | Fix edited posts not updating by websocketJoramWilander2015-12-081-0/+1
| |/
* | Update CONTRIBUTING.mdit332015-12-081-1/+1
| |
* | Update overview.mdit332015-12-081-1/+1
| |
* | Update overview.mdit332015-12-081-4/+4
|/
* Merge pull request #1646 from mattermost/PLT-1302Joram Wilander2015-12-084-15/+13
|\ | | | | PLT-1302 fixing hiding email adddress
| * PLT-1302 fixing hiding email adddress=Corey Hulen2015-12-071-8/+0
| |
| * PLT-1302 fixing hiding email adddress=Corey Hulen2015-12-074-8/+14
| |
* | Merge pull request #1647 from mattermost/PLT-564Christopher Speller2015-12-081-4/+5
|\ \ | | | | | | PLT-564 fixing error bar
| * | PLT-564 fixing error bar=Corey Hulen2015-12-071-4/+5
| |/
* | Merge pull request #1645 from mattermost/plt-1365Christopher Speller2015-12-081-1/+1
|\ \ | | | | | | PLT-1365 Don't display system console on mobile
| * | Don't display system console on mobileJoramWilander2015-12-071-1/+1
| |/
* | Merge pull request #1644 from mattermost/plt-1279-1Christopher Speller2015-12-082-2/+3
|\ \ | | | | | | PLT-1279 Make sure posts in common threads are included in getPosts DB query
| * | Update unit testJoramWilander2015-12-071-1/+1
| | |
| * | Make sure posts in threads are included in getPosts DB queryJoramWilander2015-12-071-1/+2
| |/
* | Merge pull request #1639 from hmhealey/plt1063Christopher Speller2015-12-084-8/+5
|\ \ | | | | | | PLT-1063 Switched marked to forked version
| * | Removed special handling of snake_case words since that's now done by markedhmhealey2015-12-071-5/+3
| | |
| * | Switched marked to mattermost/markedhmhealey2015-12-071-1/+1
| | |
| * | Removed :* smiley since it conflicts heavily with the markdown parserhmhealey2015-12-072-2/+1
| |/
* | Merge pull request #1636 from mattermost/plt-1354Christopher Speller2015-12-083-3/+3
|\ \ | | | | | | PLT-1354 Show channel member count up to 100 now
| * | Return 100 channel users in extra info callJoramWilander2015-12-071-1/+1
| | |
| * | Show channel member count up to 100 nowJoramWilander2015-12-072-2/+2
| |/
* | Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visitJoram Wilander2015-12-082-0/+13
|\ \ | | | | | | fix font not being changed on first page visit (if preferences havent been loaded before)
| * | fix font not being changed on first page visit (if preferences havent been ↵Florian Orben2015-12-042-0/+13
| | | | | | | | | | | | loaded before)
* | | Merge pull request #1640 from florianorben/collapse_fixJoram Wilander2015-12-081-1/+1
|\ \ \ | | | | | | | | fix a typo that was breaking combination of sequential messages
| * | | fix that was breaking combination of sequential messagesFlorian Orben2015-12-071-1/+1
| | |/ | |/|
* | | Merge pull request #1641 from florianorben/display_system_usernameJoram Wilander2015-12-084-6/+3
|\ \ \ | | | | | | | | Display username 'System' for system messages
| * | | Display username 'System' for system messagesFlorian Orben2015-12-074-6/+3
| |/ /
* | | Merge pull request #1642 from florianorben/print_styleJoram Wilander2015-12-082-0/+3
|\ \ \ | | | | | | | | Add print stylesheet
| * | | add print stylesheetFlorian Orben2015-12-072-0/+3
| |/ /
* | | Merge pull request #1637 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-12-0824-39/+83
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Fixing es lint errorAsaad Mahmood2015-12-081-5/+0
| | | |
| * | | Updating archive footerAsaad Mahmood2015-12-071-1/+5
| | | |
| * | | Multiple UI ImprovementsAsaad Mahmood2015-12-0723-33/+78
| |/ /
* | | Merge pull request #1643 from mattermost/lfbrock-patch-3it332015-12-071-0/+563
|\ \ \ | |/ / |/| | Update NOTICE.txt
| * | Update NOTICE.txtlfbrock2015-12-071-0/+563
|/ /
* | Merge pull request #1627 from florianorben/ux-formatting-task-listJoram Wilander2015-12-0741-2/+107
|\ \ | | | | | | fix misaligned checkbox; remove list-style from list-elements with checkboxes
| * | fix misaligned checkbox; remove list-style from list-elements with checkboxesFlorian Orben2015-12-0541-2/+107
| |/
* | Merge pull request #1621 from mattermost/plt-1331Harrison Healey2015-12-071-1/+2
|\ \ | | | | | | PLT-1331 Fix possible race condition when creating new channels
| * | Fix possible race condition on when creating new channelsJoramWilander2015-12-041-1/+2
| | |
* | | Merge pull request #1629 from mattermost/PLT-1369Christopher Speller2015-12-071-1/+2
|\ \ \ | | | | | | | | PLT-1369 send core message
| * | | Fixing message=Corey Hulen2015-12-041-23/+1
| | | |
| * | | PLT-1369 send core message=Corey Hulen2015-12-041-1/+24
| | |/ | |/|
* | | Merge pull request #1616 from florianorben/PLT-1380Christopher Speller2015-12-073-3/+36
|\ \ \ | | | | | | | | PLT-1380: Post system message when user updates channel header
| * | | PLT-1380: Post system message when user updates channel headerFlorian Orben2015-12-043-3/+36
| | | |
* | | | Rename Command-Line_Tools.md to Command-Line-Tools.mdit332015-12-041-0/+0
| | | |
* | | | Merge pull request #1626 from mattermost/PLT-1355Corey Hulen2015-12-043-7/+14
|\ \ \ \ | | | | | | | | | | PLT-1355 Move link preview into pre-release feature
| * | | | PLT-1355 Move link preview into pre-release feature=Corey Hulen2015-12-043-7/+14
| | | | |
* | | | | Merge pull request #1633 from mattermost/mattermost.go-helpCorey Hulen2015-12-042-13/+95
|\ \ \ \ \ | | | | | | | | | | | | Updating mattermost.go help
| * | | | | Update Command-Line_Tools.mdit332015-12-041-1/+1
| | | | | |