summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* switch to only use emoji one smileys; remove setting to switchFlorian Orben2015-12-014199-1025/+13
* Allow to switch between default and emoji-one emoji styleFlorian Orben2015-12-014199-10/+1035
* Merge pull request #1512 from rgarmsen2295/plt-995bJoram Wilander2015-12-018-44/+52
|\
| * Enabled name display settings in more placesReed Garmsen2015-12-018-44/+52
* | Merge pull request #1558 from mattermost/lfbrock-patch-3Corey Hulen2015-12-011-1/+1
|\ \
| * | Update overview.mdlfbrock2015-12-011-1/+1
| |/
* | Merge pull request #1555 from mattermost/PLT-902Corey Hulen2015-12-0111-62/+182
|\ \ | |/ |/|
| * fixing other configs=Corey Hulen2015-11-302-6/+4
| * PLT-902 switching to push proxy server=Corey Hulen2015-11-309-56/+178
* | Merge pull request #1548 from mattermost/plt-1268Christopher Speller2015-12-012-9/+40
|\ \
| * | Fix webhook post aggregation and pending/failed post aggregationJoramWilander2015-11-302-9/+40
* | | Merge pull request #1546 from mattermost/plt-1281Christopher Speller2015-12-012-2/+4
|\ \ \
| * | | Make sure to have latests posts for the view whhen switching to a channelJoramWilander2015-11-302-2/+4
* | | | Merge pull request #1532 from hmhealey/prepareChristopher Speller2015-12-012-8/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | Split .prepare step into .prepare-jsx and .prepare-gohmhealey2015-11-302-7/+13
| * | | Added .prepare step to make testhmhealey2015-11-301-2/+2
| |/ /
* | | Merge pull request #1553 from esethna/patch-32Corey Hulen2015-11-301-1/+12
|\ \ \
| * | | Update Configuration-Settings.mdEric Sethna2015-11-301-1/+12
* | | | Merge pull request #1551 from esethna/patch-30Corey Hulen2015-11-301-5/+10
|\ \ \ \
| * | | | Update README.mdEric Sethna2015-11-301-5/+10
| | |_|/ | |/| |
* | | | Merge pull request #1547 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-304-28/+56
|\ \ \ \
| * | | | Improving image modal and removing console logAsaad Mahmood2015-11-302-2/+2
| * | | | Fixing LHS scroll and Image previewsAsaad Mahmood2015-11-304-27/+55
| |/ / /
* | | | Merge pull request #1543 from florianorben/GFM-TasklistCorey Hulen2015-11-302-0/+15
|\ \ \ \
| * | | | refactor not to use nested ternary statementsFlorian Orben2015-11-301-3/+5
| * | | | support gfm tasklistsFlorian Orben2015-11-302-0/+13
| |/ / /
* | | | Merge pull request #1538 from florianorben/PLT-199Corey Hulen2015-11-301-1/+3
|\ \ \ \
| * | | | PLT-199: Add scroll bar to center channelFlorian Orben2015-11-281-1/+3
* | | | | Merge pull request #1530 from mishimi/patch-13Corey Hulen2015-11-301-0/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Create Notifications.mdmishimi2015-11-271-0/+31
* | | | | Merge pull request #1552 from esethna/patch-31Joram Wilander2015-11-301-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update Team-Settings.mdEric Sethna2015-11-301-1/+2
|/ / / /
* | | | Merge pull request #1542 from florianorben/PLT-1121Harrison Healey2015-11-302-58/+63
|\ \ \ \
| * | | | PLT-1121: One element, non-ordered lists and one element, ordered, nested lis...Florian Orben2015-11-302-58/+63
* | | | | Merge pull request #1537 from florianorben/PLT-1035Corey Hulen2015-11-305-6/+97
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | PLT-1035: Remove last data point in graphs on #statistics pageFlorian Orben2015-11-285-6/+97
| | |_|/ | |/| |
* | | | Merge pull request #1544 from npcode/fix-productun-ubuntu.mdChristopher Speller2015-11-301-3/+3
|\ \ \ \
| * | | | Reorder the step to set up Mattermost Server correctlyYi EungJun2015-11-301-2/+2
| * | | | Add a missed graveYi EungJun2015-11-261-1/+1
* | | | | Merge pull request #1539 from florianorben/PLT-1170Christopher Speller2015-11-302-1/+2
|\ \ \ \ \
| * | | | | PLT-1170: Support enter key in DeletePostModalFlorian Orben2015-11-282-1/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #1536 from florianorben/login-failed-msgChristopher Speller2015-11-301-0/+1
|\ \ \ \ \
| * | | | | set correct http status code for login failures/wrong emailFlorian Orben2015-11-281-0/+1
| |/ / / /
* | | | | Merge pull request #1533 from hmhealey/plt1290Joram Wilander2015-11-301-1/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Re-added PostStore.getPosthmhealey2015-11-271-0/+12
| * | | | Fixed getCommentCounthmhealey2015-11-271-1/+1
| |/ / /
* | | | Merge pull request #1416 from florianorben/PLT-1125Corey Hulen2015-11-2710-29/+340
|\ \ \ \ | |/ / / |/| | |
| * | | add missing unit testFlorian Orben2015-11-271-0/+72
| * | | rename 'featureToggle' to 'isFeatureEnable' and move definition of available ...Florian Orben2015-11-278-45/+30
| * | | add unit testsFlorian Orben2015-11-273-2/+66