Asaad Mahmood
e7d7892fd7
Multiple UI Improvements
2015-10-05 22:32:26 +05:00
Asaad Mahmood
fef9947757
Updating jpg to png for theme names
2015-10-05 06:34:35 +05:00
Asaad Mahmood
d8c5c4f746
Merge branch 'master' of https://github.com/mattermost/platform into plt-375
...
Conflicts:
web/react/components/user_settings/user_settings_appearance.jsx
2015-10-02 22:26:28 +05:00
Harrison Healey
2f60ab82a8
Merge pull request #909 from mattermost/plt-446
...
PLT-446 Added help text to incoming webhooks.
2015-10-02 09:50:15 -04:00
it33
95fe16e0d9
Change text to avoid confusion with Slack Import
2015-10-02 06:23:26 -07:00
JoramWilander
28e84f1d13
Added help text for incoming webhooks.
2015-10-02 09:18:19 -04:00
Asaad Mahmood
813792dd60
pot-375 - Making modals compatible with themes
2015-10-01 09:33:21 +05:00
hmhealey
4bc625e8d1
Added 'default' option to channel notification settings that just uses the user's notification level
2015-09-30 09:59:58 -04:00
esethna
ce0827f985
Update email notification help text
...
Current: Email notifications are sent for mentions and direct messages after you have been away from Mattermost for 5 minutes.
New: Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from Mattermost for more than 5 minutes.
2015-09-29 14:40:43 -06:00
Corey Hulen
e937beb51b
Merge pull request #848 from mattermost/plt-488
...
PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads.
2015-09-29 11:31:54 -07:00
JoramWilander
a9f5918a9d
Update incoming webhooks to hide DMs and accept direct JSON payloads.
2015-09-29 08:38:26 -04:00
it33
0d48bf778b
Fixing quotes
2015-09-28 23:47:14 -07:00
Asaad Mahmood
9d1dddb7f4
plt-366 - Adding Windows 8 theme
2015-09-25 22:44:36 +05:00
JoramWilander
b03d8610de
Fix acconut settings being scrolled to bottom when opened.
2015-09-25 08:43:06 -04:00
Asaad Mahmood
1ca84a8f8a
plt-298 - Improving UI for webhooks
2015-09-24 21:05:21 +05:00
hmhealey
a59f8def8c
Added help text to notification settings to say which browsers support them
2015-09-24 10:58:49 -04:00
Harrison Healey
4f371254c6
Merge pull request #771 from rgarmsen2295/plt-143
...
PLT-143 Support for text drag and drop
2015-09-24 09:17:59 -04:00
Reed Garmsen
ea0dcb4421
Small fix for react key warning
2015-09-23 13:36:41 -07:00
=Corey Hulen
2b5b8f95ed
Merge branch 'master' into PLT-11-email
2015-09-23 12:55:58 -07:00
JoramWilander
e79e66c0a4
Fix theme images 404ing.
2015-09-23 15:29:39 -04:00
Harrison Healey
15f15de8ca
Merge pull request #759 from mattermost/plt-242-3
...
PLT-242 Implement custom UI theme colors.
2015-09-23 15:04:22 -04:00
Chengwei Yang
f7a32fa38a
PLT-126: Change 'Private Messages' to 'Direct Messages'
...
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com >
2015-09-23 22:43:14 +08:00
JoramWilander
e4a15076f4
Implement UI theme colors.
2015-09-23 10:12:40 -04:00
=Corey Hulen
6e60768abe
Fixing merge conflict
2015-09-22 13:18:42 -07:00
JoramWilander
98186e5018
Implement incoming webhooks.
2015-09-21 14:22:23 -04:00
