summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/user_settings_modal.jsx
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge conflicts=Corey Hulen2015-10-191-1/+2
|\
| * Show/hide integrations properly based off config settings.JoramWilander2015-10-191-1/+1
* | Fixing merge=Corey Hulen2015-10-161-0/+1
|\|
| * added display tab under account settings. added 24h time optionStas Vovk2015-10-141-0/+1
* | Inital support for multi-tab loging=Corey Hulen2015-10-161-2/+2
|/
* Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-081-1/+1
* Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-231-1/+1
|\
| * Implement UI theme colors.JoramWilander2015-09-231-1/+1
* | Fixing merge conflict=Corey Hulen2015-09-221-1/+1
|/
* Implement incoming webhooks.JoramWilander2015-09-211-0/+96