summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-296-77/+184
|\ | | | | | | ui-improvements
| * Merge pull request #1196 from florianorben/send-on-ctrlJoram Wilander2015-10-284-0/+183
| |\ | | | | | | allow messages to be send on ctrl+enter
| | * add new user-setting section 'advanced' and remove ctrl-send setting from ↵Florian Orben2015-10-284-87/+183
| | | | | | | | | | | | general tab
| | * allow messages to be send on ctrl+enterFlorian Orben2015-10-281-1/+88
| | |
| * | Revert "PLT-395: Add syntax highlighting to Markdown code blocks"Christopher Speller2015-10-282-77/+1
| |/
* | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-273-2/+78
|\| | | | | | | ui-improvements
| * Fixed file upload and profile picture upload error display to work for ↵hmhealey2015-10-261-1/+1
| | | | | | | | serverside errors
| * code style theme chooserFlorian Orben2015-10-242-1/+77
| |
* | Oauth UI Improvements and settings improvementAsaad Mahmood2015-10-232-0/+5
|/
* Multiple UI ImprovementsAsaad Mahmood2015-10-233-76/+87
|
* Merge pull request #1149 from mattermost/plt-808Christopher Speller2015-10-233-26/+62
|\ | | | | PLT-808 Fix deleting channels breaking the webhook UI
| * In webhooks UI handle error if channel can't be found, also use display name ↵JoramWilander2015-10-223-26/+62
| | | | | | | | over url name, plus warning fixes
* | Multi-session login=Corey Hulen2015-10-201-1/+1
| |
* | Fixing merge conflicts=Corey Hulen2015-10-193-27/+327
|\|
| * Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55
| |
| * Fix postgres query and minor UI updates for outgoing webhooks.JoramWilander2015-10-192-9/+6
| |
| * Implement outgoing webhooks.JoramWilander2015-10-192-4/+302
| |
* | Merging from master=Corey Hulen2015-10-193-57/+39
|\|
| * Fixing some client warningsChristopher Speller2015-10-163-57/+39
| |
* | Fixing merge=Corey Hulen2015-10-163-0/+181
|\|
| * Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-165-12/+12
| |\ | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx
| * | 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
| | |
* | | Inital support for multi-tab loging=Corey Hulen2015-10-163-6/+6
| |/ |/|
* | Fixing most deprication warningsChristopher Speller2015-10-155-12/+12
|/
* 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.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 05:56:12 +0000