Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added default direct channels for previously existing users | hmhealey | 2015-10-13 | 2 | -29/+45 |
| | |||||
* | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 9 | -26/+34 |
| | |||||
* | Made direct channels visible when receiving a message on one | hmhealey | 2015-10-13 | 1 | -0/+12 |
| | |||||
* | Re-added default direct channels for new users | hmhealey | 2015-10-13 | 1 | -0/+42 |
| | |||||
* | Changed direct messages channels so users can show/hide them | hmhealey | 2015-10-13 | 5 | -164/+143 |
| | |||||
* | Changed direct channels in the sidebar to be displayed based on user preferences | hmhealey | 2015-10-13 | 5 | -37/+308 |
| | |||||
* | Added api to get and set preferences | hmhealey | 2015-10-13 | 5 | -0/+278 |
| | |||||
* | Added Preferences table to store user preferences | hmhealey | 2015-10-13 | 5 | -13/+325 |
| | |||||
* | Added model class for user preferences object | hmhealey | 2015-10-13 | 2 | -0/+136 |
| | |||||
* | Merge pull request #1007 from florianorben/PLT-486 | Joram Wilander | 2015-10-13 | 14 | -0/+19 |
|\ | | | | | PLT-486: Remove spell check feature from input boxes during signup flow | ||||
| * | PLT-486: Remove spell check feature from input boxes during signup flow | Florian Orben | 2015-10-12 | 14 | -0/+19 |
| | | | | | | | | Add spellcheck="false" attribute to login and signup form inputs | ||||
* | | Merge pull request #987 from hmhealey/plt521 | Joram Wilander | 2015-10-13 | 2 | -8/+39 |
|\ \ | | | | | | | PLT-521 Modified markdown lexer to not break up words written in snake_case | ||||
| * | | Modified markdown lexer to not break up words written in snake_case | hmhealey | 2015-10-09 | 2 | -8/+39 |
| | | | |||||
* | | | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-13 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Updating dockerfile for release v1.1.0-rc2 | Christopher Speller | 2015-10-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1025 from mattermost/PLT-596 | Christopher Speller | 2015-10-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | PLT-596 - Update to email verification title | ||||
| | * | | | PLT-596 - Update to email verification title | it33 | 2015-10-12 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1013 from optimistiks/PLT-590 | Joram Wilander | 2015-10-13 | 5 | -8/+8 |
|\ \ \ \ | | | | | | | | | | | PLT-590: Change "Manage Team" to "Manage Members" | ||||
| * \ \ \ | Merge branch 'master' into PLT-590 | Maxim | 2015-10-13 | 42 | -132/+533 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1024 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 0 | -0/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | Merging docs Release 1.1.0rc | ||||
| * | | | | Merge pull request #1023 from mattermost/fix-config | Corey Hulen | 2015-10-12 | 1 | -111/+96 |
| |\ \ \ \ | | | | | | | | | | | | | Fixing document | ||||
| | * | | | | Fixing document | =Corey Hulen | 2015-10-12 | 1 | -111/+96 |
| |/ / / / | |||||
* | | | | | Update Configuration-Settings.md | it33 | 2015-10-12 | 1 | -72/+72 |
| | | | | | | | | | | | | | | | Adjusting format so variables are on their own line | ||||
* | | | | | Update Configuration-Settings.md | it33 | 2015-10-12 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | Minor corrections | ||||
* | | | | | Update Configuration-Settings.md | it33 | 2015-10-12 | 1 | -36/+22 |
| |_|_|/ |/| | | | | | | | Clarifying config.json settings not in System Console and updating formatting. | ||||
* | | | | Merge pull request #1022 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 16 | -77/+453 |
|\| | | | | | | | | | | | Release 1.1.0rc merging to master | ||||
| * | | | Merge pull request #997 from mattermost/PLT-586 | Corey Hulen | 2015-10-12 | 14 | -76/+135 |
| |\ \ \ | | | | | | | | | | | PLT-586 fixing issues with security alert | ||||
| | * \ \ | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -1/+1 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #999 from rgarmsen2295/plt-610 | Corey Hulen | 2015-10-12 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-610 Fix broken image in change email verification email | ||||
| | * | | | | Replaced change email verification email logo image with a static link | Reed Garmsen | 2015-10-09 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #1020 from mattermost/config-fix | Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Adding new config documentation | ||||
| | * | | | | | Adding new config documentation | =Corey Hulen | 2015-10-12 | 1 | -0/+317 |
| |/ / / / / | |||||
| | | * | | | Fixing break | =Corey Hulen | 2015-10-12 | 1 | -2/+0 |
| | | | | | | |||||
| | | * | | | Removing offical build check | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 14 | -74/+135 |
| | |/ / / | |||||
* | | | | | Merge pull request #1018 from asaadmahmoodspin/ui-fixes | Corey Hulen | 2015-10-12 | 11 | -25/+53 |
|\ \ \ \ \ | | | | | | | | | | | | | Other UI Improvements | ||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes | Asaad Mahmood | 2015-10-12 | 10 | -22/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Removing padding from post comment cell in RHS | Asaad Mahmood | 2015-10-12 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Other UI Improvements | Asaad Mahmood | 2015-10-12 | 10 | -25/+50 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1015 from mattermost/trouble-shooting-tip | Corey Hulen | 2015-10-12 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adding troubleshooting tip | ||||
| * | | | | | | | Merge branch 'master' into trouble-shooting-tip | Joram Wilander | 2015-10-12 | 1 | -2/+1 |
| |\| | | | | | | |||||
| * | | | | | | | Adding troubleshooting tip | it33 | 2015-10-12 | 1 | -0/+14 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1009 from mattermost/update-help-text | Corey Hulen | 2015-10-12 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Updating help text | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into update-help-text | Joram Wilander | 2015-10-12 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Update get_link_modal.jsx | it33 | 2015-10-11 | 1 | -1/+0 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options | ||||
* | | | | | | | | Merge pull request #994 from mattermost/mkdocs-strict | Corey Hulen | 2015-10-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Turning on strict mode for mkdocs | ||||
| * | | | | | | | | Turning on strict mode for mkdocs | Christopher Speller | 2015-10-09 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #992 from mattermost/fast-obvious-forgiving | Corey Hulen | 2015-10-12 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Adding link to "Fast, Obvious, Forgiving" |