Commit Graph

7162 Commits

Author SHA1 Message Date
Kim Gardner 53871cb2c6 Merge branch 'master' into settings-graph-api 2017-09-04 11:33:59 +01:00
Kim Gardner 902670cdac Merge pull request #914 from coralproject/ignored
Top-level comments by ignored user are tombstoned, but replies should be as well
2017-09-04 11:32:10 +01:00
Kim Gardner f11cd3c676 Merge branch 'master' into ignored 2017-09-04 11:19:48 +01:00
Kim Gardner f088b4d459 Merge pull request #915 from coralproject/fix-live-modqueue
Use correct moderation queues during updates
2017-09-04 11:18:29 +01:00
Chi Vinh Le c0252e160b Fix reply fragments 2017-09-04 16:44:53 +07:00
Chi Vinh Le 98cb34f554 Don't ignore myself 2017-09-04 16:25:19 +07:00
Chi Vinh Le b2ef7fa795 Fix tombstone bug 2017-09-04 15:51:04 +07:00
Chi Vinh Le ffef2f640d First implementation of ignore user plugin 2017-09-04 15:40:39 +07:00
Chi Vinh Le 26bae69454 Fix bug when determining moderation queues for live updates 2017-09-03 19:36:02 +07:00
Wyatt Johnson 9a549a2b63 fixed some bugs from review 2017-09-01 11:21:30 -06:00
Chi Vinh Le c07eaf0edb Add member since 2017-09-01 23:15:00 +07:00
Chi Vinh Le 9c2ea693b9 Add hover styles 2017-09-01 22:29:30 +07:00
Chi Vinh Le 7c339aa510 Render contentSlot if set 2017-09-01 22:25:26 +07:00
Belén Curcio 2ed6bb4067 Merge branch 'master' into ignored 2017-09-01 12:23:21 -03:00
Chi Vinh Le 692d92f645 Implement talk-plugin-author-menu 2017-09-01 22:20:49 +07:00
Belen Curcio 7bb4b03daa Retrieving me from Comment triggers a change 2017-09-01 12:17:48 -03:00
Kim Gardner e132f1d652 Merge pull request #913 from coralproject/redis-fix
Fixed Redis Connection Error
2017-09-01 15:53:10 +01:00
Wyatt Johnson 644788ea31 removed unused option 2017-09-01 08:47:08 -06:00
Wyatt Johnson e368c50687 ioredis changed config, fixes #901 2017-09-01 08:44:25 -06:00
Kim Gardner 4569c1bd4f Merge pull request #911 from coralproject/premodqueue
Create both a PreMod and a New Queue when stream is switched from one status to another
2017-09-01 10:30:13 +01:00
Kim Gardner d6c46cb6d1 Merge branch 'master' into premodqueue 2017-09-01 10:25:30 +01:00
Kim Gardner faeadeb61d Merge pull request #912 from coralproject/embed-fix
Fixed path joining for embed link
2017-09-01 10:01:34 +01:00
Wyatt Johnson d161733cdc fixed path joining 2017-08-31 13:59:00 -06:00
Wyatt Johnson 2fd6d370c8 Merge branch 'master' into premodqueue 2017-08-31 13:16:41 -06:00
Wyatt Johnson 4dbcc65126 Merge branch 'master' into asset-graph-api 2017-08-31 11:57:50 -06:00
Wyatt Johnson 824abcdfa3 Merge pull request #902 from coralproject/ioredis
Replace node_redis with ioredis
2017-08-31 11:57:38 -06:00
Wyatt Johnson 10693f3e5c Merge branch 'master' into settings-graph-api 2017-08-31 11:50:06 -06:00
Wyatt Johnson dfd77dbf63 updated based on cvle's feedback 2017-08-31 11:48:38 -06:00
Belen Curcio 36c4c6a59f Ready 2017-08-31 14:22:59 -03:00
Wyatt Johnson 7b71511cae removed ! 2017-08-31 10:37:52 -06:00
Belen Curcio 99235df566 No premod status to the New Queue 2017-08-31 13:17:34 -03:00
Belen Curcio af0e9bc880 New Queue should appear if there are comments with NONE status 2017-08-31 13:02:07 -03:00
Belen Curcio 23c8e2a0e6 Refetching settings :) 2017-08-31 12:53:47 -03:00
Wyatt Johnson c17fcfe5ef Merge branch 'master' into ioredis 2017-08-31 09:24:20 -06:00
Wyatt Johnson f260e41274 Merge branch 'master' into asset-graph-api 2017-08-31 08:59:51 -06:00
Belen Curcio f81d5f8957 Grabbing settings from the store 2017-08-31 11:41:20 -03:00
Belen Curcio db55689f75 premod and new 2017-08-31 11:30:11 -03:00
Belen Curcio f140efe1bd Premod and New Queue Edge Case 2017-08-31 11:10:28 -03:00
Kim Gardner fe638a4c54 Merge pull request #910 from coralproject/edit-should-disappear
Make rendering `edit` pure
2017-08-31 13:13:25 +01:00
Chi Vinh Le b61afbc1d6 Make rendering edit pure 2017-08-31 19:04:54 +07:00
Kiwi 2631d9338a Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-31 12:31:44 +02:00
Kim Gardner 82e95dc4a1 Merge pull request #908 from coralproject/hide-empty-categories
Hide empty categories
2017-08-31 11:18:31 +01:00
Chi Vinh Le 3b7d006d1e Hide empty categories take 2 2017-08-31 16:59:04 +07:00
Chi Vinh Le b5daf5882b IfSlotIsEmpty and IfSlotIsNotEmpty now only renders a single child 2017-08-31 16:58:01 +07:00
Kim Gardner 11f5460604 Merge branch 'master' into hide-empty-categories 2017-08-31 10:45:52 +01:00
Kim Gardner 6e90dd6d62 Merge pull request #909 from coralproject/cleanup-plugins-default
Cleanup default plugins
2017-08-31 10:44:17 +01:00
Kiwi 635f6d7720 Merge branch 'master' into hide-empty-categories 2017-08-31 11:39:17 +02:00
Kiwi a4b40f2c46 Merge branch 'master' into cleanup-plugins-default 2017-08-31 11:39:13 +02:00
Kim Gardner 14541b48a1 Merge pull request #907 from coralproject/hide-on-click
Hide menu when clicking on a sort option
2017-08-31 10:38:56 +01:00
Chi Vinh Le c7c5167311 Cleanup default plugins 2017-08-31 16:36:08 +07:00