Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing some locations to use the IsTeamAdmin function which properly checks ↵ | Christopher Speller | 2015-09-30 | 6 | -11/+11 |
| | | | | for system admin permissions. | ||||
* | Fixing permissions for system admin. Fixes slack import for system admins. | Christopher Speller | 2015-09-30 | 1 | -14/+11 |
| | |||||
* | Fix images in welcome email. | JoramWilander | 2015-09-28 | 1 | -2/+3 |
| | |||||
* | Merge pull request #812 from hmhealey/plt256 | Corey Hulen | 2015-09-25 | 1 | -0/+14 |
|\ | | | | | PLT-256 Add headers to getFile api calls from IE/Edge to trigger file download | ||||
| * | Added headers to getFile requests from Microsoft browsers to trigger a download | hmhealey | 2015-09-25 | 1 | -0/+14 |
| | | |||||
* | | Fixing 1 more case | =Corey Hulen | 2015-09-25 | 1 | -1/+7 |
| | | |||||
* | | Merge pull request #802 from mattermost/plt-291 | Corey Hulen | 2015-09-25 | 2 | -11/+6 |
|\ \ | | | | | | | PLT-291 Fixing 404 page props | ||||
| * | | Fixing 404 page props | Christopher Speller | 2015-09-24 | 2 | -11/+6 |
| | | | |||||
* | | | Merge pull request #793 from hmhealey/plt367 | Joram Wilander | 2015-09-25 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | PLT-367 Added a json response to the uploadProfileImage api call | ||||
| * | | Added a json response to the uploadProfileImage api call | hmhealey | 2015-09-24 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #799 from mattermost/plt-31-2 | Harrison Healey | 2015-09-25 | 4 | -21/+8 |
|\ \ \ | |/ / |/| | | PLT-31 Added welcome email back in. | ||||
| * | | Added welcome email back in. | JoramWilander | 2015-09-25 | 4 | -21/+8 |
| |/ | |||||
* | | Fixing merge | =Corey Hulen | 2015-09-24 | 1 | -4/+0 |
|\ \ | |||||
| * | | fixing issue | =Corey Hulen | 2015-09-24 | 1 | -1/+0 |
| | | | |||||
| * | | Removing default theme no longer in use | =Corey Hulen | 2015-09-24 | 1 | -3/+0 |
| |/ | |||||
* / | Removing old valet crud | =Corey Hulen | 2015-09-24 | 1 | -47/+0 |
|/ | |||||
* | Assiging first user system_admin role | =Corey Hulen | 2015-09-23 | 1 | -0/+13 |
| | |||||
* | Fixing state setting | =Corey Hulen | 2015-09-23 | 1 | -2/+2 |
| | |||||
* | Fixing merge | =Corey Hulen | 2015-09-23 | 7 | -87/+84 |
|\ | |||||
| * | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 6 | -83/+83 |
| | | |||||
| * | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 2 | -4/+1 |
| |\ | |||||
| | * | Merge pull request #759 from mattermost/plt-242-3 | Harrison Healey | 2015-09-23 | 1 | -3/+0 |
| | |\ | | | | | | | | | PLT-242 Implement custom UI theme colors. | ||||
| | | * | Implement UI theme colors. | JoramWilander | 2015-09-23 | 1 | -3/+0 |
| | | | | |||||
| | * | | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | / | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 5 | -27/+151 |
|/ / | |||||
* | | Fixing merge conflict | =Corey Hulen | 2015-09-22 | 5 | -14/+283 |
|\| | |||||
| * | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 5 | -14/+283 |
| |\ | | | | | | | PLT-27 Implement incoming webhooks. | ||||
| | * | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 5 | -14/+283 |
| | | | |||||
* | | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-22 | 1 | -1/+2 |
|\| | | |||||
| * | | fix conflict | Jack | 2015-09-22 | 6 | -19/+218 |
| |\ \ | |||||
| * | | | go fmt | Jack | 2015-09-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | content type for getFile | Jack | 2015-09-17 | 1 | -1/+2 |
| | | | | |||||
* | | | | 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 |