summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixing merge=Corey Hulen2015-09-185-10/+19
|\
| * Merge pull request #713 from mattermost/it33-patch-3Christopher Speller2015-09-181-1/+6
| |\ | | | | | | Adding template for contributor list request
| | * Adding template for contributor list requestit332015-09-181-1/+6
| | |
| * | Merge pull request #712 from mattermost/postgres-oauth-fixChristopher Speller2015-09-181-0/+4
| |\ \ | | |/ | |/| With Postgres return false when checking if column exists, if the table does not exist.
| | * Return false when checking if column exists, if the table does not exist ↵JoramWilander2015-09-181-0/+4
| |/ | | | | | | with postgres.
| * Merge pull request #665 from chengweiv5/fix-coding-styleChristopher Speller2015-09-184-10/+10
| |\ | | | | | | Fix coding style: replace tab with whitespace in mattermost config
| | * Fix coding style: replace tab with whitespace in mattermost configChengwei Yang2015-09-134-10/+10
| | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | Moving logout item=Corey Hulen2015-09-171-6/+6
| | |
* | | PLT-11 adding config for logs to UI=Corey Hulen2015-09-1717-293/+208
| | |
* | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-1714-295/+842
|/ /
* | Merge pull request #705 from esethna/patch-1Corey Hulen2015-09-171-1/+1
|\ \ | | | | | | Grammar change to New Channel ui text
| * | Grammar change to New Channel ui textesethna2015-09-171-1/+1
| | |
* | | Merge pull request #706 from lindy65/patch-2Joram Wilander2015-09-171-1/+1
|\ \ \ | | | | | | | | Fixing URL for "Developer Machine Setup"
| * | | Fixing URL for "Developer Machine Setup"lindy652015-09-171-1/+1
|/ / / | | | | | | Link went to a broken 404 error page
* | | Merge pull request #704 from hmhealey/freetypeChristopher Speller2015-09-1775-7/+89256
|\ \ \ | | | | | | | | Updated godep workspace and freetype library so that godep save and restore work again
| * | | Updated godep workspace and freetype library so that godep save and restore ↵hmhealey2015-09-1775-7/+89256
| | | | | | | | | | | | | | | | work again
* | | | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-17885-2/+42
|\ \ \ \ | |_|/ / |/| | | PLT-40 adding experimental support for emojis
| * | | Fixing css=Corey Hulen2015-09-164-9/+7
| | | |
| * | | PLT-40 adding experimental support for emojis=Corey Hulen2015-09-16886-2/+44
| | | |
* | | | Merge pull request #703 from mattermost/add-gofmtCorey Hulen2015-09-178-11/+29
|\ \ \ \ | |_|/ / |/| | | Adding gofmt to travis build
| * | | Adding gofmt to travis buildChristopher Speller2015-09-178-11/+29
| |/ /
* | | Merge pull request #683 from mattermost/it33-patch-1Harrison Healey2015-09-171-1/+3
|\ \ \ | | | | | | | | Fixed style guide link, added description
| * | | Fixed typoit332015-09-171-1/+1
| | | |
| * | | Fixed style guide link, added descriptionit332015-09-151-1/+3
| | | |
* | | | Merge pull request #700 from mattermost/GIT-698Christopher Speller2015-09-171-0/+4
|\ \ \ \ | | | | | | | | | | Fixes GIT-698 allow ability to disable team creation for SSO
| * | | | Fixes GIT-698 allow ability to disable team creation for SSO=Corey Hulen2015-09-161-0/+4
| | |/ / | |/| |
* | | | Merge pull request #702 from mattermost/oauth-switch-fixJoram Wilander2015-09-171-1/+1
|\ \ \ \ | | | | | | | | | | Properly check if OAuth providing is enabled on the client.
| * | | | Properly check if OAuth providing is enabled on the client.JoramWilander2015-09-171-1/+1
| |/ / /
* | | | Merge pull request #680 from hmhealey/plt159Joram Wilander2015-09-172-33/+73
|\ \ \ \ | |/ / / |/| | | PLT-159 Properly hide unread indicators when there are no unread channels
| * | | Cleaned up logic for the unread indicatorsChristopher Speller2015-09-163-108/+100
| | | |
| * | | Moved unread channel indicators into their own React component and filehmhealey2015-09-162-70/+112
| | | |
| * | | Properly hide unread channel indicators when there are no unread channelshmhealey2015-09-161-5/+11
|/ / /
* | | Merge pull request #697 from mattermost/PLT-93Christopher Speller2015-09-1610-18/+19
|\ \ \ | | | | | | | | PLT-93 Fixing broken email templates
| * | | 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
| * | | | 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
| * | | | 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.
| * | | | 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 TextFormatting
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-93 Cleaning up client side configs
| * | | | 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
| | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 15:36:22 +0000