=Corey Hulen
1fc12dd8ba
Multi-session login
2015-10-20 14:49:42 -07:00
=Corey Hulen
36658c13a4
Fixing merge conflicts
2015-10-19 11:42:40 -07:00
=Corey Hulen
468f01dc89
Merging from master
2015-10-19 10:25:51 -07:00
JoramWilander
182e59f2c0
Show/hide integrations properly based off config settings.
2015-10-19 09:00:30 -04:00
JoramWilander
5574151c85
Fix postgres query and minor UI updates for outgoing webhooks.
2015-10-19 09:00:30 -04:00
JoramWilander
af6e2c29eb
Implement outgoing webhooks.
2015-10-19 09:00:30 -04:00
=Corey Hulen
8b2d7f391a
Fixing merge
2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3
Inital support for multi-tab loging
2015-10-16 09:10:54 -07:00
Christopher Speller
495673d80d
Fixing some client warnings
2015-10-16 10:50:10 -04:00
Stas Vovk
79fcb98084
Merge remote-tracking branch 'upstream/master' into PLT-637
...
Conflicts:
web/react/utils/constants.jsx
2015-10-16 14:21:51 +03:00
Christopher Speller
1571a9a2df
Fixing most deprication warnings
2015-10-15 15:00:28 -04:00
Stas Vovk
29a0c182ef
added file with display settings
2015-10-14 21:39:33 +03:00
Stas Vovk
76e278a13d
added display tab under account settings. added 24h time option
2015-10-14 20:36:12 +03:00
Christopher Speller
cdbe6342bb
Merge release branch 'release-1.1.0'
2015-10-14 08:27:34 -04:00
JoramWilander
ac0f8f6bcf
Fix webhook name not overriding in LHS and update webhook help text.
2015-10-13 18:01:11 -04:00
Asaad Mahmood
4cfe8ce699
Multiple Ui Improvements
2015-10-13 23:28:00 +05:00
Christopher Speller
e60fb1dfd7
Fixing user settings dialog so it desn't ask you to check your email unless you changed it
2015-10-13 11:31:57 -04:00
Corey Hulen
246c7414bd
Merge pull request #1018 from asaadmahmoodspin/ui-fixes
...
Other UI Improvements
2015-10-12 13:18:47 -07:00
Joram Wilander
4949b6837f
Merge branch 'master' into typos
2015-10-12 12:06:55 -04:00
Asaad Mahmood
72b3a1d695
Other UI Improvements
2015-10-12 20:55:40 +05:00
it33
ea3713561b
Update manage_incoming_hooks.jsx
2015-10-09 18:39:34 -07:00
it33
b0d5b6a2e2
Update user_settings_integrations.jsx
2015-10-09 18:28:57 -07:00
it33
acde3ebf98
Update manage_incoming_hooks.jsx
2015-10-09 18:27:55 -07:00
it33
6aff5900f7
Fixed typos
...
There was no space after "user name." before the next sentence. Also, "user name" should be "username"
2015-10-08 22:39:16 -07:00
Christopher Speller
b85b529373
Changing SpinPunch to Mattermost in copyright
2015-10-08 12:27:09 -04:00
Christopher Speller
7571d21f32
Merge pull request #931 from rgarmsen2295/plt-112
...
PLT-112 Improves email change verification process
2015-10-08 09:56:00 -04:00
Harrison Healey
51bf2dc185
Merge pull request #952 from tomitm/PLT-445
...
PLT-445 Create About dialog
2015-10-08 09:33:56 -04:00
Christopher Speller
4263c08c55
Merge pull request #953 from asaadmahmoodspin/plt-522
...
PLT-522 - Adding option for mentionHighlightLink for themes
2015-10-07 08:43:24 -04:00
Asaad Mahmood
698ca63d99
PLT-522 - Adding option for mentionHighlightLink for themes
2015-10-07 14:41:24 +05:00
Tomi M
5a28562354
PLT-445 Create About dialog
2015-10-06 20:31:23 -07:00
Asaad Mahmood
d99aea1502
Removing sidebar text hover color
2015-10-06 22:33:30 +05:00
Reed Garmsen
c84fe62ca1
Added new email to email change notification
2015-10-06 09:15:56 -07:00
Reed Garmsen
817fa66ac4
Added better verification when a user changes his or her email
2015-10-05 14:29:20 -07:00
Reed Garmsen
aad9529f31
Initial cosmetic changes to the process of verifying a changed email
2015-10-05 12:45:47 -07:00
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
