Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Update CHANGELOG.md | lfbrock | 2015-12-08 | 1 | -3/+62 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1661 from mattermost/plt-1425 | Harrison Healey | 2015-12-08 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-1425 Remove @all from recent mentions | |||||
| * | | | | Remove @all from recent mentions | JoramWilander | 2015-12-08 | 1 | -3/+3 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #1659 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-12-08 | 15 | -38/+58 | |
|\ \ \ \ | |/ / / |/| | | | Multiple UI Improvements | |||||
| * | | | Closing RHS if jump is clicked for archives | Asaad Mahmood | 2015-12-08 | 2 | -0/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-12-08 | 3 | -2/+32 | |
| |\ \ \ | |/ / / |/| | | | | | | | ui-improvements | |||||
* | | | | Merge pull request #1655 from mattermost/lfbrock-patch-3 | Joram Wilander | 2015-12-08 | 3 | -2/+32 | |
|\ \ \ \ | |_|_|/ |/| | | | Update messaging and markdown help | |||||
| * | | | Update Messaging.md | lfbrock | 2015-12-08 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Update Messaging.md | lfbrock | 2015-12-08 | 1 | -0/+9 | |
| | | | | ||||||
| * | | | Update Account-Settings.md | lfbrock | 2015-12-08 | 1 | -0/+9 | |
| | | | | ||||||
| * | | | Update Markdown.md | lfbrock | 2015-12-08 | 1 | -1/+12 | |
| | | | | ||||||
| * | | | Update Messaging | lfbrock | 2015-12-08 | 1 | -1/+2 | |
| | |/ | |/| | ||||||
| | * | Adding jump text instead of icon | Asaad Mahmood | 2015-12-08 | 2 | -2/+9 | |
| | | | ||||||
| | * | Multiple UI Improvements | Asaad Mahmood | 2015-12-08 | 14 | -37/+44 | |
| |/ |/| | ||||||
* | | Update Upgrade-Guide.md | it33 | 2015-12-08 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #1654 from hmhealey/plt1421 | Joram Wilander | 2015-12-08 | 1 | -3/+20 | |
|\ \ | | | | | | | PLT-1421 Changed ordering of emoticon suggestions | |||||
| * | | Changed ordering of emoticon suggestions | hmhealey | 2015-12-08 | 1 | -3/+20 | |
| |/ | ||||||
* | | Merge pull request #1651 from mattermost/plt-1399 | Corey Hulen | 2015-12-08 | 1 | -3/+11 | |
|\ \ | | | | | | | PLT-1399 Fix username on commented on message for webhooks | |||||
| * | | Fix username on commented on message for webhooks | JoramWilander | 2015-12-08 | 1 | -3/+11 | |
| |/ | ||||||
* | | Merge pull request #1650 from mattermost/plt-1389 | Corey Hulen | 2015-12-08 | 1 | -0/+1 | |
|\ \ | | | | | | | PLT-1389 Fix edited posts not updating by websocket | |||||
| * | | Fix edited posts not updating by websocket | JoramWilander | 2015-12-08 | 1 | -0/+1 | |
| |/ | ||||||
* | | Update CONTRIBUTING.md | it33 | 2015-12-08 | 1 | -1/+1 | |
| | | ||||||
* | | Update overview.md | it33 | 2015-12-08 | 1 | -1/+1 | |
| | | ||||||
* | | Update overview.md | it33 | 2015-12-08 | 1 | -4/+4 | |
|/ | ||||||
* | Merge pull request #1646 from mattermost/PLT-1302 | Joram Wilander | 2015-12-08 | 4 | -15/+13 | |
|\ | | | | | PLT-1302 fixing hiding email adddress | |||||
| * | PLT-1302 fixing hiding email adddress | =Corey Hulen | 2015-12-07 | 1 | -8/+0 | |
| | | ||||||
| * | PLT-1302 fixing hiding email adddress | =Corey Hulen | 2015-12-07 | 4 | -8/+14 | |
| | | ||||||
* | | Merge pull request #1647 from mattermost/PLT-564 | Christopher Speller | 2015-12-08 | 1 | -4/+5 | |
|\ \ | | | | | | | PLT-564 fixing error bar | |||||
| * | | PLT-564 fixing error bar | =Corey Hulen | 2015-12-07 | 1 | -4/+5 | |
| |/ | ||||||
* | | 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 |