summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #862 from mattermost/PLT-435Joram Wilander2015-09-293-1/+24
|\ | | | | PLT-435 adding system console link to RHS
| * PLT-435 adding system console link to RHS=Corey Hulen2015-09-293-1/+24
| |
* | Merge pull request #864 from esethna/patch-3Harrison Healey2015-09-291-1/+1
|\ \ | | | | | | Update email notification help text
| * | Update email notification help textesethna2015-09-291-1/+1
| |/ | | | | | | Current: Email notifications are sent for mentions and direct messages after you have been away from Mattermost for 5 minutes. New: Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from Mattermost for more than 5 minutes.
* | Merge pull request #860 from mattermost/PLT-470Harrison Healey2015-09-292-1/+23
|\ \ | | | | | | PLT-470 Adding STMP server connection check
| * | PLT-470 Adding STMP server connection check=Corey Hulen2015-09-292-1/+23
| | |
* | | Merge pull request #861 from mattermost/PLT-469Harrison Healey2015-09-291-1/+4
|\ \ \ | |_|/ |/| | PLT-469 skip redirect if verified email required.
| * | PLT-469 skip redirect if verified email required.=Corey Hulen2015-09-291-1/+4
| | |
* | | Merge release branch 'release-1.0.0'Christopher Speller2015-09-2921-406/+313
|\ \ \
| * \ \ Merge pull request #856 from asaadmahmoodspin/bugfixCorey Hulen2015-09-293-15/+6
| |\ \ \ | | | | | | | | | | PLT-465 - Fixing RHS header back button search icon etc
| | * | | Removing command stylesAsaad Mahmood2015-09-291-5/+4
| | | | |
| | * | | Removing mentions changes since they're for a masterAsaad Mahmood2015-09-291-3/+0
| | | | |
| | * | | Updating placeholder text in responsiveAsaad Mahmood2015-09-293-19/+14
| |/ / /
| * | | Adding link to production installit332015-09-291-1/+3
| | | |
| * | | Merge pull request #853 from mattermost/PLT-28Corey Hulen2015-09-291-0/+187
| |\ \ \ | | | | | | | | | | Plt 28
| | * | | Fixing typos=Corey Hulen2015-09-291-37/+37
| | | | |
| | * | | Fixing formatting=Corey Hulen2015-09-281-14/+17
| | | | |
| | * | | Finishing directions=Corey Hulen2015-09-281-53/+67
| | | | |
| | * | | PLT-28 working on production setup doc=Corey Hulen2015-09-281-0/+170
| | | | |
| * | | | Merge pull request #841 from hmhealey/plt456bCorey Hulen2015-09-281-0/+1
| |\ \ \ \ | | | | | | | | | | | | PLT-456 Changed mobile search bar to use the colour of the sidebar header
| | * | | | Changed mobile search bar to use the colour of the sidebar headerhmhealey2015-09-281-0/+1
| | |/ / /
| * | | | Merge pull request #838 from mattermost/email-image-fixJoram Wilander2015-09-281-2/+3
| |\ \ \ \ | | | | | | | | | | | | Fix images in welcome email.
| | * | | | Fix images in welcome email.JoramWilander2015-09-281-2/+3
| | | | | |
| * | | | | Merge pull request #836 from mattermost/fix-gitlabChristopher Speller2015-09-281-20/+20
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fixing gitlab settings in admin console
| | * | | | Fixing gitlab settings in admin console=Corey Hulen2015-09-281-20/+20
| |/ / / /
| * | | | Fixing Dockerrun.aws.zip fileChristopher Speller2015-09-281-0/+0
| | | | |
| * | | | Fixing version unit testChristopher Speller2015-09-281-1/+1
| | | | |
| * | | | Updating dockerfiles and version.goChristopher Speller2015-09-2813-369/+94
| |/ / /
* | | | Merge pull request #857 from mattermost/PLT-429Harrison Healey2015-09-291-33/+34
|\ \ \ \ | |_|/ / |/| | | PLT-429, PLT-483, PLT-472 fixes to Gitlab settings page
| * | | PLT-472 switching field ordering.=Corey Hulen2015-09-291-13/+14
| | | |
| * | | PLT-429 removing scope field.=Corey Hulen2015-09-291-23/+23
| | | |
| * | | PLT-483 adding better help text=Corey Hulen2015-09-291-3/+3
| | | |
* | | | Merge pull request #858 from mattermost/PLT-425Joram Wilander2015-09-291-2/+2
|\ \ \ \ | |_|_|/ |/| | | PLT-425 changing wording
| * | | PLT-425 changing wording=Corey Hulen2015-09-291-2/+2
|/ / /
* | | Merge pull request #848 from mattermost/plt-488Corey Hulen2015-09-297-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.JoramWilander2015-09-292-4/+4
| | |
| * | Update incoming webhooks to hide DMs and accept direct JSON payloads.JoramWilander2015-09-295-10/+23
| | |
* | | Merge pull request #854 from justyns/gh842-invalid-join-urlChristopher Speller2015-09-292-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 Shull2015-09-292-3/+4
| | | | | | | | | | | | | | | | test to match
* | | | Merge pull request #843 from rgarmsen2295/plt-138Corey Hulen2015-09-295-24/+13
|\ \ \ \ | |/ / / |/| | | PLT-138 Better parsing of the site's title when viewing a channel
| * | | Removed unused title update codeReed Garmsen2015-09-294-19/+3
| | | |
| * | | Better parsing of the website's title when viewing a channelReed Garmsen2015-09-281-5/+10
| | | |
* | | | Merge pull request #832 from hmhealey/plt269Corey Hulen2015-09-291-5/+6
|\ \ \ \ | | | | | | | | | | PLT-269 Update Mac developer setup to use Docker Toolbox
| * | | | Update Mac developer setup to use Docker ToolboxHarrison Healey2015-09-281-5/+6
| | |_|/ | |/| |
* | | | Merge pull request #851 from asaadmahmoodspin/plt-479Christopher Speller2015-09-293-10/+23
|\ \ \ \ | | | | | | | | | | plt-479 - Fixing command lists and also making them theme compatible
| * | | | plt-479 - Fixing command lists and also making them theme compatibleAsaad Mahmood2015-09-293-10/+23
|/ / / /
* | | | Merge pull request #845 from trashcan/fix-autocomplete-suggestionJoram Wilander2015-09-291-3/+3
|\ \ \ \ | | | | | | | | | | Add pull-left and pull-right to autocomplete command suggestions.
| * | | | Add pull-left and pull-right to autocomplete command suggestions.Pat Lathem2015-09-281-3/+3
| | | | |
* | | | | Merge pull request #850 from mattermost/sso-fixHarrison Healey2015-09-291-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Fixing some SSO error messages.
| * | | | | Fixing some SSO errorsChristopher Speller2015-09-291-1/+4
| | |_|_|/ | |/| | |