summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #909 from mattermost/plt-446Harrison Healey2015-10-021-0/+2
|\ | | | | PLT-446 Added help text to incoming webhooks.
| * Added help text for incoming webhooks.JoramWilander2015-10-021-0/+2
| |
* | Change text to avoid confusion with Slack Importit332015-10-021-1/+1
| |
* | Added 'default' option to channel notification settings that just uses the ↵hmhealey2015-09-301-1/+1
|/ | | | user's notification level
* 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 #848 from mattermost/plt-488Corey Hulen2015-09-291-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.JoramWilander2015-09-291-7/+9
| |
* | Fixing quotesit332015-09-281-1/+1
|/
* plt-366 - Adding Windows 8 themeAsaad Mahmood2015-09-251-1/+1
|
* Fix acconut settings being scrolled to bottom when opened.JoramWilander2015-09-251-0/+2
|
* plt-298 - Improving UI for webhooksAsaad Mahmood2015-09-241-34/+31
|
* Added help text to notification settings to say which browsers support themhmhealey2015-09-241-0/+6
|
* Merge pull request #771 from rgarmsen2295/plt-143Harrison Healey2015-09-242-3/+9
|\ | | | | PLT-143 Support for text drag and drop
| * Small fix for react key warningReed Garmsen2015-09-232-3/+9
| |
* | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-237-109/+504
|\|
| * Fix theme images 404ing.JoramWilander2015-09-231-1/+1
| |
| * Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-236-106/+501
| |\ | | | | | | PLT-242 Implement custom UI theme colors.
| | * Implement UI theme colors.JoramWilander2015-09-236-106/+501
| | |
| * | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-231-3/+3
| |/ | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* / Fixing merge conflict=Corey Hulen2015-09-222-2/+2
|/
* Implement incoming webhooks.JoramWilander2015-09-219-0/+2313