Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1558 from mattermost/lfbrock-patch-3 | Corey Hulen | 2015-12-01 | 1 | -1/+1 |
|\ | | | | | Update overview.md | ||||
| * | Update overview.md | lfbrock | 2015-12-01 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1555 from mattermost/PLT-902 | Corey Hulen | 2015-12-01 | 11 | -62/+182 |
|\ \ | |/ |/| | PLT-902 switching to push proxy server | ||||
| * | fixing other configs | =Corey Hulen | 2015-11-30 | 2 | -6/+4 |
| | | |||||
| * | PLT-902 switching to push proxy server | =Corey Hulen | 2015-11-30 | 9 | -56/+178 |
| | | |||||
* | | Merge pull request #1548 from mattermost/plt-1268 | Christopher Speller | 2015-12-01 | 2 | -9/+40 |
|\ \ | | | | | | | PLT-1268 Fix webhook post aggregation and pending/failed post aggregation | ||||
| * | | Fix webhook post aggregation and pending/failed post aggregation | JoramWilander | 2015-11-30 | 2 | -9/+40 |
| | | | |||||
* | | | Merge pull request #1546 from mattermost/plt-1281 | Christopher Speller | 2015-12-01 | 2 | -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 channel | JoramWilander | 2015-11-30 | 2 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #1532 from hmhealey/prepare | Christopher Speller | 2015-12-01 | 2 | -8/+14 |
|\ \ \ \ | |_|_|/ |/| | | | Added .prepare step to make test | ||||
| * | | | Split .prepare step into .prepare-jsx and .prepare-go | hmhealey | 2015-11-30 | 2 | -7/+13 |
| | | | | |||||
| * | | | Added .prepare step to make test | hmhealey | 2015-11-30 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #1553 from esethna/patch-32 | Corey Hulen | 2015-11-30 | 1 | -1/+12 |
|\ \ \ | | | | | | | | | Update Configuration-Settings.md | ||||
| * | | | Update Configuration-Settings.md | Eric Sethna | 2015-11-30 | 1 | -1/+12 |
| | | | | | | | | | | | | Add EnableOutgoingWebhooks, EnableTeamListing, restrictTeamNames | ||||
* | | | | Merge pull request #1551 from esethna/patch-30 | Corey Hulen | 2015-11-30 | 1 | -5/+10 |
|\ \ \ \ | | | | | | | | | | | Update README.md | ||||
| * | | | | Update README.md | Eric Sethna | 2015-11-30 | 1 | -5/+10 |
| | |_|/ | |/| | | | | | | | | | | 1) Fix broken links 2) Add new documentation links | ||||
* | | | | Merge pull request #1547 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-30 | 4 | -28/+56 |
|\ \ \ \ | | | | | | | | | | | Ui improvements | ||||
| * | | | | Improving image modal and removing console log | Asaad Mahmood | 2015-11-30 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fixing LHS scroll and Image previews | Asaad Mahmood | 2015-11-30 | 4 | -27/+55 |
| |/ / / | |||||
* | | | | Merge pull request #1543 from florianorben/GFM-Tasklist | Corey Hulen | 2015-11-30 | 2 | -0/+15 |
|\ \ \ \ | | | | | | | | | | | Support Tasklists like GitHub does | ||||
| * | | | | refactor not to use nested ternary statements | Florian Orben | 2015-11-30 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | support gfm tasklists | Florian Orben | 2015-11-30 | 2 | -0/+13 |
| |/ / / | |||||
* | | | | Merge pull request #1538 from florianorben/PLT-199 | Corey Hulen | 2015-11-30 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | PLT-199: Add scroll bar to center channel | ||||
| * | | | | PLT-199: Add scroll bar to center channel | Florian Orben | 2015-11-28 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #1530 from mishimi/patch-13 | Corey Hulen | 2015-11-30 | 1 | -0/+31 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Create Notifications.md | ||||
| * | | | | Create Notifications.md | mishimi | 2015-11-27 | 1 | -0/+31 |
| | | | | | |||||
* | | | | | Merge pull request #1552 from esethna/patch-31 | Joram Wilander | 2015-11-30 | 1 | -1/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Update Team-Settings.md | ||||
| * | | | | Update Team-Settings.md | Eric Sethna | 2015-11-30 | 1 | -1/+2 |
|/ / / / | | | | | | | | | Note limitation that users are not automatically added to channels | ||||
* | | | | Merge pull request #1542 from florianorben/PLT-1121 | Harrison Healey | 2015-11-30 | 2 | -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 Orben | 2015-11-30 | 2 | -58/+63 |
| | | | | | | | | | | | | | | | | | | | | lists aren't rendered correctly | ||||
* | | | | | Merge pull request #1537 from florianorben/PLT-1035 | Corey Hulen | 2015-11-30 | 5 | -6/+97 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-1035: Remove last data point in graphs on #statistics page | ||||
| * | | | | PLT-1035: Remove last data point in graphs on #statistics page | Florian Orben | 2015-11-28 | 5 | -6/+97 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1544 from npcode/fix-productun-ubuntu.md | Christopher Speller | 2015-11-30 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Fix productun ubuntu.md | ||||
| * | | | | Reorder the step to set up Mattermost Server correctly | Yi EungJun | 2015-11-30 | 1 | -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 grave | Yi EungJun | 2015-11-26 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #1539 from florianorben/PLT-1170 | Christopher Speller | 2015-11-30 | 2 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1170: Support enter key in DeletePostModal | ||||
| * | | | | | PLT-1170: Support enter key in DeletePostModal | Florian Orben | 2015-11-28 | 2 | -1/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1536 from florianorben/login-failed-msg | Christopher Speller | 2015-11-30 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Set correct http status code for login failures/wrong email | ||||
| * | | | | | set correct http status code for login failures/wrong email | Florian Orben | 2015-11-28 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #1533 from hmhealey/plt1290 | Joram Wilander | 2015-11-30 | 1 | -1/+13 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-1290 Fix up arrow to edit posts | ||||
| * | | | | Re-added PostStore.getPost | hmhealey | 2015-11-27 | 1 | -0/+12 |
| | | | | | |||||
| * | | | | Fixed getCommentCount | hmhealey | 2015-11-27 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1416 from florianorben/PLT-1125 | Corey Hulen | 2015-11-27 | 10 | -29/+340 |
|\ \ \ \ | |/ / / |/| | | | PLT-1125: Add "Preview pre-release features" option | ||||
| * | | | add missing unit test | Florian Orben | 2015-11-27 | 1 | -0/+72 |
| | | | | |||||
| * | | | rename 'featureToggle' to 'isFeatureEnable' and move definition of available ↵ | Florian Orben | 2015-11-27 | 8 | -45/+30 |
| | | | | | | | | | | | | | | | | prerelease-features to constants.jsx | ||||
| * | | | add unit tests | Florian Orben | 2015-11-27 | 3 | -2/+66 |
| | | | | |||||
| * | | | go fmt | Florian Orben | 2015-11-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | move preview-link-toggle outside of component markup | Florian Orben | 2015-11-27 | 1 | -8/+14 |
| | | | | |||||
| * | | | only show advanced settings section if there are any pre-release features | Florian Orben | 2015-11-27 | 3 | -51/+59 |
| | | | | |||||
| * | | | allow to toggle features in backend | Florian Orben | 2015-11-27 | 5 | -8/+57 |
| | | | |