summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | easier node install for ubuntu fromYuri Tkachenko2015-11-301-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/nodesource/distributions#debinstall
| * | | | | | removed installation of GodepYuri Tkachenko2015-11-301-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #1532 need to be merged first
| * | | | | | Merge remote-tracking branch 'mattermost/master' into patch-1Yuri Tkachenko2015-11-30402-90386/+18788
| |\ \ \ \ \ \
| * | | | | | | Update Setup.mdYuriy Tkachenko2015-11-261-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixed process for Mac OS X, makes it easier to install that way
* | | | | | | | Merge pull request #1561 from florianorben/PLT-1182Harrison Healey2015-12-011-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | PLT-1182: "Recent Mention" search brings up username as "[username]undefined
| * | | | | | | PLT-1182: "Recent Mention" search brings up username as "[username]undefined"Florian Orben2015-12-011-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1512 from rgarmsen2295/plt-995bJoram Wilander2015-12-018-44/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-995 Applies name display preference setting in more places
| * | | | | | | 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.md
| * | | | | | | Update overview.mdlfbrock2015-12-011-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #1555 from mattermost/PLT-902Corey Hulen2015-12-0111-62/+182
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | PLT-902 switching to push proxy server
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1268 Fix webhook post aggregation and pending/failed post aggregation
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-1281 Make sure to have latest posts for the view when switching to a channel
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Added .prepare step to make test
| * | | | | | | 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.md
| * | | | | | | Update Configuration-Settings.mdEric Sethna2015-11-301-1/+12
| | |_|_|_|/ / | |/| | | | | | | | | | | | Add EnableOutgoingWebhooks, EnableTeamListing, restrictTeamNames
* | | | | | | Merge pull request #1551 from esethna/patch-30Corey Hulen2015-11-301-5/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update README.md
| * | | | | | | Update README.mdEric Sethna2015-11-301-5/+10
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | 1) Fix broken links 2) Add new documentation links
* | | | | | | Merge pull request #1547 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-304-28/+56
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ui improvements
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support Tasklists like GitHub does
| * | | | | | | 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 channel
| * | | | | | | 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.md
| * | | | | | Create Notifications.mdmishimi2015-11-271-0/+31
| | | | | | |
* | | | | | | Merge pull request #1552 from esethna/patch-31Joram Wilander2015-11-301-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update Team-Settings.md
| * | | | | | Update Team-Settings.mdEric Sethna2015-11-301-1/+2
|/ / / / / / | | | | | | | | | | | | Note limitation that users are not automatically added to channels
* | | | | | Merge pull request #1542 from florianorben/PLT-1121Harrison Healey2015-11-302-58/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1121: One element, non-ordered lists and one element, ordered, ne…
| * | | | | | PLT-1121: One element, non-ordered lists and one element, ordered, nested ↵Florian Orben2015-11-302-58/+63
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | lists aren't rendered correctly
* | | | | | Merge pull request #1537 from florianorben/PLT-1035Corey Hulen2015-11-305-6/+97
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | PLT-1035: Remove last data point in graphs on #statistics page
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix productun ubuntu.md
| * | | | | Reorder the step to set up Mattermost Server correctlyYi EungJun2015-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preconditions(user and home directory) should be listed first because it affects the other steps. For example, step 7 assumes the path of the config directory is `/home/ubuntu/mattermost/config`. The 'ubuntu' user should be created before unzipping mattermost to prepare the user directory `/home/ubuntu`.
| * | | | | 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 DeletePostModal
| * | | | | 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 email
| * | | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-1290 Fix up arrow to edit posts
| * | | | Re-added PostStore.getPosthmhealey2015-11-271-0/+12
| | | | |
| * | | | Fixed getCommentCounthmhealey2015-11-271-1/+1
| |/ / /