summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #598 from mattermost/it33-patch-1it332015-09-041-19/+22
|\ | | | | Refined email setup instructions
| * Refined email setup instructionsit332015-09-041-19/+22
| |
* | Merge pull request #597 from mattermost/mm-2117Harrison Healey2015-09-041-3/+3
|\ \ | |/ |/| MM-2117 Make onHeightChange not required in Textbox.
| * Make onHeightChange not required.JoramWilander2015-09-041-3/+3
|/
* Merge pull request #596 from mattermost/it33-patch-1it332015-09-031-5/+10
|\ | | | | Update documentation table of contents
| * Update README.mdit332015-09-031-5/+10
|/
* Merge pull request #595 from mattermost/it33-patch-1it332015-09-031-5/+52
|\ | | | | Adding hardware requirements
| * Adding hardware requirementsit332015-09-031-5/+52
|/
* Merge pull request #594 from mattermost/it33-patch-1it332015-09-031-2/+2
|\ | | | | Update README.md
| * Update README.mdit332015-09-031-1/+1
| |
| * Update README.mdit332015-09-031-1/+1
|/
* Merge pull request #591 from mattermost/mm-1909Corey Hulen2015-09-0341-224/+376
|\ | | | | MM-1909 Upgrading ESLint, turning on new rules, enabling some warnings, optimizations
| * Supressing warning display on TravisChristopher Speller2015-09-031-1/+1
| |
| * Turning off eslint perfer-templates that was mistakinly turned onChristopher Speller2015-09-031-1/+1
| |
| * Turning on optimizations in uglifyjsChristopher Speller2015-09-031-1/+1
| |
| * Upgrading some warnings to errors so Travis won't accept them. Enabling some ↵Christopher Speller2015-09-031-22/+22
| | | | | | | | more rules as warnings.
| * Upgrading ESLint and adding some more rules. Refactoring to meet these new rulesChristopher Speller2015-09-0340-207/+359
| |
* | Merge pull request #590 from nickago/MM-1932Corey Hulen2015-09-036-12/+40
|\ \ | | | | | | MM-1932 Added emoji wrapper with cross platform available gliffs
| * | Added emoji wrapper with cross platform available gliffsnickago2015-09-036-12/+40
| | |
* | | Merge pull request #589 from manusajith/manusajith-doc-patch-1Corey Hulen2015-09-031-1/+1
|\ \ \ | | | | | | | | Update link to developer machine setup guide in readme.md
| * | | Update link to developer machine setup guide in readme.mdManu S Ajith2015-09-031-1/+1
| | | |
* | | | Merge pull request #585 from mattermost/plt-37Christopher Speller2015-09-032-8/+9
|\ \ \ \ | | | | | | | | | | PLT-37 Fix poor typing performance on iOS devices.
| * | | | Fix poor typing performance on iOS devices.JoramWilander2015-09-032-8/+9
| | | | |
* | | | | Merge pull request #587 from nickago/MM-1899Christopher Speller2015-09-033-14/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM-1899 Added help text to channel notifications
| * | | | Added help text to channel notificationsnickago2015-09-033-14/+10
| | | | |
* | | | | Merge pull request #588 from hmhealey/mm1852Harrison Healey2015-09-031-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | MM-1852 Fixed hashtag regex to only look for words starting with a #
| * | | | MM-1852 Fixed hashtag regex so that it only looks for hashtags starting with a #hmhealey2015-09-031-1/+1
| | |/ / | |/| |
* | | | Merge pull request #584 from mattermost/mm-1909Corey Hulen2015-09-032-9/+7
|\ \ \ \ | |_|_|/ |/| | | MM-1909 Enabling checking of style guide on travis and turning on strict mode
| * | | Enabling checking of style guide on travis and turning on strict modeChristopher Speller2015-09-032-9/+7
| | |/ | |/|
* | | Merge pull request #586 from hmhealey/mm1871Joram Wilander2015-09-031-57/+31
|\ \ \ | |_|/ |/| | MM-1871 Fixed file uploads to still upload other files when one is too large
| * | Fixed file uploads to still upload other files when one is too largehmhealey2015-09-031-57/+31
|/ /
* | Merge pull request #582 from mattermost/it33-patch-1Joram Wilander2015-09-031-1/+1
|\ \ | | | | | | Update README.md
| * | Update README.mdit332015-09-031-1/+1
| | |
* | | Merge pull request #583 from mattermost/fixing-buildCorey Hulen2015-09-031-2/+0
|\ \ \ | |/ / |/| | Fixing Makefile
| * | Fixing Makefile=Corey Hulen2015-09-031-2/+0
|/ /
* | Merge pull request #581 from mattermost/it33-patch-1it332015-09-031-4/+4
|\ \ | | | | | | Formatting updates
| * | Formatting updatesit332015-09-021-4/+4
|/ /
* | Merge pull request #580 from mattermost/it33-patch-12it332015-09-021-13/+23
|\ \ | | | | | | Update README.md
| * | Update README.mdit332015-09-021-13/+23
| | |
* | | Merge pull request #576 from mattermost/it33-patch-15Corey Hulen2015-09-022-203/+0
|\ \ \ | | | | | | | | Consolidating licensing info into LICENSE.txt
| * \ \ Fixing merge=Corey Hulen2015-09-026-665/+879
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #579 from mattermost/it33-patch-10it332015-09-021-0/+0
|\ \ \ \ | | | | | | | | | | Rename STYLE-GUIDE.md to doc/developer/style-guide.md
| * | | | Rename STYLE-GUIDE.md to doc/developer/style-guide.mdit332015-09-021-0/+0
| | |/ / | |/| |
* | | | Merge pull request #577 from mattermost/it33-patch-16it332015-09-022-665/+0
|\ \ \ \ | |/ / / |/| | | Consolidating licensing info into LICENSE.txt
| * | | Fixing build=Corey Hulen2015-09-021-1/+0
| | | |
| * | | Consolidating licensing info into LICENSE.txtit332015-09-021-664/+0
| | |/ | |/|
* | | Merge pull request #575 from mattermost/it33-patch-12it332015-09-021-0/+871
|\ \ \ | | | | | | | | Consolidating licensing info into LICENSE.txt
| * | | Consolidating licensing info into LICENSE.txtit332015-09-021-0/+871
| |/ /
* | | Merge pull request #573 from mattermost/it33-patch-10it332015-09-021-0/+0
|\ \ \ | | | | | | | | Rename scripts/README_DEV.md to doc/install/dev-setup.md
| * | | Rename scripts/README_DEV.md to doc/install/dev-setup.mdit332015-09-021-0/+0
| |/ /