Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Fix images in welcome email. | JoramWilander | 2015-09-28 | 1 | -2/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #836 from mattermost/fix-gitlab | Christopher Speller | 2015-09-28 | 1 | -20/+20 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Fixing gitlab settings in admin console | |||||
| | * | | | | | Fixing gitlab settings in admin console | =Corey Hulen | 2015-09-28 | 1 | -20/+20 | |
| |/ / / / / | ||||||
| * | | | | | Fixing Dockerrun.aws.zip file | Christopher Speller | 2015-09-28 | 1 | -0/+0 | |
| | | | | | | ||||||
| * | | | | | Fixing version unit test | Christopher Speller | 2015-09-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Updating dockerfiles and version.go | Christopher Speller | 2015-09-28 | 13 | -369/+94 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #857 from mattermost/PLT-429 | Harrison Healey | 2015-09-29 | 1 | -33/+34 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-429, PLT-483, PLT-472 fixes to Gitlab settings page | |||||
| * | | | | PLT-472 switching field ordering. | =Corey Hulen | 2015-09-29 | 1 | -13/+14 | |
| | | | | | ||||||
| * | | | | PLT-429 removing scope field. | =Corey Hulen | 2015-09-29 | 1 | -23/+23 | |
| | | | | | ||||||
| * | | | | PLT-483 adding better help text | =Corey Hulen | 2015-09-29 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #858 from mattermost/PLT-425 | Joram Wilander | 2015-09-29 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-425 changing wording | |||||
| * | | | | PLT-425 changing wording | =Corey Hulen | 2015-09-29 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #848 from mattermost/plt-488 | Corey Hulen | 2015-09-29 | 7 | -14/+27 | |
|\ \ \ \ | |/ / / |/| | | | PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads. | |||||
| * | | | Turn on incoming webhooks by default in the docker configs. | JoramWilander | 2015-09-29 | 2 | -4/+4 | |
| | | | | ||||||
| * | | | Update incoming webhooks to hide DMs and accept direct JSON payloads. | JoramWilander | 2015-09-29 | 5 | -10/+23 | |
| | | | | ||||||
* | | | | Merge pull request #854 from justyns/gh842-invalid-join-url | Christopher Speller | 2015-09-29 | 2 | -3/+4 | |
|\ \ \ \ | | | | | | | | | | | Update the /join command to use the correct redirect URL | |||||
| * | | | | Update the /join command to use the correct redirect URL, and update the ↵ | Justyn Shull | 2015-09-29 | 2 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | test to match | |||||
* | | | | | Merge pull request #843 from rgarmsen2295/plt-138 | Corey Hulen | 2015-09-29 | 5 | -24/+13 | |
|\ \ \ \ \ | |/ / / / |/| | | | | PLT-138 Better parsing of the site's title when viewing a channel | |||||
| * | | | | Removed unused title update code | Reed Garmsen | 2015-09-29 | 4 | -19/+3 | |
| | | | | | ||||||
| * | | | | Better parsing of the website's title when viewing a channel | Reed Garmsen | 2015-09-28 | 1 | -5/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #832 from hmhealey/plt269 | Corey Hulen | 2015-09-29 | 1 | -5/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-269 Update Mac developer setup to use Docker Toolbox | |||||
| * | | | | | Update Mac developer setup to use Docker Toolbox | Harrison Healey | 2015-09-28 | 1 | -5/+6 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #851 from asaadmahmoodspin/plt-479 | Christopher Speller | 2015-09-29 | 3 | -10/+23 | |
|\ \ \ \ \ | | | | | | | | | | | | | plt-479 - Fixing command lists and also making them theme compatible | |||||
| * | | | | | plt-479 - Fixing command lists and also making them theme compatible | Asaad Mahmood | 2015-09-29 | 3 | -10/+23 | |
|/ / / / / | ||||||
| | | | * | Updating stuff with states in slack import | Asaad Mahmood | 2015-09-29 | 1 | -27/+48 | |
| | | | | | ||||||
| | | | * | Updating class with setState | Asaad Mahmood | 2015-09-29 | 1 | -8/+16 | |
| | | | | | ||||||
| | | | * | plt-383 - Slack upload improvement | Asaad Mahmood | 2015-09-29 | 1 | -1/+3 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #845 from trashcan/fix-autocomplete-suggestion | Joram Wilander | 2015-09-29 | 1 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | Add pull-left and pull-right to autocomplete command suggestions. | |||||
| * | | | | Add pull-left and pull-right to autocomplete command suggestions. | Pat Lathem | 2015-09-28 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #850 from mattermost/sso-fix | Harrison Healey | 2015-09-29 | 1 | -1/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing some SSO error messages. | |||||
| * | | | | | Fixing some SSO errors | Christopher Speller | 2015-09-29 | 1 | -1/+4 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #846 from mattermost/Fixing-Quotes | Christopher Speller | 2015-09-29 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing quotes | |||||
| * | | | | | Fixing quotes | it33 | 2015-09-28 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #833 from mattermost/plt-417 | Christopher Speller | 2015-09-29 | 2 | -9/+30 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-417 Fix scrolling related to RHS. | |||||
| * | | | | | Fix scrolling related to RHS. | JoramWilander | 2015-09-29 | 2 | -9/+30 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #830 from mattermost/youtube-scroll-fix | Christopher Speller | 2015-09-29 | 2 | -158/+121 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix youtube minor scrolling bug. | |||||
| * | | | | Fix youtube minor scrolling bug. | JoramWilander | 2015-09-28 | 2 | -158/+121 | |
| |/ / / | ||||||
* | | | | Merge pull request #818 from rgarmsen2295/plt-216 | Joram Wilander | 2015-09-28 | 2 | -10/+18 | |
|\ \ \ \ | |_|/ / |/| | | | PLT-216 Inactive members are no longer counted, nor shown, as members of a channel | |||||
| * | | | Inactive members are no longer counted or shown as members of a channel | Reed Garmsen | 2015-09-28 | 2 | -10/+18 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #840 from mattermost/plt-361 | Corey Hulen | 2015-09-28 | 1 | -0/+57 | |
|\ \ \ | | | | | | | | | PLT-361 Added documentation for incoming webhooks. | |||||
| * | | | Added documentation for incoming webhooks. | JoramWilander | 2015-09-28 | 1 | -0/+57 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #839 from mattermost/revoke-token | Corey Hulen | 2015-09-28 | 1 | -4/+8 | |
|\ \ \ | |_|/ |/| | | Properly revoke OAuth sessions when revoking all user sessions. | |||||
| * | | Properly revoke OAuth sessions when revoking all user sessions. | JoramWilander | 2015-09-28 | 1 | -4/+8 | |
| | | | ||||||
* | | | Merge pull request #750 from driou/master | Joram Wilander | 2015-09-28 | 0 | -0/+0 | |
|\ \ \ | | | | | | | | | Little mistake in the Readme. | |||||
| * \ \ | Merge pull request #1 from driou/driou-patch-1 | Adrien Bourroux | 2015-09-22 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Update README.md | |||||
| | * | | | Update README.md | Adrien Bourroux | 2015-09-22 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Update CHANGELOG.md | it33 | 2015-09-28 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Update CHANGELOG.md | it33 | 2015-09-28 | 1 | -2/+10 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #772 from jdeng/imaging_fix | Harrison Healey | 2015-09-28 | 64 | -5439/+3680 | |
|\ \ \ | | | | | | | | | use github.com/disintegration/imaging | |||||
| * \ \ | rebase | Jack | 2015-09-28 | 106 | -1041/+2363 | |
| |\ \ \ | |/ / / |/| | | |