wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-07 18:54:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,197 Commits 10 Branches 125 Tags
6e6caaf5a94d0bf5e8a080bb0fdd09ddee97d8ca
Commit Graph

796 Commits

Author SHA1 Message Date
Belén Curcio 7ac3a325f7 Merge branch 'master' into featured-comments-info 2017-07-21 05:43:05 -03:00
Belen Curcio 11ea45ef69 typo with white space 2017-07-21 05:21:13 -03:00
Chi Vinh Le 1f8f293594 Disable false-positive warnings 2017-07-21 04:17:47 +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
Chi Vinh Le cc1026233f Merge branch 'recursively-resolve-fragments' into featured-comments 2017-07-19 23:32:04 +07:00
Chi Vinh Le dcdfbb691a Use lazy loading for slot fragments 2017-07-19 23:30:51 +07:00
Chi Vinh Le 55ff0bcf8c Recursively resolve fragments 2017-07-19 22:58:27 +07:00
Belén Curcio 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 52cd7bcce4 Expose getSlotFragmentSpread in plugin-api 2017-07-19 20:59:03 +07:00
Chi Vinh Le 5fee26da0e Document getSlotFragmentSpreads 2017-07-19 20:50:00 +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 46473142ba Use generic version of addTag, removeTag in framework 2017-07-18 21:23:39 +07:00
Chi Vinh Le 8a619a219f Refactor isFeatured / isTagged 2017-07-18 21:10:59 +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 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 1f199ad3dd Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-14 11:31:58 -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 518b7b5358 merge 2017-07-12 15:04:24 -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
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