Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Show/hide integrations properly based off config settings. | JoramWilander | 2015-10-19 | 2 | -51/+55 |
| | |||||
* | Fix postgres query and minor UI updates for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -9/+6 |
| | |||||
* | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -4/+302 |
| | |||||
* | Fixing some client warnings | Christopher Speller | 2015-10-16 | 3 | -57/+39 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' into PLT-637 | Stas Vovk | 2015-10-16 | 5 | -12/+12 |
|\ | | | | | | | | | Conflicts: web/react/utils/constants.jsx | ||||
| * | Fixing most deprication warnings | Christopher Speller | 2015-10-15 | 5 | -12/+12 |
| | | |||||
* | | added file with display settings | Stas Vovk | 2015-10-14 | 1 | -0/+168 |
| | | |||||
* | | added display tab under account settings. added 24h time option | Stas Vovk | 2015-10-14 | 2 | -0/+13 |
|/ | |||||
* | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-14 | 2 | -11/+12 |
|\ | |||||
| * | Fix webhook name not overriding in LHS and update webhook help text. | JoramWilander | 2015-10-13 | 1 | -1/+2 |
| | | |||||
| * | Fixing user settings dialog so it desn't ask you to check your email unless ↵ | Christopher Speller | 2015-10-13 | 1 | -10/+10 |
| | | | | | | | | you changed it | ||||
* | | Multiple Ui Improvements | Asaad Mahmood | 2015-10-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1018 from asaadmahmoodspin/ui-fixes | Corey Hulen | 2015-10-12 | 1 | -0/+2 |
|\ \ | | | | | | | Other UI Improvements | ||||
| * | | Other UI Improvements | Asaad Mahmood | 2015-10-12 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'master' into typos | Joram Wilander | 2015-10-12 | 2 | -2/+2 |
|\| | |||||
| * | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Update user_settings_integrations.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
* | | Fixed typos | it33 | 2015-10-08 | 1 | -2/+1 |
|/ | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username" | ||||
* | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 12 | -12/+12 |
| | |||||
* | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 1 | -7/+62 |
|\ | | | | | PLT-112 Improves email change verification process | ||||
| * | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 1 | -20/+12 |
| | | |||||
| * | Added better verification when a user changes his or her email | Reed Garmsen | 2015-10-05 | 1 | -5/+32 |
| | | |||||
| * | Initial cosmetic changes to the process of verifying a changed email | Reed Garmsen | 2015-10-05 | 1 | -5/+41 |
| | | |||||
* | | Merge pull request #952 from tomitm/PLT-445 | Harrison Healey | 2015-10-08 | 1 | -11/+0 |
|\ \ | | | | | | | PLT-445 Create About dialog | ||||
| * | | PLT-445 Create About dialog | Tomi M | 2015-10-06 | 1 | -11/+0 |
| | | | |||||
* | | | Merge pull request #953 from asaadmahmoodspin/plt-522 | Christopher Speller | 2015-10-07 | 1 | -7/+7 |
|\ \ \ | | | | | | | | | PLT-522 - Adding option for mentionHighlightLink for themes | ||||
| * | | | PLT-522 - Adding option for mentionHighlightLink for themes | Asaad Mahmood | 2015-10-07 | 1 | -7/+7 |
| |/ / | |||||
* / / | Removing sidebar text hover color | Asaad Mahmood | 2015-10-06 | 1 | -1/+0 |
|/ / | |||||
* / | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 1 | -1/+3 |
|/ | |||||
* | Updating jpg to png for theme names | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-02 | 3 | -9/+10 |
|\ | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx | ||||
| * | Merge pull request #909 from mattermost/plt-446 | Harrison Healey | 2015-10-02 | 1 | -0/+2 |
| |\ | | | | | | | PLT-446 Added help text to incoming webhooks. | ||||
| | * | Added help text for incoming webhooks. | JoramWilander | 2015-10-02 | 1 | -0/+2 |
| | | | |||||
| * | | Change text to avoid confusion with Slack Import | it33 | 2015-10-02 | 1 | -1/+1 |
| | | | |||||
| * | | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 1 | -1/+1 |
| |/ | | | | | | | user's notification level | ||||
* / | pot-375 - Making modals compatible with themes | Asaad Mahmood | 2015-10-01 | 2 | -9/+10 |
|/ | |||||
* | 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 #848 from mattermost/plt-488 | Corey Hulen | 2015-09-29 | 1 | -7/+9 |
|\ | | | | | PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads. | ||||
| * | Update incoming webhooks to hide DMs and accept direct JSON payloads. | JoramWilander | 2015-09-29 | 1 | -7/+9 |
| | | |||||
* | | Fixing quotes | it33 | 2015-09-28 | 1 | -1/+1 |
|/ | |||||
* | plt-366 - Adding Windows 8 theme | Asaad Mahmood | 2015-09-25 | 1 | -1/+1 |
| | |||||
* | Fix acconut settings being scrolled to bottom when opened. | JoramWilander | 2015-09-25 | 1 | -0/+2 |
| | |||||
* | plt-298 - Improving UI for webhooks | Asaad Mahmood | 2015-09-24 | 1 | -34/+31 |
| | |||||
* | Added help text to notification settings to say which browsers support them | hmhealey | 2015-09-24 | 1 | -0/+6 |
| | |||||
* | Merge pull request #771 from rgarmsen2295/plt-143 | Harrison Healey | 2015-09-24 | 2 | -3/+9 |
|\ | | | | | PLT-143 Support for text drag and drop | ||||
| * | Small fix for react key warning | Reed Garmsen | 2015-09-23 | 2 | -3/+9 |
| | | |||||
* | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 7 | -109/+504 |
|\| | |||||
| * | Fix theme images 404ing. | JoramWilander | 2015-09-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #759 from mattermost/plt-242-3 | Harrison Healey | 2015-09-23 | 6 | -106/+501 |
| |\ | | | | | | | PLT-242 Implement custom UI theme colors. |