Commit Graph

2742 Commits

Author SHA1 Message Date
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
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
Kim Gardner 245561bd52 Merge branch 'master' into talk-plugin-avatar 2017-07-13 11:42:59 -04:00
Kim Gardner 5d118c26d1 Merge branch 'master' into styles-fixes-2 2017-07-13 11:42:04 -04:00
Chi Vinh Le b79c990ee5 Only setState once 2017-07-13 22:34:53 +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 518b7b5358 merge 2017-07-12 15:04:24 -03: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 39db11569f Merge branch 'talk-plugin-avatar' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-12 14:52:18 -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
Kim Gardner 202e7a2b10 Merge branch 'master' into talk-plugin-avatar 2017-07-11 16:33:21 -04:00
Kim Gardner da7aa8f6d0 Merge branch 'master' into talk-plugin-avatar 2017-07-11 13:46:41 -04:00
Kim Gardner b04a477f6a Merge branch 'master' into adapt-embed-classnames 2017-07-11 13:44:51 -04:00
Chi Vinh Le 40f4419c9d Add flagged unflagged CSS classnames 2017-07-11 21:54:35 +07:00
Chi Vinh Le 8b70dc688d Adapt CSS classnames for Embed 2017-07-11 21:03:27 +07:00
Chi Vinh Le b05a6c00ce Correct aria-controls 2017-07-11 20:37:19 +07:00
Kim Gardner 01fd667eb4 Merge branch 'master' into talk-plugin-avatar 2017-07-11 08:17:49 -04:00
Kim Gardner 73ac8d16ef Merge branch 'master' into create-plugin 2017-07-11 08:13:59 -04:00
Kim Gardner ffad851066 Merge branch 'master' into fix-permalink-live-update 2017-07-11 07:49:16 -04:00
Belen Curcio 666225614b Merge branch 'talk-plugin-avatar' of github.com:coralproject/talk into talk-plugin-avatar 2017-07-10 17:06:57 -03:00
Belen Curcio 636f357186 Reverting changes from old branch 2017-07-10 17:06:40 -03:00
Belén Curcio be6337f17c Merge branch 'master' into talk-plugin-avatar 2017-07-10 17:05:56 -03:00
Belen Curcio f09550a4ac Avatar plugin support extending fragments 2017-07-10 16:56:46 -03:00
Belen Curcio 3c3a0523de Avatar support 2017-07-10 16:27:15 -03:00
Chi Vinh Le a2dabcac0e Hide action labels on mobile 2017-07-11 01:26:25 +07:00
Chi Vinh Le e10c1f1a1f Docs 2017-07-10 22:45:28 +07:00
Chi Vinh Le 55e70dfbec Fix perma view live updates 2017-07-10 22:13:04 +07:00
Chi Vinh Le af46e3a7b1 Merge branch 'master' into extendable-tab-menu
Conflicts:
	client/coral-embed-stream/src/components/Comment.js
2017-07-10 22:03:32 +07:00
Chi Vinh Le 883dfedfab Fix new count styles 2017-07-10 21:57:25 +07:00
Chi Vinh Le 34a4a005d1 Add margin to highlighted comment 2017-07-10 21:12:52 +07:00
Chi Vinh Le ab72995a2c Implement streamTabs and streamTabPanes slot 2017-07-10 20:46:28 +07:00
Chi Vinh Le aac47c4686 Add margin 2017-07-10 17:57:45 +07:00