Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| |\ | ||||||
| * | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 5 | -27/+151 | |
* | | | set transparent png background to white | Jack | 2015-09-24 | 1 | -1/+10 | |
* | | | use github.com/disintegration/imaging | Jack | 2015-09-23 | 2 | -48/+20 | |
| |/ |/| | ||||||
* | | 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 | |
| |\ | ||||||
| | * | 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 | |
| |/ | ||||||
* | | 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 | |
| |\ | ||||||
| | * | 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 | |
|\ \ \ | ||||||
| * | | | Added constants for EXIF orientations | hmhealey | 2015-09-21 | 1 | -9/+31 | |
| * | | | PLT-173 Changed thumbnails and previews to generate correctly for images with... | hmhealey | 2015-09-18 | 1 | -11/+64 | |
| |/ / | ||||||
* | / | 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 | |
|\ \ | ||||||
| * \ | 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 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 w... | hmhealey | 2015-09-17 | 1 | -1/+1 | |
| * | | Merge pull request #703 from mattermost/add-gofmt | Corey Hulen | 2015-09-17 | 5 | -9/+9 | |
| |\ \ | | |/ | |/| | ||||||
| | * | 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 | |
|\ | ||||||
| * | 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 | =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 | |
|/ |