Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adding service settings to admin console | =Corey Hulen | 2015-09-22 | 14 | -59/+46 |
| | |||||
* | Adding team settings to admin console | =Corey Hulen | 2015-09-22 | 10 | -277/+12 |
| | |||||
* | Fixing unit tests | =Corey Hulen | 2015-09-21 | 4 | -51/+54 |
| | |||||
* | Adding rate limiter settings to the admin console | =Corey Hulen | 2015-09-21 | 1 | -1/+1 |
| | |||||
* | Adding image properties | =Corey Hulen | 2015-09-21 | 5 | -57/+57 |
| | |||||
* | Adding email to admin console | =Corey Hulen | 2015-09-21 | 4 | -9/+61 |
| | |||||
* | Merge pull request #708 from hmhealey/plt173 | Christopher Speller | 2015-09-21 | 1 | -11/+86 |
|\ | | | | | PLT-173 Rotate images with a non-standard orientation before generating a thumbnail and preview | ||||
| * | Added constants for EXIF orientations | hmhealey | 2015-09-21 | 1 | -9/+31 |
| | | |||||
| * | PLT-173 Changed thumbnails and previews to generate correctly for images ↵ | hmhealey | 2015-09-18 | 1 | -11/+64 |
| | | | | | | | | with a non-standard orientation | ||||
* | | Renaming "Handle" to "Channel URL" or "URL" | it33 | 2015-09-20 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #709 from mattermost/PLT-11 | Harrison Healey | 2015-09-18 | 2 | -2/+126 |
|\ \ | | | | | | | PLT-11 adding config for logs to UI | ||||
| * \ | merging | =Corey Hulen | 2015-09-18 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 2 | -2/+126 |
| | |/ | |/| | |||||
* | | | Merge pull request #717 from mattermost/fix-loadtest | Corey Hulen | 2015-09-18 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | Fix authentication for server load tests. | ||||
| * | | Fix authentication for loadtests. | JoramWilander | 2015-09-18 | 1 | -3/+3 |
| |/ | |||||
* | | Making changes to versioning | =Corey Hulen | 2015-09-17 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into PLT-92 | =Corey Hulen | 2015-09-17 | 7 | -10/+14 |
|\| | |||||
| * | Merge pull request #704 from hmhealey/freetype | Christopher Speller | 2015-09-17 | 1 | -1/+1 |
| |\ | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | work again | ||||
| * | | Merge pull request #703 from mattermost/add-gofmt | Corey Hulen | 2015-09-17 | 5 | -9/+9 |
| |\ \ | | |/ | |/| | Adding gofmt to travis build | ||||
| | * | Adding gofmt to travis build | Christopher Speller | 2015-09-17 | 5 | -9/+9 |
| | | | |||||
| * | | Fixes GIT-698 allow ability to disable team creation for SSO | =Corey Hulen | 2015-09-16 | 1 | -0/+4 |
| |/ | |||||
* / | PLT-92 Adding server side versioning to the binary | =Corey Hulen | 2015-09-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #697 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 9 | -18/+18 |
|\ | | | | | 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/+1 |
| | | |||||
| * | Fixing broken email templates | =Corey Hulen | 2015-09-16 | 10 | -19/+20 |
| | | |||||
* | | 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 |
| |/ | |||||
* / | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 11 | -71/+408 |
|/ | |||||
* | Adding config file timestamp to X-Version header | =Corey Hulen | 2015-09-16 | 1 | -1/+2 |
| | |||||
* | Removing old config stuff | =Corey Hulen | 2015-09-15 | 2 | -35/+0 |
| | |||||
* | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 24 | -71/+101 |
| | |||||
* | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 8 | -17/+30 |
|\ | |||||
| * | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -0/+1 |
| |\ | | | | | | | Blank Content-Type for file GETs. | ||||
| | * | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 1 | -1/+10 |
| |\ \ | | |/ | |/| | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names. | ||||
| | * | Allowing underscores in channel names. Added conversion of some slack ↵ | Christopher Speller | 2015-09-14 | 1 | -1/+10 |
| | | | | | | | | | | | | channel names into valid mattermost names. | ||||
| * | | Merge pull request #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 7 | -61/+91 |
| |\ \ | | |/ | |/| | PLT-12: Work in progress for Admin Console UI | ||||
| | * | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN | =Corey Hulen | 2015-09-11 | 6 | -16/+16 |
| | | | |||||
| * | | Set default Content-Type to application/json for all API requests | JoramWilander | 2015-09-12 | 1 | -0/+3 |
| | | | |||||
* | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 4 | -0/+97 |
| |/ |/| | |||||
* | | merging | =Corey Hulen | 2015-09-10 | 4 | -4/+356 |
|\| | |||||
| * | Removed pointless attempt to verify a new user's username | hmhealey | 2015-09-09 | 1 | -4/+1 |
| | | |||||
| * | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 3 | -0/+355 |
| | | |||||
* | | Fixing unit test | =Corey Hulen | 2015-09-10 | 1 | -4/+4 |
| | | |||||
* | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 2 | -15/+19 |
| | | |||||
* | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 1 | -1/+1 |
| | | |||||
* | | Adding cmd line options | =Corey Hulen | 2015-09-04 | 5 | -52/+78 |
|/ |