Commit Graph

356 Commits

Author SHA1 Message Date
Kiwi b8c6305939 Merge branch 'master' into rm-semicolon 2017-08-28 17:09:42 +02:00
Chi Vinh Le 7911e366e5 Remove semicolon 2017-08-28 22:04:21 +07:00
Chi Vinh Le bb42cffc17 Add sort plugins for other reactions 2017-08-28 18:50:01 +07:00
Chi Vinh Le 0dffc15836 Hover styles 2017-08-28 18:22:30 +07:00
Chi Vinh Le f9bc5f79ec Don't sort and ignore duplicate comments (embed-stream) 2017-08-28 18:08:33 +07:00
Wyatt Johnson 8a5db167ff changed sort -> sortOrder 2017-08-25 09:59:37 -06:00
Chi Vinh Le 48595a1bbf Merge branch 'master' into user-sort
Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js
2017-08-25 21:55:00 +07:00
Chi Vinh Le 7f899b0440 Attach to fragments tree 2017-08-25 21:40:57 +07:00
Chi Vinh Le e51e8c543f Add more sort options and improve styling 2017-08-25 20:15:07 +07:00
Chi Vinh Le 9e2f6f1f63 Use factory 2017-08-25 19:40:55 +07:00
Chi Vinh Le 6ae68a4f90 First working version 2017-08-25 19:21:57 +07:00
Chi Vinh Le ddb555e07f Add new sorting variables 2017-08-24 21:30:16 +07:00
Chi Vinh Le d1a3a67b35 Fix featured comments 2017-08-24 20:12:08 +07:00
Chi Vinh Le df60ac4714 Merge branch 'master' into user-sort 2017-08-24 20:09:44 +07:00
Wyatt Johnson 763f753928 Merge branch 'master' into refactor-global-dependencies 2017-08-23 11:56:35 -06:00
Chi Vinh Le ce360a47f8 Add slot to fragments in featured comments 2017-08-23 22:40:48 +07:00
Chi Vinh Le a23bad49c6 Remove global dependency on notification on admin 2017-08-23 03:48:20 +07:00
Wyatt Johnson 01ed9880f4 comment count optim, prep for sortBy 2017-08-21 15:26:04 -06:00
Belen Curcio 19dfe86118 Updates 2017-08-21 14:53:24 -03:00
Belen Curcio cea6f7b8e8 Deleting Reference to FakeComment 2017-08-21 14:26:22 -03:00
Belen Curcio 9bff90bd4d Adding Slot to Featured Comments 2017-08-21 13:18:46 -03:00
Wyatt Johnson ec2c62a607 Merge branch 'master' into user-sort 2017-08-21 08:48:26 -06:00
Chi Vinh Le 74f778aef7 Merge branch 'master' into talk-provider
Conflicts:
	client/coral-embed-stream/src/containers/Embed.js
	plugin-api/beta/client/hocs/withReaction.js
2017-08-21 21:38:39 +07:00
Chi Vinh Le 9566f83eac Remove coral-framework reducers
Some of them were only related to the embed stream.
Auth code is too convoluted with the embed stream and can't be reused atm.
2017-08-21 21:31:54 +07:00
Chi Vinh Le b8452b535b Allow passing custom fragments to withReaction and withTag 2017-08-18 22:19:03 +07:00
Chi Vinh Le 00f365ab38 Add missing fragments 2017-08-18 20:40:51 +07:00
Chi Vinh Le dc49d23dc8 Define fragments for PermalinkButton 2017-08-18 19:55:51 +07:00
Wyatt Johnson 686eb614f7 changed cursor to Cursor scalar type, changed SORT_ORDER 2017-08-17 16:43:55 -06:00
Chi Vinh Le 7ea6d133c2 Filter queryData in withFragments and optimize rendering 2017-08-17 21:31:09 +07:00
Chi Vinh Le c3bcf7dd63 Merge branch 'master' into optimization 2017-08-15 21:48:09 +07:00
Chi Vinh Le 2b2e2f9b5f ClickOutside should only toggle action when open 2017-08-15 21:32:44 +07:00
Kim Gardner 1ca40a3592 Merge branch 'master' into rm-immutable-js 2017-08-15 11:27:45 +01:00
Kim Gardner ac2699856f Merge branch 'master' into fix-ignore-user 2017-08-15 10:50:33 +01:00
Chi Vinh Le db37a0b38e Check existance of featuredComments in query 2017-08-15 16:43:44 +07:00
Kim Gardner cadfb57cd2 Merge branch 'master' into fix-error-offtopic 2017-08-15 10:36:19 +01:00
Chi Vinh Le c52a97338c Fix FakeComment styles 2017-08-14 21:25:48 +07:00
Chi Vinh Le abda77a7e7 Fix console error in offtopic 2017-08-14 19:55:04 +07:00
Chi Vinh Le 2e8863285d Rm immutable-js from admin 2017-08-14 16:49:00 +07:00
Chi Vinh Le 7360a43898 Remove immutable from embed stream 2017-08-11 22:50:12 +07:00
Kiwi 0f93d6ce8a Merge branch 'master' into pluggable-modqueues 2017-08-10 18:01:06 +02:00
Chi Vinh Le 83ded4bda9 Refactor into queueConfig 2017-08-10 18:37:14 +07:00
Kim Gardner d947e103fc Merge branch 'master' into pre-responsive-admin-cleanup 2017-08-10 10:57:40 +01:00
Chi Vinh Le 976bd1e9ad Paginate my comments in profile tab 2017-08-08 22:39:24 +07:00
IAmSamHankins 11b2bc265a comment tag/marker updates for size 2017-08-04 13:50:14 -04:00
Chi Vinh Le 203707124c More css classes 2017-08-04 16:55:02 +07:00
Chi Vinh Le e6b7fcbd9d Show success notification 2017-08-02 23:41:26 +07:00
Chi Vinh Le 2e974ac82f Live update unfeatured 2017-08-02 22:29:01 +07:00
Chi Vinh Le da0d0349dd Implement approve and live updates 2017-08-02 21:34:48 +07:00
Chi Vinh Le b6b7570bcc Remove subscription code 2017-08-02 18:14:52 +07:00
Belen Curcio 779260c245 Working featured comments on the admin side 2017-08-01 13:06:21 -03:00