Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1645 from mattermost/plt-1365 | Christopher Speller | 2015-12-08 | 1 | -1/+1 |
|\ | | | | | PLT-1365 Don't display system console on mobile | ||||
| * | Don't display system console on mobile | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1644 from mattermost/plt-1279-1 | Christopher Speller | 2015-12-08 | 2 | -2/+3 |
|\ \ | | | | | | | PLT-1279 Make sure posts in common threads are included in getPosts DB query | ||||
| * | | Update unit test | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Make sure posts in threads are included in getPosts DB query | JoramWilander | 2015-12-07 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #1639 from hmhealey/plt1063 | Christopher Speller | 2015-12-08 | 4 | -8/+5 |
|\ \ | | | | | | | PLT-1063 Switched marked to forked version | ||||
| * | | Removed special handling of snake_case words since that's now done by marked | hmhealey | 2015-12-07 | 1 | -5/+3 |
| | | | |||||
| * | | Switched marked to mattermost/marked | hmhealey | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Removed :* smiley since it conflicts heavily with the markdown parser | hmhealey | 2015-12-07 | 2 | -2/+1 |
| |/ | |||||
* | | Merge pull request #1636 from mattermost/plt-1354 | Christopher Speller | 2015-12-08 | 3 | -3/+3 |
|\ \ | | | | | | | PLT-1354 Show channel member count up to 100 now | ||||
| * | | Return 100 channel users in extra info call | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Show channel member count up to 100 now | JoramWilander | 2015-12-07 | 2 | -2/+2 |
| |/ | |||||
* | | Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visit | Joram Wilander | 2015-12-08 | 2 | -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 Orben | 2015-12-04 | 2 | -0/+13 |
| | | | | | | | | | | | | loaded before) | ||||
* | | | Merge pull request #1640 from florianorben/collapse_fix | Joram Wilander | 2015-12-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix a typo that was breaking combination of sequential messages | ||||
| * | | | fix that was breaking combination of sequential messages | Florian Orben | 2015-12-07 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1641 from florianorben/display_system_username | Joram Wilander | 2015-12-08 | 4 | -6/+3 |
|\ \ \ | | | | | | | | | Display username 'System' for system messages | ||||
| * | | | Display username 'System' for system messages | Florian Orben | 2015-12-07 | 4 | -6/+3 |
| |/ / | |||||
* | | | Merge pull request #1642 from florianorben/print_style | Joram Wilander | 2015-12-08 | 2 | -0/+3 |
|\ \ \ | | | | | | | | | Add print stylesheet | ||||
| * | | | add print stylesheet | Florian Orben | 2015-12-07 | 2 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #1637 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-12-08 | 24 | -39/+83 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Fixing es lint error | Asaad Mahmood | 2015-12-08 | 1 | -5/+0 |
| | | | | |||||
| * | | | Updating archive footer | Asaad Mahmood | 2015-12-07 | 1 | -1/+5 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-07 | 23 | -33/+78 |
| |/ / | |||||
* | | | Merge pull request #1643 from mattermost/lfbrock-patch-3 | it33 | 2015-12-07 | 1 | -0/+563 |
|\ \ \ | |/ / |/| | | Update NOTICE.txt | ||||
| * | | Update NOTICE.txt | lfbrock | 2015-12-07 | 1 | -0/+563 |
|/ / | |||||
* | | Merge pull request #1627 from florianorben/ux-formatting-task-list | Joram Wilander | 2015-12-07 | 41 | -2/+107 |
|\ \ | | | | | | | fix misaligned checkbox; remove list-style from list-elements with checkboxes | ||||
| * | | fix misaligned checkbox; remove list-style from list-elements with checkboxes | Florian Orben | 2015-12-05 | 41 | -2/+107 |
| |/ | |||||
* | | Merge pull request #1621 from mattermost/plt-1331 | Harrison Healey | 2015-12-07 | 1 | -1/+2 |
|\ \ | | | | | | | PLT-1331 Fix possible race condition when creating new channels | ||||
| * | | Fix possible race condition on when creating new channels | JoramWilander | 2015-12-04 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #1629 from mattermost/PLT-1369 | Christopher Speller | 2015-12-07 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | PLT-1369 send core message | ||||
| * | | | Fixing message | =Corey Hulen | 2015-12-04 | 1 | -23/+1 |
| | | | | |||||
| * | | | PLT-1369 send core message | =Corey Hulen | 2015-12-04 | 1 | -1/+24 |
| | |/ | |/| | |||||
* | | | Merge pull request #1616 from florianorben/PLT-1380 | Christopher Speller | 2015-12-07 | 3 | -3/+36 |
|\ \ \ | | | | | | | | | PLT-1380: Post system message when user updates channel header | ||||
| * | | | PLT-1380: Post system message when user updates channel header | Florian Orben | 2015-12-04 | 3 | -3/+36 |
| | | | | |||||
* | | | | Rename Command-Line_Tools.md to Command-Line-Tools.md | it33 | 2015-12-04 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #1626 from mattermost/PLT-1355 | Corey Hulen | 2015-12-04 | 3 | -7/+14 |
|\ \ \ \ | | | | | | | | | | | PLT-1355 Move link preview into pre-release feature | ||||
| * | | | | PLT-1355 Move link preview into pre-release feature | =Corey Hulen | 2015-12-04 | 3 | -7/+14 |
| | | | | | |||||
* | | | | | Merge pull request #1633 from mattermost/mattermost.go-help | Corey Hulen | 2015-12-04 | 2 | -13/+95 |
|\ \ \ \ \ | | | | | | | | | | | | | Updating mattermost.go help | ||||
| * | | | | | Update Command-Line_Tools.md | it33 | 2015-12-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Create Command-Line_Tools.md | it33 | 2015-12-04 | 1 | -0/+81 |
| | | | | | | |||||
| * | | | | | Updating mattermost.go help | it33 | 2015-12-04 | 1 | -13/+14 |
|/ / / / / | |||||
* | | | | | Merge pull request #1630 from florianorben/autocomplete-on-tab | Corey Hulen | 2015-12-04 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | autocomplete component should enter suggestions on 'tab' | ||||
| * | | | | | autocomplete component should enter suggestions on 'tab' | Florian Orben | 2015-12-04 | 2 | -2/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #1631 from esethna/patch-38 | Corey Hulen | 2015-12-04 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Update test-links.md | ||||
| * | | | | | Update test-links.md | Eric Sethna | 2015-12-04 | 1 | -0/+2 |
| |/ / / / | | | | | | | | | | | URLs can't contain angled brackets | ||||
* | | | | | Merge pull request #1623 from mattermost/fixed-height-embeds | Corey Hulen | 2015-12-04 | 6 | -80/+153 |
|\ \ \ \ \ | | |/ / / | |/| | | | Fix embeds and add default fixed height | ||||
| * | | | | Fix embeds and add default fixed height | JoramWilander | 2015-12-04 | 6 | -80/+153 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1571 from mattermost/PLT-1310 | Corey Hulen | 2015-12-04 | 2 | -30/+53 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1310 moving permalink to dropdown | ||||
| * | | | re-org'ing list | =Corey Hulen | 2015-12-01 | 1 | -31/+31 |
| | | | |