Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #716 from hmhealey/plt299 | Corey Hulen | 2015-09-18 | 1 | -1/+1 |
|\ | | | | | PLT-299 Fixed incorrect check if a url starts with an explicit protocol | ||||
| * | Fixed incorrect check if a url starts with an explicit protocol | hmhealey | 2015-09-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #714 from mattermost/test-matrix | Corey Hulen | 2015-09-18 | 2 | -0/+16 |
|\ \ | |/ |/| | Adding go 1.5.1 and postgress to travis build | ||||
| * | Adding go 1.5.1 and postgress to travis build | Christopher Speller | 2015-09-18 | 2 | -0/+16 |
| | | |||||
* | | Merge pull request #713 from mattermost/it33-patch-3 | Christopher Speller | 2015-09-18 | 1 | -1/+6 |
|\ \ | |/ |/| | Adding template for contributor list request | ||||
| * | Adding template for contributor list request | it33 | 2015-09-18 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #712 from mattermost/postgres-oauth-fix | Christopher Speller | 2015-09-18 | 1 | -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 ↵ | JoramWilander | 2015-09-18 | 1 | -0/+4 |
|/ | | | | with postgres. | ||||
* | Merge pull request #665 from chengweiv5/fix-coding-style | Christopher Speller | 2015-09-18 | 4 | -10/+10 |
|\ | | | | | Fix coding style: replace tab with whitespace in mattermost config | ||||
| * | Fix coding style: replace tab with whitespace in mattermost config | Chengwei Yang | 2015-09-13 | 4 | -10/+10 |
| | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | Merge pull request #705 from esethna/patch-1 | Corey Hulen | 2015-09-17 | 1 | -1/+1 |
|\ \ | | | | | | | Grammar change to New Channel ui text | ||||
| * | | Grammar change to New Channel ui text | esethna | 2015-09-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #706 from lindy65/patch-2 | Joram Wilander | 2015-09-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing URL for "Developer Machine Setup" | ||||
| * | | | Fixing URL for "Developer Machine Setup" | lindy65 | 2015-09-17 | 1 | -1/+1 |
|/ / / | | | | | | | Link went to a broken 404 error page | ||||
* | | | Merge pull request #704 from hmhealey/freetype | Christopher Speller | 2015-09-17 | 75 | -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 ↵ | hmhealey | 2015-09-17 | 75 | -7/+89256 |
| | | | | | | | | | | | | | | | | work again | ||||
* | | | | Merge pull request #701 from mattermost/PLT-40 | Joram Wilander | 2015-09-17 | 885 | -2/+42 |
|\ \ \ \ | |_|/ / |/| | | | PLT-40 adding experimental support for emojis | ||||
| * | | | Fixing css | =Corey Hulen | 2015-09-16 | 4 | -9/+7 |
| | | | | |||||
| * | | | PLT-40 adding experimental support for emojis | =Corey Hulen | 2015-09-16 | 886 | -2/+44 |
| | | | | |||||
* | | | | Merge pull request #703 from mattermost/add-gofmt | Corey Hulen | 2015-09-17 | 8 | -11/+29 |
|\ \ \ \ | |_|/ / |/| | | | Adding gofmt to travis build | ||||
| * | | | Adding gofmt to travis build | Christopher Speller | 2015-09-17 | 8 | -11/+29 |
| |/ / | |||||
* | | | Merge pull request #683 from mattermost/it33-patch-1 | Harrison Healey | 2015-09-17 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fixed style guide link, added description | ||||
| * | | | Fixed typo | it33 | 2015-09-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed style guide link, added description | it33 | 2015-09-15 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #700 from mattermost/GIT-698 | Christopher Speller | 2015-09-17 | 1 | -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 Hulen | 2015-09-16 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #702 from mattermost/oauth-switch-fix | Joram Wilander | 2015-09-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Properly check if OAuth providing is enabled on the client. | ||||
| * | | | | Properly check if OAuth providing is enabled on the client. | JoramWilander | 2015-09-17 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #680 from hmhealey/plt159 | Joram Wilander | 2015-09-17 | 2 | -33/+73 |
|\ \ \ \ | |/ / / |/| | | | PLT-159 Properly hide unread indicators when there are no unread channels | ||||
| * | | | Cleaned up logic for the unread indicators | Christopher Speller | 2015-09-16 | 3 | -108/+100 |
| | | | | |||||
| * | | | Moved unread channel indicators into their own React component and file | hmhealey | 2015-09-16 | 2 | -70/+112 |
| | | | | |||||
| * | | | Properly hide unread channel indicators when there are no unread channels | hmhealey | 2015-09-16 | 1 | -5/+11 |
|/ / / | |||||
* | | | Merge pull request #697 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 10 | -18/+19 |
|\ \ \ | | | | | | | | | PLT-93 Fixing broken email templates | ||||
| * | | | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 11 | -19/+22 |
| | | | | |||||
* | | | | Merge pull request #696 from mattermost/PLT-23 | Christopher Speller | 2015-09-16 | 1 | -7/+17 |
|\ \ \ \ | | | | | | | | | | | PLT-23 error.html pulls files from static | ||||
| * | | | | PLT-23 error.html pulls files from static | =Corey Hulen | 2015-09-16 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | PLT-23 error.html pulls files from static | =Corey Hulen | 2015-09-16 | 1 | -5/+15 |
| |/ / / | |||||
* | | | | Merge pull request #694 from mattermost/GIT-669 | Christopher Speller | 2015-09-16 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Fixing 669 removing -a flag from go cmds | ||||
| * | | | | Fixing 669 removing -a flag from go cmds | =Corey Hulen | 2015-09-16 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #693 from mattermost/mm-1419 | Christopher Speller | 2015-09-16 | 45 | -199/+2506 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Implement OAuth2 service provider functionality. | ||||
| * | | | | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 45 | -199/+2506 |
| | | | | | |||||
* | | | | | Merge pull request #695 from hmhealey/startswith | Corey Hulen | 2015-09-16 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Replaced instances of startsWith with lastIndexOf in TextFormatting | ||||
| * | | | | Replaced instances of startsWith with lastIndexOf in TextFormatting | hmhealey | 2015-09-16 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #687 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 87 | -707/+430 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-93 Cleaning up client side configs | ||||
| * | | | | Adding config file timestamp to X-Version header | =Corey Hulen | 2015-09-16 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into PLT-93 | =Corey Hulen | 2015-09-16 | 7 | -21/+66 |
| |\| | | | |||||
| * | | | | Fixing eslint problems | =Corey Hulen | 2015-09-15 | 3 | -7/+0 |
| | | | | |