summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #591 from mattermost/mm-1909Corey Hulen2015-09-0341-224/+376
|\
| * 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
| * 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
|\ \
| * | 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.mdManu S Ajith2015-09-031-1/+1
* | | | Merge pull request #585 from mattermost/plt-37Christopher Speller2015-09-032-8/+9
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|\ \ \ | |_|/ |/| |
| * | 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.mdit332015-09-031-1/+1
* | | Merge pull request #583 from mattermost/fixing-buildCorey Hulen2015-09-031-2/+0
|\ \ \ | |/ / |/| |
| * | Fixing Makefile=Corey Hulen2015-09-031-2/+0
|/ /
* | Merge pull request #581 from mattermost/it33-patch-1it332015-09-031-4/+4
|\ \
| * | Formatting updatesit332015-09-021-4/+4
|/ /
* | Merge pull request #580 from mattermost/it33-patch-12it332015-09-021-13/+23
|\ \
| * | Update README.mdit332015-09-021-13/+23
* | | Merge pull request #576 from mattermost/it33-patch-15Corey Hulen2015-09-022-203/+0
|\ \ \
| * \ \ 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.mdit332015-09-021-0/+0
| | |/ / | |/| |
* | | | Merge pull request #577 from mattermost/it33-patch-16it332015-09-022-665/+0
|\ \ \ \ | |/ / / |/| | |
| * | | 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.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.mdit332015-09-021-0/+0
| |/ /
* | | Merge pull request #572 from mattermost/it33-patch-9it332015-09-021-0/+8
|\ \ \ | |/ / |/| |
| * | Updating table of contents for docit332015-09-021-0/+8
|/ /
| * Fixing build=Corey Hulen2015-09-021-1/+0
| * Consolidating licensing info into LICENSE.txtit332015-09-021-202/+0
|/
* Merge pull request #571 from mishimi/patch-3Joram Wilander2015-09-021-1/+1
|\
| * Updating help text to fix typomishimi2015-09-021-1/+1
|/
* Merge pull request #570 from rgarmsen2295/fix-initial-state-callsCorey Hulen2015-09-025-22/+30
|\
| * Moved componentWillMount logic into the constructor of the react components i...Reed Garmsen2015-09-022-9/+7
| * Replaced remaining calls of getInitialStateReed Garmsen2015-09-023-13/+23
* | Merge pull request #561 from mishimi/patch-2Corey Hulen2015-09-021-1/+1
|\ \
| * | MM-2102 Clarifying error message on reserved URL wordsmishimi2015-09-021-1/+1