Commit Graph
267 Commits
Author SHA1 Message Date
Wyatt JohnsonandGitHub 55ebd1df8e Merge branch 'master' into view-context-no-tombstone 2017-09-15 17:16:07 -06:00
Chi Vinh Le f386909748 Don't show tombstone during "view context" 2017-09-16 01:36:15 +07:00
Chi Vinh Le aa4f781d25 Better error detection 2017-09-16 01:30:26 +07:00
Chi Vinh Le 4567b4565f Detect and display stream errors 2017-09-16 01:19:59 +07:00
Belén CurcioandGitHub b75539fb57 Merge branch 'master' into reject-instream 2017-09-08 17:47:09 -03:00
Belen Curcio 72530e7501 Linting and Indenting 2017-09-08 17:17:03 -03:00
Belen Curcio 790c20e7ac Indent 2017-09-08 17:14:15 -03:00
Belen Curcio 2cbd59b4b5 Featured comments error in permalink view, handling permaview moderation and handling replies moderation 2017-09-08 17:05:20 -03:00
Chi Vinh Le 4046b6e0a6 Remove zombie files 2017-09-09 00:20:18 +07:00
Belen Curcio f33c31c70e Merge branch 'master' of github.com:coralproject/talk into reject-instream 2017-09-08 13:49:54 -03:00
Belen Curcio fefacf039f Featured comments should have ACCEPTED status 2017-09-08 13:25:23 -03:00
Wyatt Johnson f69703a8ba fixed missing 2017-09-08 00:47:08 -06:00
Wyatt Johnson 2e350c2244 Merge branch 'master' into prop-types 2017-09-08 00:44:09 -06:00
Wyatt Johnson 2b91bcffda fixes #923 2017-09-07 13:49:22 -06:00
Belen Curcio f6b02a52fe Cache and Tombstoning rejected comment working 2017-09-07 13:08:52 -03: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 b61afbc1d6 Make rendering edit pure 2017-08-31 19:04:54 +07:00
Wyatt Johnson c8d1871418 Merge branch 'master' into lint-upgrade 2017-08-29 11:56:59 -06:00
Chi Vinh Le 90a0446afa Move Spinner down to replacing TabContent 2017-08-30 00:35:55 +07:00
Wyatt JohnsonandGitHub 30e6f1d169 Merge branch 'master' into lint-upgrade 2017-08-28 16:19:10 -06:00
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -06:00
Wyatt Johnson deb69d4e8c fixed prop-types deprecation 2017-08-28 12:03:20 -06:00
Belén CurcioandGitHub 3108f3dac3 Merge branch 'master' into subscriber 2017-08-28 12:22:05 -03:00
Belen Curcio 12d66a49d0 Adding commentAuthorTags 2017-08-28 12:17:01 -03:00
Chi Vinh Le e4490e20a7 Merge branch 'master' into user-sort
Conflicts:
	package.json
2017-08-28 18:16:18 +07: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
Belén CurcioandGitHub ce63942902 Merge branch 'master' into questionbox 2017-08-25 11:52:11 -03:00
Chi Vinh Le 6ae68a4f90 First working version 2017-08-25 19:21:57 +07:00
Belen Curcio 5cb71eaee8 Icon List for Question Box 2017-08-24 16:32:07 -03:00
Wyatt JohnsonandGitHub 763f753928 Merge branch 'master' into refactor-global-dependencies 2017-08-23 11:56:35 -06:00
Chi Vinh Le 89037a2e05 Refactor notification 2017-08-23 03:22:56 +07:00
Belen Curcio 19dfe86118 Updates 2017-08-21 14:53:24 -03:00
Belen Curcio 9028c1b4eb Adding fragment Slot 2017-08-21 12:15:53 -03:00
Belen Curcio 0ea2660c97 Adding new Slot: authorName - Deleting Old Code 2017-08-21 10:44:03 -03:00
Chi Vinh Le 4b9990e154 Merge branch 'master' into optimization
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/components/Stream.js
2017-08-18 23:30:28 +07:00
Chi Vinh Le e5156f7fc1 Integrate embed slot in to graphql framework 2017-08-18 21:36:14 +07:00
Chi Vinh Le 5e13af8282 Fix emit showMoreReplies event 2017-08-18 18:42:41 +07:00
Chi Vinh Le 0808f97fb5 Consider state when optimizing comment 2017-08-18 16:40:42 +07:00
Chi Vinh Le af4b01c2ae Correctly handly activeReplyBox optimization 2017-08-17 23:23:18 +07:00
Chi Vinh Le d228d49c7d Optimize rendering when activeReplyBox changes 2017-08-17 22:44:13 +07:00
Chi Vinh Le 7ea6d133c2 Filter queryData in withFragments and optimize rendering 2017-08-17 21:31:09 +07:00
Chi Vinh Le 1ff6c5bdcc Use comment container 2017-08-17 17:16:15 +07:00
Chi Vinh Le f8031be865 callback props from withMutation now keep their identity 2017-08-16 23:41:14 +07:00
Chi Vinh Le 4aa6b53022 PropTypes for StreamTabPanel 2017-08-16 22:32:44 +07:00
Chi Vinh Le 9ce6ab108a Refactor StreamTabPanel and use hoistStatics for all hocs 2017-08-16 22:15:31 +07:00
Chi Vinh Le 2b2e2f9b5f ClickOutside should only toggle action when open 2017-08-15 21:32:44 +07:00
Kim GardnerandGitHub a9ec160f95 Merge branch 'master' into emit-events-view-more 2017-08-09 10:52:59 +01:00
Wyatt JohnsonandGitHub 89e7f54a32 Merge branch 'master' into expose-comment-container-class 2017-08-09 11:24:18 +10:00
KiwiandGitHub 948d362c40 Merge branch 'master' into expose-avatar-container-class 2017-08-08 17:54:52 +02:00