Commit Graph

775 Commits

Author SHA1 Message Date
Belen Curcio da6965122f Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-13 12:04:04 -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
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 ab72995a2c Implement streamTabs and streamTabPanes slot 2017-07-10 20:46:28 +07:00
Chi Vinh Le 1e4e1cb413 Implement Stream TabBar 2017-07-10 17:03:06 +07:00
Belén Curcio e819b96473 Merge branch 'master' into create-plugin 2017-07-09 12:21:49 -03:00
Chi Vinh Le b7c4dbd224 Remove CommonJS style exports in framework 2017-07-07 17:27:05 +07:00
Belen Curcio 60608af8b2 Filter out the ones that have slots 2017-07-06 11:40:35 -03:00
Belen Curcio 7c753ee518 create-plugin 2017-07-05 16:41:52 -03:00
Belen Curcio f9bece468f Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-05 12:19:09 -03:00
Belen Curcio da6bd80de0 Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-05 11:07:42 -03:00
Kim Gardner c976ba0ea4 Merge branch 'master' into french-translation 2017-07-05 09:17:36 +01:00
Chi Vinh Le cfa7a74742 Fix isSlotEmpty logic and handle empty plugin_config 2017-07-04 22:22:52 +07:00
David Erwin 79c1bd9bdd Merge branch 'master' into dont-show-popup-when-empty 2017-07-03 14:35:44 -04:00
Belen Curcio ec559f0f23 Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-03 15:32:40 -03:00
Belen Curcio 34dbbb0984 Removing Best from the core 2017-07-03 15:27:08 -03:00
Chi Vinh Le fd1f8b24c1 Don't show popup when empty 2017-07-03 19:40:26 +07:00
Chi Vinh Le 270c3b7634 Disable plugin components via plugin_config 2017-07-03 19:01:17 +07:00
Chi Vinh Le 9de99a9ef4 Support post, reply, edit, load and view more loading states via global css classnames 2017-06-30 17:00:42 +07:00
Chi Vinh Le db3187cb56 Merge branch 'master' into live-suspension 2017-06-27 20:08:53 +07:00
Chi Vinh Le c90c177b7c Live update on stream when banned user, suspended user or rejected username 2017-06-27 20:06:27 +07:00
Chi Vinh Le 8bb38c5ee5 Refactor and reuse "Actions" in "Moderate" and "Community" 2017-06-22 21:50:19 +07:00
Kiwi 83096dbcce Merge branch 'master' into bug-sweep 2017-06-22 00:52:30 +07:00
Chi Vinh Le c0e9e4272b Merge branch 'master' into bug-killing-spree
Conflicts:
	client/coral-admin/src/routes/Moderation/components/UserDetail.js
2017-06-22 00:46:17 +07:00
Belén Curcio 358ea0d37c Merge branch 'master' into bug-sweep 2017-06-21 14:35:50 -03:00
Belen Curcio 85dcc8d0ec Merge branch 'master' of github.com:coralproject/talk into copy 2017-06-21 13:28:33 -03:00
Chi Vinh Le 3beb62f837 Merge branch 'master' into bug-killing-spree
Conflicts:
	client/coral-admin/src/routes/Moderation/components/UserDetail.js
2017-06-21 21:47:01 +07:00
Chi Vinh Le 4b063607ab Return the returns 2017-06-21 20:04:38 +07:00
Chi Vinh Le 9815248b8d Prevent errors being swallowed 2017-06-21 19:17:48 +07:00
Chi Vinh Le 49420e152e Click outside closes TopRightMenu, detect click outside iframe 2017-06-21 01:29:10 +07:00
Belen Curcio 942ea7b916 ButtonCopyToClipboard 2017-06-20 10:37:10 -03:00
Belen Curcio d97fb0a83f Refs by ReactDOMNode 2017-06-20 09:47:37 -03:00
Belen Curcio 7faa00c463 withCopyToClipboard 2017-06-20 09:05:01 -03:00
Belen Curcio fe8f3ae4bb Moving Copy component 2017-06-20 08:32:08 -03:00
Chi Vinh Le 2a28306ab2 Merge branch 'master' into subscribe-mod-actions 2017-06-19 21:17:33 +07:00
Max Eddy 64174b97af Cleanup 2017-06-16 13:04:27 -04:00
Max Eddy fe0c581ea9 Note logout action as well for onAuthChanged event. 2017-06-16 13:04:27 -04:00
Max Eddy 4982d8a9ad Use REST API result for check login message. 2017-06-16 13:04:27 -04:00
Max Eddy 6139828844 Send post message with auth state to parent window. 2017-06-16 13:04:27 -04:00
Chi Vinh Le 035c00ee09 Only create Slot elements once, support Class Components as defaultComponent 2017-06-15 01:28:06 +07:00
Chi Vinh Le 3658a804b0 Implement live updates for mod actions 2017-06-15 01:08:25 +07:00
Belen Curcio 787ba75ede Merge branch 'comment-link' of github.com:coralproject/talk into comment-link 2017-06-14 13:12:07 -03:00
Belen Curcio 60905bb99d Default Components for Slots 2017-06-14 13:02:51 -03:00
Chi Vinh Le aed265efcc Use correct fragment name 2017-06-13 22:01:58 +07:00
Chi Vinh Le 2a283a9a5a Support live updates 2017-06-12 23:21:27 +07:00
Kiwi 8d24dcd58d Merge branch 'master' into port-perm-checks 2017-06-09 17:49:18 +07:00
Chi Vinh Le c7ca3c5e4a Reset websocket after successful login 2017-06-09 17:26:42 +07:00
Kiwi 66c9e0e232 Merge branch 'master' into port-perm-checks 2017-06-09 16:59:48 +07:00
Wyatt Johnson 140f980c14 Merge branch 'master' into subscription-fixes 2017-06-08 15:09:37 -06:00
Wyatt Johnson 32708e9098 submscription fixes 2017-06-08 15:08:18 -06:00