Commit Graph

8345 Commits

Author SHA1 Message Date
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 Gardner 647502d701 Merge branch 'master' into new-regexp-highlighter 2017-09-13 15:11:35 +01:00
Kim Gardner d728065fe5 Merge branch 'master' into story/150848457 2017-09-13 15:11:30 +01:00
Kim Gardner 18b8a18f1d Merge pull request #946 from coralproject/typo-fix-en-yml
Fix typo
2017-09-13 15:05:20 +01:00
Kim Gardner 1089807086 Fix typo 2017-09-13 15:00:00 +01:00
Kim Gardner 0c1c64fdf9 Merge branch 'master' into eslint-react 2017-09-13 13:19:35 +01:00
Kim Gardner 90a649db9b Merge branch 'master' into story/150848457 2017-09-13 13:18:56 +01:00
Kim Gardner 17ec666d97 Merge branch 'master' into new-regexp-highlighter 2017-09-13 13:18:47 +01:00
Kim Gardner cda86a67ab Merge pull request #942 from coralproject/instream-updates
In-Stream Moderation Updates
2017-09-13 13:18:28 +01:00
Kiwi 32d72129e5 Merge branch 'master' into instream-updates 2017-09-13 14:11:35 +02:00
Kim Gardner 2905ffb5cb Merge branch 'master' into new-regexp-highlighter 2017-09-13 12:43:29 +01:00
Kim Gardner 433b0d310e Merge branch 'master' into story/150848457 2017-09-13 12:43:16 +01:00
Kim Gardner 08848057a5 Merge pull request #941 from coralproject/stable-keys
Provide stable keys for slot elements
2017-09-13 12:43:02 +01:00
Kim Gardner 7f517ed4fb Merge branch 'master' into stable-keys 2017-09-13 12:35:12 +01:00
Kim Gardner c364b3e307 Merge pull request #945 from coralproject/fix-edit-animation
Fix edit animation
2017-09-13 12:34:42 +01:00
Kim Gardner 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
Belen Curcio 7115d4c31f Missing async 2017-09-12 15:02:29 -03:00
Belen Curcio a944cd2608 Correct branch 2017-09-12 15:01:15 -03:00
Belen Curcio 0e7d74559f Notify errors 2017-09-12 14:08:19 -03:00
Belen Curcio 297b905163 Hiding after action 2017-09-12 13:42:49 -03:00
Belen Curcio 9c08b586ec Hiding after action 2017-09-12 13:40:26 -03:00
Belen Curcio dbeca830a2 Closing after featuring and unfeaturing 2017-09-12 13:30:15 -03:00
Belen Curcio 0042767fad No approve button for Approved comments 2017-09-12 13:12:35 -03:00
Wyatt Johnson 110a0093af Merge branch 'master' into eslint-react 2017-09-12 10:00:11 -06:00
Belen Curcio 6bac6ee5c5 Removed old code 2017-09-12 12:59:48 -03:00
Belen Curcio aa364e1abe Renaming Fragment and variable name 2017-09-12 12:58:25 -03:00
Belen Curcio 6e88cc94e0 Merge branch 'reject-instream' of github.com:coralproject/talk into reject-instream 2017-09-12 12:56:07 -03:00
Chi Vinh Le 7976aace00 Typo 2017-09-12 22:46:24 +07:00
Kiwi 1261e4e25c Merge branch 'master' into instream-updates 2017-09-12 17:20:08 +02:00
Chi Vinh Le 2a655331fc Use same tlds list on server 2017-09-12 21:46:03 +07:00
Chi Vinh Le 98b95cab86 Reintroduce linkify 2017-09-12 21:31:59 +07:00
Chi Vinh Le d8ca9dfb07 Fix edit animation 2017-09-12 20:58:33 +07:00
Chi Vinh Le ee3cee2a50 Typo 2017-09-12 20:55:31 +07:00
Chi Vinh Le 65a6c408a7 Add some docs 2017-09-12 20:54:30 +07:00
Chi Vinh Le d18a9a057b Implement simple regexp based highlighter 2017-09-12 20:47:05 +07:00
Kiwi b27e3e0a7f Merge branch 'master' into stable-keys 2017-09-12 11:11:08 +02:00
Kiwi f2804f2394 Merge pull request #930 from coralproject/fix-graphql-warnings
Fix graphql warnings
2017-09-12 11:10:44 +02:00
Chi Vinh Le d1c30ab982 Remove talkUuid and use element key instead 2017-09-12 15:57:40 +07:00
Wyatt Johnson ca411a3227 added support for deep comment counts 2017-09-11 18:01:01 -06:00
Belen Curcio 5e4a48f4cc Updates 2017-09-11 15:38:42 -03:00
Belen Curcio c93b53c25b pdates 2017-09-11 15:11:22 -03:00
Belen Curcio 51f6c0738d Containers 2017-09-11 15:02:01 -03:00
Wyatt Johnson 49f09b87a0 Added new SYSTEM_WITHHELD comment status 2017-09-11 11:09:21 -06:00
Belen Curcio 06c45faeb0 Read/Write Fragments to update the cache 2017-09-11 13:57:24 -03:00
Kiwi 70eee3d4b2 Merge branch 'master' into stable-keys 2017-09-11 18:51:18 +02:00
Chi Vinh Le ecd4267ea9 Remove getSlotComponents completely 2017-09-11 23:46:16 +07:00