summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings.jsx
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #118 from nickago/MM-1363Joram Wilander2015-07-021-3/+10
|\
| * Changed ordering of steps for upload to imporve astheticnickago2015-07-011-2/+4
| * Restricted profile picture uploads to just JPEGsnickago2015-07-011-1/+6
* | Facelifted "direct message" to "private message"nickago2015-07-011-3/+3
|/
* added team-wide and channel-wide mentionsJoramWilander2015-06-291-5/+42
* Updating settings UIAsaad Mahmood2015-06-281-15/+15
* Merge pull request #8 from rgarmsen2295/mm-1097Corey Hulen2015-06-251-2/+3
|\
| * Simplified hour conversion logicReed Garmsen2015-06-151-2/+1
| * Changed format of the time in the security tab to a 12hr clock from a 24hr clockReed Garmsen2015-06-151-2/+4
| * fix typoJoramWilander2015-06-151-1/+1
| * fixes mm-1237 remove sessions and activity log from account settingsJoramWilander2015-06-151-0/+5
| * first commit=Corey Hulen2015-06-141-0/+1151
* Changed "Theme Color Option" to "Theme Color"it332015-06-181-2/+2
* Update "Theme" to "Theme Color Options" it332015-06-181-2/+2
* fix typoJoramWilander2015-06-151-1/+1
* fixes mm-1237 remove sessions and activity log from account settingsJoramWilander2015-06-151-0/+5
* first commit=Corey Hulen2015-06-141-0/+1151