summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding gofmt to travis buildChristopher Speller2015-09-178-11/+29
* Merge pull request #697 from mattermost/PLT-93Christopher Speller2015-09-1610-18/+19
|\
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+0
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+0
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+1
| * Fixing broken email templates=Corey Hulen2015-09-1611-19/+22
* | Merge pull request #696 from mattermost/PLT-23Christopher Speller2015-09-161-7/+17
|\ \
| * | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-3/+3
| * | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-5/+15
| |/
* | Merge pull request #694 from mattermost/GIT-669Christopher Speller2015-09-161-3/+3
|\ \
| * | Fixing 669 removing -a flag from go cmds=Corey Hulen2015-09-161-3/+3
* | | Merge pull request #693 from mattermost/mm-1419Christopher Speller2015-09-1645-199/+2506
|\ \ \ | |_|/ |/| |
| * | Implement OAuth2 service provider functionality.JoramWilander2015-09-1645-199/+2506
* | | Merge pull request #695 from hmhealey/startswithCorey Hulen2015-09-161-2/+2
|\ \ \ | |/ / |/| |
| * | Replaced instances of startsWith with lastIndexOf in TextFormattinghmhealey2015-09-161-2/+2
* | | Merge pull request #687 from mattermost/PLT-93Christopher Speller2015-09-1687-707/+430
|\ \ \ | |_|/ |/| |
| * | Adding config file timestamp to X-Version header=Corey Hulen2015-09-161-1/+2
| * | Merge branch 'master' into PLT-93=Corey Hulen2015-09-167-21/+66
| |\|
| * | Fixing eslint problems=Corey Hulen2015-09-153-7/+0
| * | Finished removing some of the last bits of client side config=Corey Hulen2015-09-154-41/+1
| * | Removing old config stuff=Corey Hulen2015-09-1511-273/+6
| * | PLT-93 cleaing up client side configs=Corey Hulen2015-09-1582-374/+428
| * | removing loggly=Corey Hulen2015-09-153-18/+0
* | | Merge pull request #691 from asaadmahmoodspin/ui-changesCorey Hulen2015-09-169-7/+33
|\ \ \
| * | | UI Updates for multiple ticketsAsaad Mahmood2015-09-169-7/+33
| | |/ | |/|
* | | Merge pull request #692 from hmhealey/plt149Corey Hulen2015-09-161-0/+1
|\ \ \ | |/ / |/| |
| * | PLT-149 Removed the file list from (message deleted) placeholder postshmhealey2015-09-161-0/+1
|/ /
* | Merge pull request #690 from mattermost/fix-safariHarrison Healey2015-09-162-4/+4
|\ \
| * | Removing js map from react bootstrap to make safari happy.Christopher Speller2015-09-162-4/+4
|/ /
* | Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-164-13/+58
|\ \
| * | PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly s...hmhealey2015-09-152-6/+9
| * | PLT-172 Updated perfect-scrollbar to 0.6.5hmhealey2015-09-154-12/+54
* | | Merge pull request #688 from mattermost/fixing-typoJoram Wilander2015-09-161-4/+4
|\ \ \ | |_|/ |/| |
| * | Fixing typo=Corey Hulen2015-09-151-4/+4
|/ /
* | Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-1516-18/+332
|\ \
| * | Moving style into css=Corey Hulen2015-09-153-14/+14
| * | Fixing eslint issues=Corey Hulen2015-09-141-9/+0
| * | Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1459-733/+18562
| |\ \
| * | | PLT-12 adding log viewer=Corey Hulen2015-09-1014-15/+338
* | | | Merge pull request #685 from mattermost/update-style-guideHarrison Healey2015-09-151-8/+11
|\ \ \ \
| * | | | Updating style guideChristopher Speller2015-09-151-8/+11
* | | | | Merge pull request #684 from mattermost/fix-text-overflowCorey Hulen2015-09-151-1/+1
|\ \ \ \ \
| * | | | | Fixing long channel name overflow by changing text to EditChristopher Speller2015-09-151-1/+1
| |/ / / /
* | | | | Merge pull request #682 from mattermost/nc-patchJoram Wilander2015-09-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixing cutoff team name in new channel modalChristopher Speller2015-09-151-1/+1
| | |/ / | |/| |
* | | | Merge pull request #673 from apaatsio/clean-go-depsJoram Wilander2015-09-151-0/+2
|\ \ \ \
| * | | | Clean installed Go dependenciesAntti Ahti2015-09-141-0/+2
* | | | | Merge pull request #676 from hmhealey/mm1900bJoram Wilander2015-09-159-220/+308
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Renamed text formatting tokens so that there should be significantly less cha...hmhealey2015-09-141-11/+11
| * | | | Removed textToJsx!hmhealey2015-09-141-199/+0