summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Expand)AuthorAgeFilesLines
* Converting to Webpack. Stage 1.Christopher Speller2016-03-1617-6171/+0
* Merge branch 'release-2.1'Christopher Speller2016-03-141-0/+2
|\
| * Fixing padding issueAsaad Mahmood2016-03-101-1/+0
| * Removing consoleAsaad Mahmood2016-03-101-1/+0
| * PLT-2138 - Fixing theme sharing boxAsaad Mahmood2016-03-101-0/+4
* | Convering client to react-router.Christopher Speller2016-03-145-18/+49
|/
* Multiple UI ImprovementsAsaad Mahmood2016-03-081-1/+1
* Multiple UI ImprovementsAsaad Mahmood2016-03-088-30/+44
* Removed injectIntl from UserSettingsDisplayHarrison Healey2016-03-031-60/+76
* Changed submit button of ManageLanguage to match other settingsHarrison Healey2016-03-032-31/+28
* Update manage_command_hooks.jsxEric Sethna2016-02-261-1/+1
* Update manage_outgoing_hooks.jsxEric Sethna2016-02-261-1/+1
* Update manage_incoming_hooks.jsxEric Sethna2016-02-261-1/+1
* Fix missing preview strings for a language showing up as the id not the defau...JoramWilander2016-02-261-2/+6
* Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067Elias Nahum2016-02-231-1/+1
* Merge pull request #2208 from mattermost/client-upgradesHarrison Healey2016-02-223-7/+13
|\
| * Updating some client deps + eslintChristopher Speller2016-02-223-7/+13
* | PLT-1800 Replace webhooks documentation URLNicolas Clerc2016-02-212-3/+3
|/
* Fixing custom theme header click eventAsaad Mahmood2016-02-151-2/+7
* Multiple UI ImprovementsAsaad Mahmood2016-02-152-9/+101
* 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
| |\
| | * 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
| |\ \
| | * | 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=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=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 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
|\
| * 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
|\
| * 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=Corey Hulen2016-02-051-14/+2
| |/
* | Merge pull request #2091 from rgarmsen2295/plt-1797Corey Hulen2016-02-051-0/+1
|\ \ | |/ |/|
| * Increased username max lengthReed Garmsen2016-02-051-0/+1
* | fix typosElias Nahum2016-02-041-2/+2