6 Commits

Author	SHA1	Message	Date
Bianca Nenciu	533800a87b	Add watched words of type "replace" (#12020) ... This commit includes other various improvements to watched words. auto_silence_first_post_regex site setting was removed because it overlapped with 'require approval' watched words.	2021-02-25 14:00:58 +02:00
Joffrey JAFFEUX	52672b9eab	DEV: apply new coding standards (#10592)	2020-09-04 13:42:47 +02:00
Robin Ward	3a46e44ed8	Rename merge to deepMerge so it's more clear what it's doing	2020-09-03 10:03:33 -04:00
Robin Ward	c4079780be	REFACTOR: Remove _.merge	2020-09-03 10:03:33 -04:00
Joffrey JAFFEUX	77801aa9be	FIX: allows to have custom emoji translation without static file (#9893)	2020-05-27 20:11:52 +02:00
Robin Ward	79c64eaeff	DEV: Move pretty-text into an ember-addon format (#9689)	2020-05-07 12:37:47 -04:00