summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2016-02-123-10/+21
|\
| * Merge pull request #2155 from ZBoxApp/PLT-1948Christopher Speller2016-02-111-5/+3
| |\ | | | | | | PLT-1948: Fix duplicate am/pm on last password update
| | * eslint no-shadow resolvedElias Nahum2016-02-111-1/+1
| | |
| | * Fix duplicate am/pm on last password updateElias Nahum2016-02-111-5/+3
| | |
| * | Merge pull request #2150 from ZBoxApp/PLT-1963Christopher Speller2016-02-111-4/+5
| |\ \ | | | | | | | | PLT-1963: Fixing intl console error on Outgoing webhook edit
| | * | Fixing intl console error on Outgoing webhook editElias Nahum2016-02-111-4/+5
| | |/
| * | Merge pull request #2145 from mattermost/PLT-1956Christopher Speller2016-02-111-1/+13
| |\ \ | | |/ | |/| PLT-1956 Infinite "Loading..." Animation for Webhooks/Slash Commands UI
| | * PLT-1956=Corey Hulen2016-02-101-1/+13
| | |
* | | Multiple UI ImprovementsAsaad Mahmood2016-02-111-1/+1
|/ /
* / Improving UI for slash commandsAsaad Mahmood2016-02-101-2/+2
|/
* Fix canceling themes when user has no themeJoramWilander2016-02-101-1/+4
|
* Merge pull request #2120 from mattermost/slash-helpChristopher Speller2016-02-092-127/+143
|\ | | | | Fixing slash command help
| * Fixing slash command help=Corey Hulen2016-02-092-127/+143
| |
* | Reset theme on close of settings modalJoramWilander2016-02-091-4/+9
|/
* Merge pull request #2113 from mattermost/slash-command-fixesChristopher Speller2016-02-091-1/+1
|\ | | | | Multiple minor slash command fixes
| * Multiple minor slash command fixesJoramWilander2016-02-091-1/+1
| |
* | Multiple UI ImprovementsAsaad Mahmood2016-02-091-3/+3
|/
* Fixing eslint error=Corey Hulen2016-02-081-1/+0
|
* PLT-1900 removing lang from preview and making spanish beta=Corey Hulen2016-02-082-42/+36
|
* Merge pull request #2101 from hmhealey/plt1415Christopher Speller2016-02-082-3/+3
|\ | | | | PLT-1415 Renamed RECIEVED_* to RECEIVED_*
| * Renamed RECIEVED_* to RECEIVED_*hmhealey2016-02-082-3/+3
| |
* | Multiple UI ImprovementsAsaad Mahmood2016-02-081-12/+14
|/
* Merge pull request #2089 from mattermost/plt-1205Joram Wilander2016-02-086-142/+151
|\ | | | | PLT-1205 Remove appearance settings tab and move theme management to display s…
| * Fix cancel bugJoramWilander2016-02-081-1/+3
| |
| * Remove appearance settings tab and move theme management to display settings tabJoramWilander2016-02-056-142/+149
| |
* | Merge pull request #2092 from mattermost/fix-slashChristopher Speller2016-02-081-14/+2
|\ \ | | | | | | Fixing slash commands
| * | Fixing slash commands=Corey Hulen2016-02-051-14/+2
| |/
* | Merge pull request #2091 from rgarmsen2295/plt-1797Corey Hulen2016-02-051-0/+1
|\ \ | |/ |/| PLT-1797 Increased username max length
| * Increased username max lengthReed Garmsen2016-02-051-0/+1
| |
* | fix typosElias Nahum2016-02-041-2/+2
| |
* | PLT-7: Fix and Add new loc stringsElias Nahum2016-02-042-6/+27
| |
* | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-042-0/+695
|\ \ | | | | | | PLT-1429 adding user created slash commands
| * | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-031-1/+2
| |\|
| * | Adding loc to front-end=Corey Hulen2016-02-022-51/+269
| | |
| * | Fixing merge=Corey Hulen2016-02-0114-234/+1199
| |\ \
| * \ \ merging=Corey Hulen2016-01-224-6/+153
| |\ \ \
| * \ \ \ merging=Corey Hulen2016-01-151-3/+3
| |\ \ \ \
| * | | | | finishing up commands UI=Corey Hulen2016-01-141-67/+249
| | | | | |
| * | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-141-0/+1
| |\ \ \ \ \
| * | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| | | | | | |
* | | | | | | Fixing loc error=Corey Hulen2016-02-031-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Clear the password input boxes when user enter incorrect Retype New Password.Khoa, Le Ngoc2016-02-031-1/+2
| |_|_|_|/ |/| | | |
* | | | | PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-311-14/+6
| | | | | | | | | | | | | | | | | | | | - Elegant way to include react Component into FormattedMessage
* | | | | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-3014-234/+1207
| |_|_|/ |/| | | | | | | | | | | - User settings
* | | | PLT-7 adding loc feature to preview=Corey Hulen2016-01-221-1/+0
| | | |
* | | | PLT-7 adding loc feature to preview=Corey Hulen2016-01-221-37/+39
| | | |
* | | | PLT-7 adding lang selector=Corey Hulen2016-01-223-0/+146
| | | |
* | | | Merge pull request #1927 from rgarmsen2295/plt-1668Christopher Speller2016-01-212-4/+4
|\ \ \ \ | | | | | | | | | | PLT-1668 Removes duplicate short username error message
| * | | | Removed extraneous error when providing a short usernameReed Garmsen2016-01-202-4/+4
| | |_|/ | |/| |
* | | | Merge pull request #1922 from cloudron-io/check_auth_serviceHarrison Healey2016-01-211-2/+2
|\ \ \ \ | |/ / / |/| | | Check auth_service when constructing messages
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 09:32:32 +0000