Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixing versioning | =Corey Hulen | 2015-09-17 | 1 | -3/+3 |
| | |||||
* | Making changes to versioning | =Corey Hulen | 2015-09-17 | 13 | -69/+86 |
| | |||||
* | Merge branch 'master' into PLT-92 | =Corey Hulen | 2015-09-17 | 973 | -55/+89408 |
|\ | |||||
| * | 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 |
| |/ / | |||||
* | | | Fixing postgres issue and bumping version number | =Corey Hulen | 2015-09-16 | 2 | -3/+50 |
| | | | |||||
* | | | Adding version to UI | =Corey Hulen | 2015-09-16 | 2 | -1/+13 |
| | | | |||||
* | | | Adding database schema version | =Corey Hulen | 2015-09-16 | 7 | -3/+222 |
| | | | |||||
* | | | Outputing version to logs on server start | =Corey Hulen | 2015-09-16 | 1 | -0/+1 |
| | | | |||||
* | | | fixing build | =Corey Hulen | 2015-09-16 | 2 | -1/+2 |
| | | | |||||
* | | | PLT-92 Adding server side versioning to the binary | =Corey Hulen | 2015-09-16 | 13 | -23/+199 |
|/ / | |||||
* | | 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 |
| | | | | |||||
| * | | | Finished removing some of the last bits of client side config | =Corey Hulen | 2015-09-15 | 4 | -41/+1 |
| | | | | |||||
| * | | | Removing old config stuff | =Corey Hulen | 2015-09-15 | 11 | -273/+6 |
| | | | | |||||
| * | | | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 82 | -374/+428 |
| | | | | |||||
| * | | | removing loggly | =Corey Hulen | 2015-09-15 | 3 | -18/+0 |
| | | | | |||||
* | | | | Merge pull request #691 from asaadmahmoodspin/ui-changes | Corey Hulen | 2015-09-16 | 9 | -7/+33 |
|\ \ \ \ | | | | | | | | | | | UI Updates for multiple tickets |