Commit Graph

1070 Commits

Author SHA1 Message Date
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
hmhealey
c4203d8cd9 Removed $ from time tooltip 2015-10-02 08:54:31 -04:00
Joram Wilander
08d390953a Merge pull request #881 from hmhealey/plt194
PLT-194 Changes to ChannelMember notification settings
2015-10-02 08:45:38 -04:00
hmhealey
c9a0030551 Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps 2015-10-01 08:31:17 -04:00
hmhealey
c16b9de8dc Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps 2015-10-01 08:31:11 -04:00
Christopher Speller
be300b7e7d Merge pull request #859 from mattermost/PLT-409
PLT-409 add warning to at rest salt gen
2015-10-01 07:27:32 -04:00
Christopher Speller
46f86e7076 Merge pull request #867 from chengweiv5/team-name
Team name
2015-09-30 11:43:05 -04: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
c4d50885a7 Implemented ChannelMember.MarkUnreadLevel so that it actually functions 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
JoramWilander
95b4d63d3f Fix RHS scrolling center pane. 2015-09-30 07:54:24 -04: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
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
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
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
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
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
Asaad Mahmood
fb285d7b32 Updating stuff with states in slack import 2015-09-29 22:32:29 +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
Asaad Mahmood
67886c3fb6 Updating class with setState 2015-09-29 20:53:30 +05:00
Reed Garmsen
558f8a322f Removed unused title update code 2015-09-29 08:51:36 -07:00
Asaad Mahmood
f039c71747 plt-383 - Slack upload improvement 2015-09-29 19:45:45 +05:00
Asaad Mahmood
3e77df8532 plt-479 - Fixing command lists and also making them theme compatible 2015-09-29 19:23:21 +05:00
Joram Wilander
d8d850b2f7 Merge pull request #845 from trashcan/fix-autocomplete-suggestion
Add pull-left and pull-right to autocomplete command suggestions.
2015-09-29 10:07:00 -04:00
Christopher Speller
cb079aff49 Merge pull request #846 from mattermost/Fixing-Quotes
Fixing quotes
2015-09-29 09:56:09 -04:00
Christopher Speller
9703c6bc01 Merge pull request #833 from mattermost/plt-417
PLT-417 Fix scrolling related to RHS.
2015-09-29 09:54:37 -04:00
Christopher Speller
5999b03eb9 Merge pull request #830 from mattermost/youtube-scroll-fix
Fix youtube minor scrolling bug.
2015-09-29 09:52:23 -04:00
JoramWilander
a9f5918a9d Update incoming webhooks to hide DMs and accept direct JSON payloads. 2015-09-29 08:38:26 -04:00
JoramWilander
c17310d011 Fix scrolling related to RHS. 2015-09-29 07:54:55 -04:00
it33
0d48bf778b Fixing quotes 2015-09-28 23:47:14 -07:00
Pat Lathem
c4034b9d03 Add pull-left and pull-right to autocomplete command suggestions. 2015-09-28 17:41:46 -05:00
Reed Garmsen
5b67abf34b Better parsing of the website's title when viewing a channel 2015-09-28 15:13:10 -07:00
Reed Garmsen
0b249cd099 Inactive members are no longer counted or shown as members of a channel 2015-09-28 13:07:31 -07:00
=Corey Hulen
7110aa42d9 Fixing gitlab settings in admin console 2015-09-28 11:10:18 -07:00
JoramWilander
102b3b5ae6 Fix youtube minor scrolling bug. 2015-09-28 08:33:23 -04:00
Asaad Mahmood
0899280112 PLT-441 - Minor Ui touches to the admin console 2015-09-28 10:07:36 +05:00
=Corey Hulen
2f39d1819d Fixing revoke session 2015-09-26 17:38:02 -07:00
=Corey Hulen
65cfe9883c Fixing broken page 2015-09-26 17:22:04 -07:00