summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-165-12/+12
|\ | | | | | | | | Conflicts: web/react/utils/constants.jsx
| * Fixing most deprication warningsChristopher Speller2015-10-155-12/+12
| |
* | added file with display settingsStas Vovk2015-10-141-0/+168
| |
* | added display tab under account settings. added 24h time optionStas Vovk2015-10-142-0/+13
|/
* Merge release branch 'release-1.1.0'Christopher Speller2015-10-142-11/+12
|\
| * Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-131-1/+2
| |
| * Fixing user settings dialog so it desn't ask you to check your email unless ↵Christopher Speller2015-10-131-10/+10
| | | | | | | | you changed it
* | Multiple Ui ImprovementsAsaad Mahmood2015-10-131-1/+1
| |
* | Merge pull request #1018 from asaadmahmoodspin/ui-fixesCorey Hulen2015-10-121-0/+2
|\ \ | | | | | | Other UI Improvements
| * | Other UI ImprovementsAsaad Mahmood2015-10-121-0/+2
| |/
* | Merge branch 'master' into typosJoram Wilander2015-10-122-2/+2
|\|
| * Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| |
| * Update user_settings_integrations.jsxit332015-10-091-1/+1
| |
| * Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| |
* | Fixed typosit332015-10-081-2/+1
|/ | | There was no space after "user name." before the next sentence. Also, "user name" should be "username"
* Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-0812-12/+12
|
* Merge pull request #931 from rgarmsen2295/plt-112Christopher Speller2015-10-081-7/+62
|\ | | | | PLT-112 Improves email change verification process
| * Added new email to email change notificationReed Garmsen2015-10-061-20/+12
| |
| * Added better verification when a user changes his or her emailReed Garmsen2015-10-051-5/+32
| |
| * Initial cosmetic changes to the process of verifying a changed emailReed Garmsen2015-10-051-5/+41
| |
* | Merge pull request #952 from tomitm/PLT-445Harrison Healey2015-10-081-11/+0
|\ \ | | | | | | PLT-445 Create About dialog
| * | PLT-445 Create About dialogTomi M2015-10-061-11/+0
| | |
* | | Merge pull request #953 from asaadmahmoodspin/plt-522Christopher Speller2015-10-071-7/+7
|\ \ \ | | | | | | | | PLT-522 - Adding option for mentionHighlightLink for themes
| * | | PLT-522 - Adding option for mentionHighlightLink for themesAsaad Mahmood2015-10-071-7/+7
| |/ /
* / / Removing sidebar text hover colorAsaad Mahmood2015-10-061-1/+0
|/ /
* / Multiple UI ImprovementsAsaad Mahmood2015-10-051-1/+3
|/
* Updating jpg to png for theme namesAsaad Mahmood2015-10-051-1/+1
|
* Merge branch 'master' of https://github.com/mattermost/platform into plt-375Asaad Mahmood2015-10-023-9/+10
|\ | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx
| * 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
* / pot-375 - Making modals compatible with themesAsaad Mahmood2015-10-012-9/+10
|/
* 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 06:13:30 +0000