Asaad Mahmood
62f7e7c03e
Adding a quick fix for search bar bg related to themes
2015-09-30 19:45:06 +05:00
Asaad Mahmood
71dba4abcf
Updating slack import UI with states
2015-09-30 19:35:35 +05:00
Asaad Mahmood
296b930768
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
2015-09-30 19:30:45 +05:00
hmhealey
111fbb2495
Changed notification preference submission to only be updated when options have actually changed
2015-09-30 09:59:59 -04:00
hmhealey
284a660a47
Removed deprecated constants related to quiet mode
2015-09-30 09:59:59 -04:00
hmhealey
1010681407
Added channel id to updateLastViewed api calls to prevent multiple updates to different channels from clashing
2015-09-30 09:59:59 -04:00
hmhealey
c4d50885a7
Implemented ChannelMember.MarkUnreadLevel so that it actually functions
2015-09-30 09:59:58 -04:00
hmhealey
9995c7ccfc
Added additional test cases and fixed existing ones for ChannelMember.MarkUnreadLevel
2015-09-30 09:59:58 -04:00
hmhealey
7c319f0524
Removed UI for quiet mode and added UI to set when a channel will be marked unread in the sidebar
2015-09-30 09:59:58 -04: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
hmhealey
8a5ab6a56f
Added slight delay to TestEchoCommand to account for race condition
2015-09-30 09:47:47 -04:00
Joram Wilander
13ebb5fe94
Merge pull request #875 from mattermost/rhs-scroll-fix
...
Fix RHS scrolling center pane.
2015-09-30 08:14:54 -04:00
JoramWilander
95b4d63d3f
Fix RHS scrolling center pane.
2015-09-30 07:54:24 -04:00
Christopher Speller
73627000e7
Merge pull request #863 from mattermost/PLT-475
...
PLT-475 making sure session is properly removed
2015-09-30 07:45:42 -04:00
it33
3079055654
Merge pull request #874 from mattermost/it33-patch-1
...
Create MIT-COMPILED-LICENSE.md
2015-09-30 04:30:37 -07:00
it33
0862a5fa7e
Create MIT-COMPILED-LICENSE.md
2015-09-30 04:12:00 -07:00
Chengwei Yang
6a37d83bd2
Check team name in correct sequence to avoid null pointer
...
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com >
2015-09-30 09:28:06 +08:00
Chengwei Yang
a55e9b4070
Change minimal length of team name to 3 character
...
team named in 3 character in non-English language is very common, e.g. in
Chinese.
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com >
2015-09-30 09:28:05 +08:00
=Corey Hulen
0da42c5559
PLT-345 adding client side logging
2015-09-29 15:55:19 -07:00
Harrison Healey
5e9dccc464
Merge pull request #865 from mattermost/PLT-404
...
PLT-404 adding basic error checking to config file.
2015-09-29 17:33:16 -04:00
Joram Wilander
fb9fe1995c
Merge pull request #862 from mattermost/PLT-435
...
PLT-435 adding system console link to RHS
2015-09-29 17:28:59 -04:00
Harrison Healey
08af14abc9
Merge pull request #864 from esethna/patch-3
...
Update email notification help text
2015-09-29 17:27:01 -04:00
Harrison Healey
5596dbf27f
Merge pull request #860 from mattermost/PLT-470
...
PLT-470 Adding STMP server connection check
2015-09-29 17:25:34 -04:00
Harrison Healey
9aef3836b3
Merge pull request #861 from mattermost/PLT-469
...
PLT-469 skip redirect if verified email required.
2015-09-29 17:25:29 -04:00
=Corey Hulen
8fadea44de
PLT-404 adding basic error checking to config file.
2015-09-29 14:17:16 -07: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
3fea6b31af
PLT-475 making sure session is properly removed
2015-09-29 13:26:23 -07:00
=Corey Hulen
0c4227994b
PLT-435 adding system console link to RHS
2015-09-29 13:16:55 -07:00
Christopher Speller
942702ff1a
Merge release branch 'release-1.0.0'
2015-09-29 15:34:21 -04:00
Harrison Healey
2d5b284186
Merge pull request #857 from mattermost/PLT-429
...
PLT-429, PLT-483, PLT-472 fixes to Gitlab settings page
2015-09-29 15:18:03 -04:00
=Corey Hulen
19a71ce00d
PLT-469 skip redirect if verified email required.
2015-09-29 12:09:18 -07:00
Joram Wilander
c3d9235878
Merge pull request #858 from mattermost/PLT-425
...
PLT-425 changing wording
2015-09-29 15:00:10 -04:00
=Corey Hulen
0969e1bc71
PLT-470 Adding STMP server connection check
2015-09-29 11:59:26 -07:00
=Corey Hulen
a15115d2c0
PLT-409 add warning to at rest salt gen
2015-09-29 11:45:37 -07:00
=Corey Hulen
764b4b1d82
PLT-425 changing wording
2015-09-29 11:35:39 -07: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
Corey Hulen
9c3feff5bc
Merge pull request #856 from asaadmahmoodspin/bugfix
...
PLT-465 - Fixing RHS header back button search icon etc
2015-09-29 11:31:32 -07:00
Asaad Mahmood
1a12d409fa
Removing command styles
2015-09-29 23:28:37 +05:00
Asaad Mahmood
0f2959922c
Removing mentions changes since they're for a master
2015-09-29 23:27:29 +05:00
Asaad Mahmood
189dc12146
Updating placeholder text in responsive
2015-09-29 23:21:45 +05:00
=Corey Hulen
80d1acab22
PLT-472 switching field ordering.
2015-09-29 11:21:27 -07:00
=Corey Hulen
0e028d04e2
PLT-429 removing scope field.
2015-09-29 11:20:16 -07:00
=Corey Hulen
b1bb2a7a54
PLT-483 adding better help text
2015-09-29 11:19:03 -07:00
Christopher Speller
adfe129fcc
Merge pull request #854 from justyns/gh842-invalid-join-url
...
Update the /join command to use the correct redirect URL
2015-09-29 14:06:59 -04:00
JoramWilander
ddf8951828
Turn on incoming webhooks by default in the docker configs.
2015-09-29 13:57:44 -04:00
Asaad Mahmood
fb285d7b32
Updating stuff with states in slack import
2015-09-29 22:32:29 +05:00
Justyn Shull
5064f9cba2
Update the /join command to use the correct redirect URL, and update the test to match
2015-09-29 11:48:13 -05:00
Corey Hulen
317dc0ea26
Merge pull request #843 from rgarmsen2295/plt-138
...
PLT-138 Better parsing of the site's title when viewing a channel
2015-09-29 09:46:37 -07:00
it33
9e99058d06
Adding link to production install
2015-09-29 09:46:23 -07:00
Corey Hulen
26b4110091
Merge pull request #853 from mattermost/PLT-28
...
Plt 28
2015-09-29 09:13:06 -07:00
