Commit Graph
849 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 772e68f72e Merge branch 'master' into fix-vc 2017-07-25 14:26:04 -04:00
Chi Vinh Le 8ea8bb521a Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter 2017-07-26 00:06:20 +07:00
Belen Curcio 48dadd8571 Viewing Options for mobile 2017-07-25 14:00:30 -03:00
Chi Vinh Le 1473c778a5 Refactor listener 2017-07-25 23:26:23 +07:00
Belén CurcioandGitHub a7adf3469d Merge branch 'master' into event-emitter 2017-07-25 13:04:08 -03:00
Chi Vinh Le d4bf5fd423 Add subscription data events 2017-07-25 21:20:04 +07:00
Chi Vinh Le ef759e068b Adapt query helpers 2017-07-25 19:14:03 +07:00
Chi Vinh Le f10d1a9f0d Adapt auto scroll when loading a permalinked comment 2017-07-25 19:11:11 +07:00
Belen Curcio 36df7cb784 Extended Asset with comment 2017-07-24 16:31:24 -03:00
Kim GardnerandGitHub 661354998f Merge branch 'master' into event-emitter 2017-07-22 18:54:35 -04:00
Belen Curcio 6343a0d621 Adding tooltip to badges too 2017-07-21 16:01:43 -03:00
Chi Vinh Le 7b1c0dfbaa Docs & stuff 2017-07-22 00:05:36 +07:00
Chi Vinh Le 8b582e85f8 No redux prefix 2017-07-21 23:42:10 +07:00
Chi Vinh Le f5d4b7216e Merge branch 'master' into event-emitter 2017-07-21 22:57:51 +07:00
Chi Vinh Le cb95e9a308 Implement support for events 2017-07-21 22:54:45 +07:00
Chi Vinh Le 65500eda64 Remove remaining username alias in post comment mutation 2017-07-21 03:57:32 +07:00
Chi Vinh Le d6adff288c Fix typo 2017-07-20 02:51:09 +07:00
Chi Vinh Le baa4808364 Allow setting default stream tab 2017-07-20 02:16:19 +07:00
Chi Vinh Le 673f0cd232 Hide featured comments tab when empty 2017-07-20 02:07:40 +07:00
Chi Vinh Le 84edd8c6c2 Merge branch 'master' into featured-comments
Conflicts:
	client/coral-embed-stream/src/components/Stream.js
2017-07-20 01:30:22 +07:00
Belén CurcioandGitHub d61374993a Merge branch 'master' into excludeIf-api 2017-07-19 11:47:51 -03:00
Chi Vinh Le 4511b9ca57 Merge branch 'resolve-slot-fragments-lazy' into featured-comments
Conflicts:
	client/coral-embed-stream/src/containers/Stream.js
	client/coral-framework/utils/index.js
	plugin-api/beta/client/utils/index.js
2017-07-19 21:15:35 +07:00
Chi Vinh Le d99f6d8923 Support lazily resolving slot fragments 2017-07-19 20:44:22 +07:00
Chi Vinh Le 3b10aa3945 Implement 'Go to conversation' 2017-07-19 00:33:01 +07:00
Chi Vinh Le 760d078705 Embed scroll to correct element 2017-07-18 23:00:12 +07:00
Chi Vinh Le 6652368221 Don't export internals of embed stream in plugin-api (for now) 2017-07-18 21:04:30 +07:00
Chi Vinh Le 19929c97d8 Fix layout issues in comment 2017-07-18 20:17:01 +07:00
Chi Vinh Le 99fc67d0d9 Rename insertSorted to insertCommentSorted 2017-07-18 19:38:52 +07:00
Chi Vinh Le 4ee727c86a Fix inconsistent query state 2017-07-18 18:27:58 +07:00
Chi Vinh Le 8c7c564a30 Allow comment slots to extend the asset fragment + harmonize slot props 2017-07-18 15:23:02 +07:00
Chi Vinh Le d2e6a98d46 connect aware "excludeIf" using our own hoc 2017-07-17 18:06:51 +07:00
Chi Vinh Le fb2662572a Implement excludeIf for the plugins API 2017-07-17 17:06:12 +07:00
Belen Curcio a8467db7aa Handling cache and mutations 2017-07-14 14:57:34 -03:00
Belen Curcio 94032b69fc Missing asset 2017-07-14 11:34:20 -03:00
Belen Curcio 1f199ad3dd Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-14 11:31:58 -03:00
Belen Curcio b5ce16a33b Styling 2017-07-13 16:56:40 -03:00
Belen Curcio 1b97811cb0 Querying by featured comments 2017-07-13 15:30:06 -03:00
Chi Vinh Le 28e94d30b0 Only show seperator on top-level comments 2017-07-13 23:00:52 +07:00
Chi Vinh Le 1c2fec29a4 Merge branch 'master' into talk-plugin-avatar
Conflicts:
	client/coral-embed-stream/src/components/Comment.css
2017-07-13 22:58:35 +07:00
Belen Curcio 1541a618b5 Reordering divs 2017-07-13 12:29:06 -03:00
Belen Curcio bfbe8d44aa Merg 2017-07-13 12:05:53 -03:00
Belen Curcio da6965122f Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-13 12:04:04 -03:00
Belen Curcio 3d80df1db6 Support for empty slot 2017-07-13 11:37:54 -03:00
Chi Vinh Le 83832abd72 More fixes 2017-07-13 21:37:08 +07:00
Chi Vinh Le 1280b16bcd Remove some global css, fix some styling issues 2017-07-13 20:47:30 +07:00
Belen Curcio f5313c0aed Merge branch 'master' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 15:00:03 -03:00
Belen Curcio c3ad47f6f6 Linting 2017-07-12 14:49:46 -03:00
Chi Vinh Le ea51fdf6cc Styles glitches quick fix 2017-07-13 00:39:55 +07:00
Belen Curcio 9065a64d13 Merge branch 'master' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 14:33:00 -03:00
Chi Vinh Le 7f85129044 Merge branch 'master' into extendable-tab-menu
Conflicts:
	client/coral-embed-stream/src/components/Embed.js
	client/coral-embed-stream/style/default.css
	client/coral-framework/helpers/plugins.js
	client/coral-plugin-replies/ReplyButton.css
	client/coral-plugin-replies/ReplyButton.js
	plugins/coral-plugin-like/client/LikeButton.js
	plugins/coral-plugin-like/client/styles.css
	plugins/coral-plugin-love/client/LoveButton.js
	plugins/coral-plugin-love/client/styles.css
2017-07-12 22:38:05 +07:00