summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #771 from rgarmsen2295/plt-143Harrison Healey2015-09-242-3/+9
|\
| * 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
| |\
| | * Implement UI theme colors.JoramWilander2015-09-236-106/+501
| * | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-231-3/+3
| |/
* / Fixing merge conflict=Corey Hulen2015-09-222-2/+2
|/
* Implement incoming webhooks.JoramWilander2015-09-219-0/+2313