Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implemented ChannelMember.MarkUnreadLevel so that it actually functions | hmhealey | 2015-09-30 | 2 | -2/+2 |
| | |||||
* | Added additional test cases and fixed existing ones for ↵ | hmhealey | 2015-09-30 | 5 | -0/+119 |
| | | | | ChannelMember.MarkUnreadLevel | ||||
* | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 6 | -115/+244 |
| | | | | unread in the sidebar | ||||
* | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 5 | -39/+65 |
| | | | | user's notification level | ||||
* | Added slight delay to TestEchoCommand to account for race condition | hmhealey | 2015-09-30 | 1 | -0/+3 |
| | |||||
* | Merge pull request #875 from mattermost/rhs-scroll-fix | Joram Wilander | 2015-09-30 | 1 | -2/+2 |
|\ | | | | | Fix RHS scrolling center pane. | ||||
| * | Fix RHS scrolling center pane. | JoramWilander | 2015-09-30 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #863 from mattermost/PLT-475 | Christopher Speller | 2015-09-30 | 1 | -1/+1 |
|\ \ | |/ |/| | PLT-475 making sure session is properly removed | ||||
| * | PLT-475 making sure session is properly removed | =Corey Hulen | 2015-09-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #865 from mattermost/PLT-404 | Harrison Healey | 2015-09-29 | 8 | -32/+114 |
|\ \ | | | | | | | PLT-404 adding basic error checking to config file. | ||||
| * | | PLT-404 adding basic error checking to config file. | =Corey Hulen | 2015-09-29 | 8 | -32/+114 |
| |/ | |||||
* | | Merge pull request #862 from mattermost/PLT-435 | Joram Wilander | 2015-09-29 | 3 | -1/+24 |
|\ \ | | | | | | | PLT-435 adding system console link to RHS | ||||
| * | | PLT-435 adding system console link to RHS | =Corey Hulen | 2015-09-29 | 3 | -1/+24 |
| |/ | |||||
* | | Merge pull request #864 from esethna/patch-3 | Harrison Healey | 2015-09-29 | 1 | -1/+1 |
|\ \ | | | | | | | Update email notification help text | ||||
| * | | Update email notification help text | esethna | 2015-09-29 | 1 | -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-470 | Harrison Healey | 2015-09-29 | 2 | -1/+23 |
|\ \ | | | | | | | PLT-470 Adding STMP server connection check | ||||
| * | | PLT-470 Adding STMP server connection check | =Corey Hulen | 2015-09-29 | 2 | -1/+23 |
| | | | |||||
* | | | Merge pull request #861 from mattermost/PLT-469 | Harrison Healey | 2015-09-29 | 1 | -1/+4 |
|\ \ \ | |_|/ |/| | | PLT-469 skip redirect if verified email required. | ||||
| * | | PLT-469 skip redirect if verified email required. | =Corey Hulen | 2015-09-29 | 1 | -1/+4 |
| | | | |||||
* | | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-29 | 21 | -406/+313 |
|\ \ \ | |||||
| * \ \ | Merge pull request #856 from asaadmahmoodspin/bugfix | Corey Hulen | 2015-09-29 | 3 | -15/+6 |
| |\ \ \ | | | | | | | | | | | PLT-465 - Fixing RHS header back button search icon etc | ||||
| | * | | | Removing command styles | Asaad Mahmood | 2015-09-29 | 1 | -5/+4 |
| | | | | | |||||
| | * | | | Removing mentions changes since they're for a master | Asaad Mahmood | 2015-09-29 | 1 | -3/+0 |
| | | | | | |||||
| | * | | | Updating placeholder text in responsive | Asaad Mahmood | 2015-09-29 | 3 | -19/+14 |
| |/ / / | |||||
| * | | | Adding link to production install | it33 | 2015-09-29 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge pull request #853 from mattermost/PLT-28 | Corey Hulen | 2015-09-29 | 1 | -0/+187 |
| |\ \ \ | | | | | | | | | | | Plt 28 | ||||
| | * | | | Fixing typos | =Corey Hulen | 2015-09-29 | 1 | -37/+37 |
| | | | | | |||||
| | * | | | Fixing formatting | =Corey Hulen | 2015-09-28 | 1 | -14/+17 |
| | | | | | |||||
| | * | | | Finishing directions | =Corey Hulen | 2015-09-28 | 1 | -53/+67 |
| | | | | | |||||
| | * | | | PLT-28 working on production setup doc | =Corey Hulen | 2015-09-28 | 1 | -0/+170 |
| | | | | | |||||
| * | | | | Merge pull request #841 from hmhealey/plt456b | Corey Hulen | 2015-09-28 | 1 | -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 header | hmhealey | 2015-09-28 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #838 from mattermost/email-image-fix | Joram Wilander | 2015-09-28 | 1 | -2/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Fix images in welcome email. | ||||
| | * | | | | 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 |