summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix new linesYuri Tkachenko2015-11-301-2/+2
|
* 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
|\
| * Merge pull request #1416 from florianorben/PLT-1125Corey Hulen2015-11-2710-29/+340
| |\ | | | | | | PLT-1125: Add "Preview pre-release features" option
| | * add missing unit testFlorian Orben2015-11-271-0/+72
| | |
| | * rename 'featureToggle' to 'isFeatureEnable' and move definition of available ↵Florian Orben2015-11-278-45/+30
| | | | | | | | | | | | prerelease-features to constants.jsx
| | * add unit testsFlorian Orben2015-11-273-2/+66
| | |
| | * go fmtFlorian Orben2015-11-271-1/+1
| | |
| | * move preview-link-toggle outside of component markupFlorian Orben2015-11-271-8/+14
| | |
| | * only show advanced settings section if there are any pre-release featuresFlorian Orben2015-11-273-51/+59
| | |
| | * allow to toggle features in backendFlorian Orben2015-11-275-8/+57
| | |
| | * PLT-1125: allow to toggle features in frontendFlorian Orben2015-11-275-16/+142
| | |
| | * fix jumping of textbox upon entering a multiline messageFlorian Orben2015-11-271-2/+2
| | |
| | * dont display line breaks in preview modeFlorian Orben2015-11-271-0/+1
| |/
| * Merge pull request #1531 from esethna/patch-27Christopher Speller2015-11-271-915/+14
| |\ | | | | | | Update test-emoticons.md
| | * Update test-emoticons.mdEric Sethna2015-11-271-915/+14
| | | | | | | | | Remove carriage returns
| * | Merge pull request #1529 from esethna/patch-26Christopher Speller2015-11-271-10/+62
| |\ \ | | | | | | | | Update test-links.md
| | * | Update test-links.mdEric Sethna2015-11-271-10/+62
| | |/ | | | | | | | | | 1) remove code blocking for automated /loadtest testing 2) Add more test cases
| * | Merge pull request #1526 from hmhealey/plt1220Christopher Speller2015-11-271-1/+1
| |\ \ | | |/ | |/| PLT-1220 Fixed Add Members menu option on mobile
| | * Fixed Add Members menu option on mobilehmhealey2015-11-261-1/+1
| | |
| * | Merge pull request #1527 from esethna/patch-24it332015-11-261-19/+12
| |\ \ | | |/ | |/| Update test-emoticons.md
| | * Update test-emoticons.mdEric Sethna2015-11-261-19/+12
| |/ | | | | | | 1) Remove code blocks for /loadtest automated testing. 2) Adjust spacing so emojis don't render across separate posts.
| * Broadening use of GitHub Issuesit332015-11-261-2/+2
| |
| * Merge pull request #1505 from mattermost/lib-upgradeChristopher Speller2015-11-26388-89422/+18369
| |\ | | | | | | Lib upgrade
| | * Fixing godep=Corey Hulen2015-11-23105-146/+146
| | |
| | * upgrading libs=Corey Hulen2015-11-23442-89534/+18483
| | |
| | * upgrading libs=Corey Hulen2015-11-233-8/+6
| | |
* | | Update Setup.mdYuriy Tkachenko2015-11-261-4/+7
|/ / | | | | Fixed process for Mac OS X, makes it easier to install that way
* | Merge pull request #1521 from esethna/patch-22it332015-11-251-3/+3
|\ \ | | | | | | Update broken links in README.md
| * | Update Code Contribution link in README.mdEric Sethna2015-11-251-1/+1
| | |
| * | Update broken links in README.mdEric Sethna2015-11-251-3/+3
|/ / | | | | Update broken links that point to docs.mattermost.org
* | Merge pull request #1517 from npcode/patch-1Harrison Healey2015-11-251-1/+1
|\ \ | | | | | | Fix the link to development install guide
| * | Fix the link to development install guideYi EungJun2015-11-251-1/+1
|/ /
* | Fixing typoit332015-11-241-1/+1
| |
* | Updates and fixing broken linkit332015-11-241-6/+7
| |
* | Merge pull request #1514 from rgarmsen2295/plt-1271Corey Hulen2015-11-241-7/+10
|\ \ | | | | | | PLT-1271 Fixed issue with changing a channel's notification settings
| * | Fixed regression with setting channel notification settingsReed Garmsen2015-11-241-7/+10
| | |
* | | Update test-markdown.mdit332015-11-241-0/+11
| | |
* | | Merge pull request #1515 from mattermost/fix-unreadChristopher Speller2015-11-241-2/+4
|\ \ \ | | | | | | | | Fixing pending post deletion on other clients.
| * | | Fixing pending post deletion on other clients.Christopher Speller2015-11-241-2/+4
|/ / /
* | | Merge pull request #1513 from mattermost/fix-distChristopher Speller2015-11-241-3/+3
|\ \ \ | | | | | | | | Fix dist
| * | | Fix distChristopher Speller2015-11-241-3/+3
|/ / /
* | | Merge pull request #1511 from mattermost/update-client-depsCorey Hulen2015-11-2411-6301/+4552
|\ \ \ | |/ / |/| | Updating client dependancies (non-npm)
| * | Updating client dependancies (non-npm)Christopher Speller2015-11-2411-6301/+4552
|/ /
* | Merge pull request #1509 from lindy65/patch-12Christopher Speller2015-11-241-1/+1
|\ \ | | | | | | Update Administration.md
| * | Update Administration.mdlindy652015-11-241-1/+1
| | | | | | | | | Updated line 33 with link to [Troubleshooting Forum](https://forum.mattermost.org/t/about-the-trouble-shooting-category/150/1) in place of link to general forum.
* | | Merge pull request #1506 from mattermost/PLT-1223Christopher Speller2015-11-241-2/+2
|\ \ \ | | | | | | | | PLT-1223 fixing help links
| * | | PLT-1223 fixing help links=Corey Hulen2015-11-231-2/+2
| | |/ | |/|
* | | Merge pull request #1504 from mattermost/lfbrock-patch-3Christopher Speller2015-11-241-1/+3
|\ \ \ | | | | | | | | Update CHANGELOG.md