summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-1429=Corey Hulen2016-02-031-1/+2
|\
| * Clear the password input boxes when user enter incorrect Retype New Password.Khoa, Le Ngoc2016-02-031-1/+2
* | Adding loc to front-end=Corey Hulen2016-02-022-51/+269
* | Fixing merge=Corey Hulen2016-02-0114-234/+1199
|\|
| * PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-311-14/+6
| * PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-3014-234/+1207
* | merging=Corey Hulen2016-01-224-6/+153
|\|
| * 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
| |\
| | * 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 for constructing messagegirish@cloudron.io2016-01-191-1/+1
| | * Check auth_service to describe user login messagegirish@cloudron.io2016-01-191-1/+1
* | | merging=Corey Hulen2016-01-151-3/+3
|\| |
| * | Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
| |\ \ | | |/ | |/|
| | * Encode url query properly for SSO switchingJoramWilander2016-01-141-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 away icon and changing online and offline iconsAsaad Mahmood2016-01-111-0/+1
| |/
* / Adding UI=Corey Hulen2016-01-112-0/+295
|/
* Fixed issue where font would remain changed even after cancelling changesReed Garmsen2016-01-041-7/+13
* Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-041-114/+209
|\
| * Add ability to switch between SSO and email accountJoramWilander2015-12-171-114/+209
* | Made links in help text open in a new tabReed Garmsen2016-01-042-2/+16
* | Merge pull request #1785 from mattermost/plt-1492Corey Hulen2016-01-041-11/+14
|\ \
| * | Fix default for teammate name display settingJoramWilander2015-12-281-11/+14
* | | Fix appearance settings scroll bugJoramWilander2015-12-281-3/+6
|/ /
* / Multiple UI ImprovementsAsaad Mahmood2015-12-181-1/+1
|/
* Merge pull request #1733 from hmhealey/plt1437Christopher Speller2015-12-161-1/+1
|\
| * Improved PreferenceStore api when getting valueshmhealey2015-12-151-1/+1
* | Multiple UI ImprovementsAsaad Mahmood2015-12-151-1/+1
* | Merge pull request #1729 from hmhealey/plt886Joram Wilander2015-12-151-0/+4
|\ \ | |/ |/|
| * Added serverside file size check for post attachmentshmhealey2015-12-151-1/+0
| * Added clientside check for profile image sizehmhealey2015-12-141-0/+5
* | Merge pull request #1727 from mattermost/plt-1481Christopher Speller2015-12-151-2/+11
|\ \
| * | Force all colorpickers to update after theme pasted inJoramWilander2015-12-141-2/+11
| |/
* | Merge pull request #1711 from asaadmahmoodspin/code-themesCorey Hulen2015-12-141-0/+22
|\ \ | |/ |/|
| * Multiple UI ImprovementsAsaad Mahmood2015-12-111-0/+22
* | Merge pull request #1690 from npcode/trim-outgoing-callback-urlHarrison Healey2015-12-141-1/+1
|\ \
| * | Trim callback urls for outgoing webhooksYi EungJun2015-12-121-1/+1
* | | No longer errors upon saving the same info in Account Settings -> GeneralReed Garmsen2015-12-111-7/+8
| |/ |/|
* | Fixed issue with Team Settings modal saving items instead of cancelling; chan...Reed Garmsen2015-12-101-1/+1
* | Multiple UI ImprovementsAsaad Mahmood2015-12-072-2/+4
* | Merge pull request #1626 from mattermost/PLT-1355Corey Hulen2015-12-041-1/+1
|\ \
| * | PLT-1355 Move link preview into pre-release feature=Corey Hulen2015-12-041-1/+1
* | | Updating UI for suggestions listAsaad Mahmood2015-12-041-9/+13
* | | Multiple UI ImprovementsAsaad Mahmood2015-12-042-14/+10
|/ /
* | reorder display settings; remove 'button thingy' in font optionsFlorian Orben2015-12-041-6/+3