Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #993 from apaatsio/bootstrap-help-block | Christopher Speller | 2015-10-14 | 5 | -9/+8 | |
|\ \ | | | | | | | Use help-block class from Bootstrap | |||||
| * | | Use help-block class from Bootstrap | Antti Ahti | 2015-10-09 | 5 | -9/+8 | |
| | | | | | | | | | | | | | | | | | | Use help-block class provided by Bootstrap instead of using a custom form__hint class. We still override some styles from the Bootstrap class, though. | |||||
* | | | Update SMTP-Email-Setup.md | it33 | 2015-10-13 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #1042 from hmhealey/plt322-followup | Joram Wilander | 2015-10-13 | 3 | -6/+17 | |
|\ \ \ | | | | | | | | | PLT-322 Fixed leave direct channel button for users with a long username | |||||
| * | | | Fixed leave direct channel button for users with a long username | hmhealey | 2015-10-13 | 3 | -6/+17 | |
| | | | | ||||||
* | | | | Merge pull request #1017 from stasvovk/PLT-589 | Joram Wilander | 2015-10-13 | 2 | -4/+8 | |
|\ \ \ \ | | | | | | | | | | | PLT-589: changed Admin to Team Admin in Manage Team members | |||||
| * \ \ \ | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-13 | 27 | -102/+491 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589 | Stas Vovk | 2015-10-13 | 6 | -6/+21 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-12 | 6 | -6/+21 | |
| | |\ \ \ \ \ | ||||||
| * | | | | | | | replaced constructions like user.roles === 'admin' by ↵ | Stas Vovk | 2015-10-13 | 2 | -4/+4 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Utils.isAdmin(user.roles) in manage members | |||||
| * | | | | | | changed Admin to Team Admin in admin console | Stas Vovk | 2015-10-12 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into PLT-589 | Stas Vovk | 2015-10-12 | 10 | -22/+20 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | changed Admin to Team Admin in Manage Team members | Stas Vovk | 2015-10-12 | 1 | -1/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1038 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-13 | 7 | -13/+40 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Multiple Ui Improvements | |||||
| * | | | | | | | | Multiple Ui Improvements | Asaad Mahmood | 2015-10-13 | 7 | -13/+40 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #968 from hmhealey/plt322 | Harrison Healey | 2015-10-13 | 17 | -148/+1260 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | PLT-322 Updated Direct Messages menu | |||||
| * | | | | | | | | Made further changes based on feedback | hmhealey | 2015-10-13 | 8 | -54/+56 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Removed Preference.AltId | hmhealey | 2015-10-13 | 15 | -166/+246 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Made structural changes to server-side Preference code based on feedback | hmhealey | 2015-10-13 | 9 | -362/+227 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Rewrote PreferenceStore.SaveOrUpdate to work on Postgres within a transaction | hmhealey | 2015-10-13 | 2 | -8/+57 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Cleaned up JSX errors | hmhealey | 2015-10-13 | 2 | -56/+51 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed edge cases with leaving a direct channel while viewing that channel | hmhealey | 2015-10-13 | 4 | -21/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Removed setting direct channels for a new user at creation time | hmhealey | 2015-10-13 | 2 | -50/+42 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Moved saving multiple user preferences into a database transaction | hmhealey | 2015-10-13 | 5 | -48/+144 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed preference tests | hmhealey | 2015-10-13 | 1 | -18/+7 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Hid the close button when the unread badge is visible and moved it to the ↵ | hmhealey | 2015-10-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right side of the sidebar | |||||
| * | | | | | | | | 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 #1034 from mattermost/PRs-to-master | Corey Hulen | 2015-10-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Clarifying PRs should go to master | |||||
| * | | | | | | | | | Update Code-Contribution-Guidelines.md | it33 | 2015-10-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Update Code-Contribution-Guidelines.md | it33 | 2015-10-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Clarifying PRs should go to master | it33 | 2015-10-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1030 from mattermost/Slack-import-UI-update | Christopher Speller | 2015-10-13 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Slack Import changing "Preview" label to "Beta" | |||||
| * | | | | | | | | | | Slack Import changing "Preview" label to "Beta" | it33 | 2015-10-13 | 1 | -3/+3 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1029 from mattermost/Slack-import-help-update | Christopher Speller | 2015-10-13 | 1 | -5/+9 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Update help text for Slack Import | |||||
| * | | | | | | | | | | Update help text for Slack Import | it33 | 2015-10-13 | 1 | -5/+9 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1037 from hmhealey/revert987 | Joram Wilander | 2015-10-13 | 2 | -39/+8 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Revert #987 | |||||
| * | | | | | | | | | | Revert "Modified markdown lexer to not break up words written in snake_case" | hmhealey | 2015-10-13 | 2 | -39/+8 | |
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7. | |||||
* | | | | | | | | | | Merge pull request #1039 from mattermost/incoming-doc | Joram Wilander | 2015-10-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Minor updates to incoming webhook documenatation | |||||
| * | | | | | | | | | Minor updates to incoming webhook documenatation | JoramWilander | 2015-10-13 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1027 from mattermost/check-https | Corey Hulen | 2015-10-13 | 3 | -13/+15 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Updating SSO help on HTTP/HTTPS | |||||
| * | | | | | | | | | | Update Configuration-Settings.md | it33 | 2015-10-13 | 1 | -5/+5 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Update gitlab_settings.jsx | it33 | 2015-10-13 | 1 | -3/+3 | |
| | | | | | | | | | | |