Commit Graph

553 Commits

Author SHA1 Message Date
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
Kim Gardner 2c6447cd07 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-16 10:38:36 +01: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 ce63113c5d Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-15 11:28:00 +01: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
Kim Gardner 3636bb71c4 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-09 11:38:33 +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
Kim Gardner 4086fe8684 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-03 09:31:05 -04:00
Kim Gardner 6e6d999c9b Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-08-02 12:48:44 -04: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
Belen Curcio 5266bfa647 Components, UI/UX and Styling 2017-08-01 12:38:41 -03:00
Kim Gardner 0d037c3acb Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-07-31 18:44:05 -04:00
Belen Curcio 78e74336db Moderator Featured Tag/Button 2017-07-31 18:07:37 -03:00
Belen Curcio d330bf9c25 Merge branch 'master' of github.com:coralproject/talk into new-queue 2017-07-31 15:47:12 -03:00
Jeff Nelson 88f06744b4 unignore 2017-07-31 11:59:15 -04:00
Jeff Nelson 2c1cd50828 turn router method from get to post 2017-07-31 11:59:15 -04:00
Jeff Nelson 8c4612a4dd remove unused import 2017-07-31 11:59:15 -04:00
Jeff Nelson 4b13ccc5c1 enforce API key 2017-07-31 11:59:15 -04:00
Wyatt Johnson 12e48efa9f some docs updates 2017-07-31 14:11:40 +10:00
Kim Gardner 2af0f2bf65 Merge branch 'master' into new-queue 2017-07-28 14:03:05 -04:00
Belén Curcio eb44c55e05 Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-07-28 10:02:03 -03:00
Belen Curcio 4b0eeca08b Merge branch 'new-queue' of github.com:coralproject/talk into new-queue 2017-07-28 09:54:55 -03:00
Belen Curcio 0111e08bc1 lintin 2017-07-28 09:48:34 -03:00
Chi Vinh Le 7323c92b26 Optimize query during permalink view 2017-07-28 19:43:33 +07:00
Kim Gardner 673cb0ed04 Merge branch 'master' into basepath 2017-07-27 15:21:31 -04:00
Kim Gardner 75da26ff7a Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-07-27 13:02:53 -04:00
Belen Curcio 47d37e31d8 prefixing translations 2017-07-27 13:50:14 -03:00