Commit Graph

74 Commits

Author SHA1 Message Date
Chris Duarte
fdbfb9a4ed Replace Channel Name for Team in Email Notifications (#7839)
* allow option to set channel name in email notification subject

* Added TeamName to title when UseChannelInEmailNotifications=true
2017-11-24 12:57:02 -05:00
Chris
bbb301b7de send-mail refactor (#7885) 2017-11-23 09:44:19 -05:00
Chris
77a1dc1f2f HTTP client refactor (#7884)
* http client refactor

* simplification
2017-11-22 10:15:03 -05:00
Chris
5cf45d2155 refactor template code (#7860) 2017-11-20 12:57:45 -05:00
Chris
10c5a927cb more global config ref cleanup (#7802) 2017-11-09 14:46:20 -06:00
Carlos Tadeu Panato Junior
63df41b911 fix push notification when user status is in DND (#7731) 2017-10-30 08:15:01 -04:00
Saturnino Abril
1e2506b2df add RootId to out-of-channel-mentions ephemeral post for that to render at RHS (#7726) 2017-10-27 04:14:41 +08:00
Carlos Tadeu Panato Junior
62b3569025 [PLT-4341] add dnd command (#7694) 2017-10-25 11:51:13 -04:00
Saturnino Abril
f632232862 [PLT-7701] Fix emoji names that trigger mention (#7663)
* fix emoji names that trigger mention

* remove regex and rearrange based on comment

* make ":@here:" to not trigger a mention
2017-10-25 22:11:20 +08:00
Saturnino Abril
18ee375860 [PLT-7362] Option to add user to channel if mentioned user is not currently in the channel (#7619)
* Option to add user to channel if mentioned user is not currently in the channel

* instead of link from server, just add component on client side to add channel member

* change implementation using post.props

* do clean up and add test

* sanitize post.props['add_channel_member'] on post creation

* move sanitize to app.CreatePost and also apply to app.UpdatePost
2017-10-21 01:38:26 +08:00
Chris
8e19ba029f Reduce utils.Cfg references (#7650)
* app.UpdateConfig method

* test fix

* another test fix

* the config override option as-was is just error prone, remove it for now

* derp
2017-10-18 15:36:43 -07:00
Christopher Speller
3461a7b207 Add back consumeAndClose functionality. (#7608)
* consume bodies for action button integrations, webrtc gateway, oauth
endpoint

* Fixing a couple more places, switching to io.Copy to ioutil.Discard, adding a comment to help prevent future performance regressions
2017-10-12 08:00:53 -07:00
Chris
5e69ce099f Goroutine wranglin (#7556)
* goroutine wranglin

* synchronize WebConn.WritePump
2017-10-03 10:53:53 -05:00
Chris
8c80cdde38 remove remaining Global() calls (outside of tests) (#7521) 2017-09-28 00:52:34 +08:00
Chris
ac74066f0e remove einterface gets (#7455) 2017-09-19 18:31:35 -05:00
Harrison Healey
2a6cd44f23 PLT-7509 Stopped processing special mentions for change of header/purpose messages (#7410) 2017-09-15 08:37:29 -04:00
Corey Hulen
3e9bd30b00 PLT-7502 fixing clearing of push notifications for iOS (#7429)
* PLT-7502 fixing clearing of push notificaitons for iOS

* PLT-7502 fixing clearing of push notificaitons for iOS
2017-09-12 17:49:42 -07:00
Christopher Speller
29fca51821 Renaming repo 2017-09-06 23:11:59 -07:00
Chris
1adfd0e9be app type transition (#7167) 2017-09-06 17:12:54 -05:00
Alex Moon
06a959e19e [GH-7260] Add check for verified email when required by server settings (#7275)
* Add check for verified email when required by server settings

* remove debug and simplify logic with continue
2017-09-06 16:43:48 -04:00
Harrison Healey
6ca443a255 PLT-7522 Cleaned up translation of templates (#7351)
* PLT-7522 Cleaned up translation of templates

* Added unit tests

* Changed TranslateAsHtml to not be variadic
2017-09-05 17:39:45 -04:00
Harrison Healey
575864c917 PLT-7474 Stopped requiring confirmation for mentions in code blocks (#7375)
* PLT-7474 Stopped requiring confirmation for mentions in code blocks

* Stopped mentioning people from code blocks using ~~~
2017-09-06 00:39:07 +08:00
Harrison Healey
98bb4c31a1 PLT-7473 Ignore text surrounded by multiple backquotes when parsing mentions (#7347) 2017-09-04 21:31:20 +08:00
Chris
213a072b38 PLT-6403: Interactive messages (#7274)
* wip

* finish first pass

* requested changes

* add DoPostAction to Client4
2017-08-29 16:14:59 -05:00
enahum
871b7eaa66 Include post_id and root_id to handle actions from the PN (#7286) 2017-08-28 11:54:23 -03:00
Corey Hulen
1709b94227 PLT-5745 Cleaning up duplicate calls (#7298)
* PLT-5745 Cleaning up duplicate calls

* Fixing missing calls

* Fixing broken test
2017-08-28 10:08:37 -04:00
Christopher Speller
fd1301779f Merge branch 'release-4.1' 2017-08-17 09:35:36 -07:00
Corey Hulen
0ab490845a PLT-6226 Fixing races with licensing (#7213)
* PLT-6226 Fixing races with licensing

* Fixing build issue

* Fixing licensing issue

* removing commented code
2017-08-16 09:51:45 -07:00
Jonathan
e1e2566c67 PLT-7375: Email batching not on by default for accounts that have never touched their email settings (#7206)
* PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference

* PLT-7375: Reverting 4cf316fcd

* PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference

* PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail

* PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail

* PLT-7375: Reverted accidental changes to config

* PLT-7375: Manually fixing config.
2017-08-15 09:20:03 +08:00
Joram Wilander
bbf6c81a06 Fix out-of-channel mentions for usernames with dashes (#7151) 2017-08-10 08:41:34 -04:00
Chris
ffbf8e51fe PLT-6358: Server HTTP client improvements (#6980)
* restrict untrusted, internal http connections by default

* command test fix

* more test fixes

* change setting from toggle to whitelist

* requested ui changes

* add isdefault diagnostic

* fix tests
2017-08-09 13:49:07 -07:00
Jonathan
178ccd16cb System Console: Email notification content setting (#7122)
* PLT-7195: Added new config option, new license feature, and config UI to system console. Still need to implement behaviour change in email batching code

* PLT-7195: Modified batch emails to respect email notification content type setting

* PLT-7195: Tweaking the colours a bit

* PLT-7195: Added support for email notification content type setting in immediate (non-batched) notification messages. Attempted to clean up the code somewhat. Unit tests coming in a future commit

* PLT-7195: Added unit tests for non-batched emails

* Checked license when applying email content settings

* Changed return type of getFormattedPostTime
2017-08-06 07:52:35 +08:00
Corey Hulen
43c523e839 PLT-7130 adding more generic push notificaiton message. (#7044)
* PLT-7130 adding more generic push notificaiton message.

* Fixing strings
2017-08-03 08:38:17 -04:00
Saturnino Abril
88f398ffdd Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes." (#7072)
* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"

This reverts commit 25a2013890.

* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"

This reverts commit 8a91235fb3.
2017-08-01 08:16:45 -04:00
Debanshu Kundu
8a91235fb3 #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)
fix 7 and 8

remove @ at "{username} joined the channel"

refactor and update test
2017-08-01 02:17:21 +08:00
Jonathan
d01261a228 PLT-7177: Change the default email frequency to 15 minutes if batching is enabled on the server. (#7036)
* PLT-7177: Found default preference that needs to be changed

* PLT-7177: Front end behaves as desired

* PLT-7177: Changed default batching interval on server side

* PLT-7177: Added unit tests for new default interval

* PLT-7177: Removed unused import

* PLT-7177: Renamed constants to increase clarity
2017-07-31 11:51:43 -04:00
Corey Hulen
9e600fcdcc PLT-3901 fixing push notificaiton with images message (#6783) 2017-06-29 11:05:34 +08:00
Joram Wilander
3f1fca9463 PLT-6759 Show deactivated users in GMs (#6703)
* Show deactivated users in GMs

* Fix runtime error when DMing deactivated user
2017-06-22 11:36:46 +01:00
Corey Hulen
64eb968b7d PLT-3901 send different push message when only images attached (#6672) 2017-06-16 14:22:12 -04:00
Harrison Healey
3b74effacd Fixed debug message for push notifications (#6536) 2017-06-01 17:20:34 -04:00
Torsten Juergeleit
fdf1164aee PLT-5705 Created a single source of http.Client creation logic with internet proxy support, reasonable timeouts and optional insecure connections (#6503) 2017-05-31 10:34:05 -04:00
David Meza
eab6f74594 PLT-6485 Add ability to disable @here notifications (#6372) 2017-05-30 12:02:44 -04:00
Carlos Tadeu Panato Junior
a123b54d5e remove notification as requested in PLT-6537 (#6412) 2017-05-18 08:58:40 -04:00
George Goldberg
6026ed9d53 PLT-6523: Don't crash when replying to a post whose poster has left the channel. (#6388) 2017-05-10 19:16:45 -04:00
Harrison Healey
c3e17da8c8 PLT-6271 Changed word splitting to initially split on any non-name character (#6261)
* PLT-6271 Changed word splitting to initially split on any non-name character

* Fixed detection of out of channel mentions
2017-04-28 10:13:07 -04:00
Corey Hulen
a6397b5ed9 PLT-6108 fixing to use senderId for push (#6245) 2017-04-27 07:51:19 -04:00
Harrison Healey
8e6141152b PLT-3915/PLT-5550 Improve handling of Markdown while parsing mentions (#6091)
* PLT-3915 Removed ability to mention users in code blocks

* PLT-3915 Added simple check for potential code blocks before using regexes

* PLT-5550 Improve splitting when parsing mentions to ignore markdown characters
2017-04-26 08:00:38 -07:00
Corey Hulen
3e73adceb5 PLT-6108 adding extra params to push notifications (#6236)
* PLT-6108 adding extra params to push notifications

* PLT-6108 adding extra params to push notifications
2017-04-26 07:29:50 -07:00
Harrison Healey
db68e598a1 PLT-4457 Added API to get multiple users by their usernames (#6218)
* Allow getting profiles by username without a team

* Changed UserStore.GetProfilesByUsernames to return an array

* PLT-4457 Added API to get multiple users by their usernames

* Changed users/names route to users/usernames
2017-04-25 08:00:41 -07:00
Harrison Healey
fb6f2a123c PLT-5860 Updated copyright date (#6058)
* PLT-5860 Updated copyright date in about modal

* PLT-5860 Updated copyright notice in JSX files

* PLT-5860 Updated copyright notice in go files

* Fixed misc copyright dates

* Fixed component snapshots
2017-04-12 08:27:57 -04:00