Commit Graph
8775 Commits
Author SHA1 Message Date
Belen Curcio 5231c2d627 Removing perms mods 2017-09-14 17:28:54 -03:00
Wyatt Johnson f74e8dda16 added support for changing the static url 2017-09-14 14:27:45 -06:00
Wyatt JohnsonandGitHub 825d53afcd Merge branch 'master' into eslint-react 2017-09-14 13:28:53 -06:00
Wyatt JohnsonandGitHub 029877080d Merge branch 'master' into fix-notify-bugs 2017-09-14 13:28:34 -06:00
Wyatt JohnsonandGitHub 83f10a4863 Merge branch 'master' into story/150848457 2017-09-14 13:27:53 -06:00
Wyatt Johnson d820d2d2c3 moved support for deepReplyCount to seperate field 2017-09-14 13:08:01 -06:00
Belén CurcioandGitHub a6443f2bcc Merge branch 'master' into instream-ban 2017-09-14 13:05:58 -03:00
Kim GardnerandGitHub 7ace5b369a Merge pull request #951 from coralproject/update-readme
Update README
2017-09-14 16:49:40 +01:00
Kim GardnerandGitHub cf66c10262 Update README 2017-09-14 16:45:19 +01:00
KiwiandGitHub 99296ebe69 Merge branch 'master' into fix-notify-bugs 2017-09-14 17:25:50 +02:00
Chi Vinh Le 7600ce8d26 Fix error notification bugs 2017-09-14 22:22:16 +07:00
Kim GardnerandGitHub 26256b979e Merge branch 'master' into story/150848457 2017-09-14 16:20:20 +01:00
Kim GardnerandGitHub 0113f02994 Merge pull request #944 from coralproject/new-regexp-highlighter
Better wordlist service and highlighter
2017-09-14 16:20:06 +01:00
Wyatt JohnsonandGitHub b3eb3361bb Merge branch 'master' into new-regexp-highlighter 2017-09-14 08:47:40 -06:00
Wyatt JohnsonandGitHub fce65e616d Merge pull request #949 from coralproject/fix-moderator-rest-permission
Allow Moderator to have read access on assets and settings
2017-09-14 08:47:28 -06:00
Wyatt JohnsonandGitHub 6a4a0b7f6b Merge branch 'master' into eslint-react 2017-09-14 08:33:42 -06:00
Chi Vinh Le c41ab58109 Allow Moderator to have read access on assets and settings 2017-09-14 21:11:40 +07:00
Belen Curcio 837a586234 Ban User confirmation box 2017-09-14 09:26:33 -03:00
Belen Curcio 2facde3894 Adding dialog 2017-09-14 09:14:15 -03:00
Chi Vinh Le 76a6a0e82b Remove natural package 2017-09-14 18:10:24 +07:00
Chi Vinh Le bea25f2a11 Merge branch 'new-regexp-highlighter' of ssh://github.com/coralproject/talk into new-regexp-highlighter 2017-09-14 17:40:01 +07:00
Chi Vinh Le ad361413c7 Reimplement wordlist on server using same regexp solution 2017-09-14 17:36:04 +07:00
Kim GardnerandGitHub cf61d9e2ca Merge branch 'master' into story/150848457 2017-09-14 10:07:04 +01:00
Kim GardnerandGitHub 77ef9ff111 Merge branch 'master' into new-regexp-highlighter 2017-09-14 10:06:43 +01:00
Kim GardnerandGitHub c8cc5e6a34 Merge pull request #948 from coralproject/docs-update
Documentation Update
2017-09-14 09:16:17 +01:00
Belen Curcio bdd5e47427 Icon, translations 2017-09-13 17:38:04 -03:00
Wyatt Johnson 1574e08197 fixes #947 2017-09-13 12:02:20 -06:00
Chi Vinh Le abc651c55d Add some optimizations 2017-09-14 00:50:01 +07:00
Chi Vinh Le fa335564ed Generate RegExp from phrases 2017-09-14 00:10:29 +07:00
Belen Curcio 0ae2919def Perms and excludeIf 2017-09-13 13:42:32 -03:00
Belen Curcio 838a3bad2e Ban In-Stream 2017-09-13 13:21:27 -03:00
Chi Vinh Le 6487072be1 Merge branch 'new-regexp-highlighter' of ssh://github.com/coralproject/talk into new-regexp-highlighter 2017-09-13 22:23:41 +07:00
Chi Vinh Le a16f101a12 Match phrases not just words 2017-09-13 22:20:32 +07:00
Kim GardnerandGitHub 647502d701 Merge branch 'master' into new-regexp-highlighter 2017-09-13 15:11:35 +01:00
Kim GardnerandGitHub d728065fe5 Merge branch 'master' into story/150848457 2017-09-13 15:11:30 +01:00
Kim GardnerandGitHub 18b8a18f1d Merge pull request #946 from coralproject/typo-fix-en-yml
Fix typo
2017-09-13 15:05:20 +01:00
Kim GardnerandGitHub 1089807086 Fix typo 2017-09-13 15:00:00 +01:00
Kim GardnerandGitHub 0c1c64fdf9 Merge branch 'master' into eslint-react 2017-09-13 13:19:35 +01:00
Kim GardnerandGitHub 90a649db9b Merge branch 'master' into story/150848457 2017-09-13 13:18:56 +01:00
Kim GardnerandGitHub 17ec666d97 Merge branch 'master' into new-regexp-highlighter 2017-09-13 13:18:47 +01:00
Kim GardnerandGitHub cda86a67ab Merge pull request #942 from coralproject/instream-updates
In-Stream Moderation Updates
2017-09-13 13:18:28 +01:00
KiwiandGitHub 32d72129e5 Merge branch 'master' into instream-updates 2017-09-13 14:11:35 +02:00
Kim GardnerandGitHub 2905ffb5cb Merge branch 'master' into new-regexp-highlighter 2017-09-13 12:43:29 +01:00
Kim GardnerandGitHub 433b0d310e Merge branch 'master' into story/150848457 2017-09-13 12:43:16 +01:00
Kim GardnerandGitHub 08848057a5 Merge pull request #941 from coralproject/stable-keys
Provide stable keys for slot elements
2017-09-13 12:43:02 +01:00
Kim GardnerandGitHub 7f517ed4fb Merge branch 'master' into stable-keys 2017-09-13 12:35:12 +01:00
Kim GardnerandGitHub c364b3e307 Merge pull request #945 from coralproject/fix-edit-animation
Fix edit animation
2017-09-13 12:34:42 +01:00
Kim GardnerandGitHub 008df99100 Merge branch 'master' into story/150848457 2017-09-13 11:29:20 +01:00
Belen Curcio bfdfd98135 Linting 2017-09-12 15:11:01 -03:00
Belen Curcio 64be131047 Final 2017-09-12 15:09:11 -03:00