summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Create test-attachments.mdEric Sethna2015-12-081-0/+144
* Merge pull request #1662 from esethna/patch-39Corey Hulen2015-12-081-13/+9
|\
| * Update Configuration-Settings.mdEric Sethna2015-12-081-10/+9
| * Update Configuration-Settings.mdEric Sethna2015-12-081-8/+5
* | Merge pull request #1660 from mattermost/lfbrock-patch-1it332015-12-081-3/+55
|\ \ | |/ |/|
| * Update CHANGELOG.mdlfbrock2015-12-081-9/+2
| * Update CHANGELOG.mdlfbrock2015-12-081-3/+62
* | Merge pull request #1661 from mattermost/plt-1425Harrison Healey2015-12-081-3/+3
|\ \
| * | Remove @all from recent mentionsJoramWilander2015-12-081-3/+3
* | | Merge pull request #1659 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-0815-38/+58
|\ \ \ | |/ / |/| |
| * | Closing RHS if jump is clicked for archivesAsaad Mahmood2015-12-082-0/+6
| * | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-12-083-2/+32
| |\ \ | |/ / |/| |
* | | Merge pull request #1655 from mattermost/lfbrock-patch-3Joram Wilander2015-12-083-2/+32
|\ \ \
| * | | Update Messaging.mdlfbrock2015-12-081-3/+3
| * | | Update Messaging.mdlfbrock2015-12-081-0/+9
| * | | Update Account-Settings.mdlfbrock2015-12-081-0/+9
| * | | Update Markdown.mdlfbrock2015-12-081-1/+12
| * | | Update Messaginglfbrock2015-12-081-1/+2
| | |/ | |/|
| | * Adding jump text instead of iconAsaad Mahmood2015-12-082-2/+9
| | * Multiple UI ImprovementsAsaad Mahmood2015-12-0814-37/+44
| |/ |/|
* | Update Upgrade-Guide.mdit332015-12-081-1/+1
* | Merge pull request #1654 from hmhealey/plt1421Joram Wilander2015-12-081-3/+20
|\ \
| * | Changed ordering of emoticon suggestionshmhealey2015-12-081-3/+20
| |/
* | Merge pull request #1651 from mattermost/plt-1399Corey Hulen2015-12-081-3/+11
|\ \
| * | Fix username on commented on message for webhooksJoramWilander2015-12-081-3/+11
| |/
* | Merge pull request #1650 from mattermost/plt-1389Corey Hulen2015-12-081-0/+1
|\ \
| * | 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=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=Corey Hulen2015-12-071-4/+5
| |/
* | Merge pull request #1645 from mattermost/plt-1365Christopher Speller2015-12-081-1/+1
|\ \
| * | 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
|\ \
| * | 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
|\ \
| * | 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
|\ \
| * | 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 lo...Florian Orben2015-12-042-0/+13
* | | Merge pull request #1640 from florianorben/collapse_fixJoram Wilander2015-12-081-1/+1
|\ \ \