Commit Graph

82 Commits

Author SHA1 Message Date
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 Curcio 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 46f17f5381 Fully working :) 2017-08-24 19:10:30 -03:00
Belen Curcio 5302d6d935 Markdown Editor Added and Working 2017-08-24 18:21:52 -03:00
Belen Curcio 3d0d5df139 Markdown Added 2017-08-24 18:16:32 -03:00
Wyatt Johnson 763f753928 Merge branch 'master' into refactor-global-dependencies 2017-08-23 11:56:35 -06:00
Chi Vinh Le c2b0a60d8a Remove global dependency on router history 2017-08-23 20:02:36 +07:00
Chi Vinh Le bf89409f60 Remove global dependency on Storage 2017-08-23 19:53:06 +07:00
Chi Vinh Le f428bfa6c9 WIP 2017-08-23 03:16:19 +07:00
Chi Vinh Le fccbcce7a8 Remove global dependency on registry and plugins 2017-08-23 01:41:58 +07:00
Chi Vinh Le 54ea0b1a3f Remove global dependency on store, rest, pym and apollo client 2017-08-22 22:04:49 +07:00
Belen Curcio 19dfe86118 Updates 2017-08-21 14:53:24 -03:00
Chi Vinh Le 74f778aef7 Merge branch 'master' into talk-provider
Conflicts:
	client/coral-embed-stream/src/containers/Embed.js
	plugin-api/beta/client/hocs/withReaction.js
2017-08-21 21:38:39 +07:00
Chi Vinh Le 84e4091ea6 Implement TalkProvider 2017-08-21 21:23:59 +07:00
Chi Vinh Le e77a8ce3c7 More comments 2017-08-18 22:36: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 ae81d5cb3c Optimize IfSlotIsX rendering 2017-08-16 22:43:48 +07:00
Chi Vinh Le 33aea66ff7 Refactor 2017-08-15 21:56:22 +07:00
Chi Vinh Le b63fce4ebc Optimize Slot rendering 2017-08-15 18:53:06 +07:00
Chi Vinh Le 5b751b7ba4 Fix Safari issues for popups 2017-08-01 20:32:49 +07:00
Chi Vinh Le cb95e9a308 Implement support for events 2017-07-21 22:54:45 +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
Chi Vinh Le b7c4dbd224 Remove CommonJS style exports in framework 2017-07-07 17:27:05 +07:00
Chi Vinh Le 49420e152e Click outside closes TopRightMenu, detect click outside iframe 2017-06-21 01:29:10 +07:00
Chi Vinh Le 035c00ee09 Only create Slot elements once, support Class Components as defaultComponent 2017-06-15 01:28:06 +07:00
Belen Curcio 60905bb99d Default Components for Slots 2017-06-14 13:02:51 -03:00
Kim Gardner 801d0a92af Merge branch 'master' into comment-stream-cleanup 2017-06-07 17:07:39 -04:00
Belen Curcio 8872248d63 Addiing Stable API Architecture 2017-06-07 13:10:17 -03:00
Belen Curcio d7dfae89a3 Global classNames, and more 2017-06-07 12:05:53 -03:00
IAmSamHankins cc76517ba8 minor copy changes in Configure tab on stream, and style updates to banned user message on stream 2017-06-06 17:37:14 -04:00
Belen Curcio 5faa92e8b3 Label style, top level comments, no offtopic replies 2017-06-06 08:09:34 -03:00
gaba 625362d51e Merge branch 'master' into i18n-refactor 2017-05-19 12:44:34 -07:00
gaba 9be443eda8 Moves i18n into coral-framework. 2017-05-19 12:28:44 -07:00
Chi Vinh Le f641a3ec40 Complete suspend user implementation 2017-05-19 01:52:03 +07:00
gaba 5bd9bc992b Move i18n into a service 2017-05-17 12:53:36 -07:00
Chi Vinh Le 2bdf413b88 Integrate into embed stream 2017-05-18 02:28:01 +07:00
gaba 423cb3cade Merge branch 'master' into i18n-refactor 2017-05-15 14:02:34 -07:00
gaba 633086cfa3 Fix a few more strings and translations. 2017-05-15 07:11:11 -07:00
Belen Curcio 57d2b81b05 missing _ 2017-05-10 16:05:52 -03:00
Belen Curcio 10e8a32c21 Changes 2017-05-10 15:57:21 -03:00
Belen Curcio c3dff79e6e Updated 2017-05-10 15:35:32 -03:00
Belen Curcio 8c219c1c4d Adding config with initial 2017-05-09 15:53:57 -03:00
Belen Curcio cc0a23c295 Deconstruct plugin config 2017-05-02 15:40:37 -03:00
Belen Curcio b444316e1c Adding debug plugins 2017-05-02 15:31:58 -03:00
gaba c0fc87ea21 Merge branch 'master' into i18n-refactor 2017-05-01 11:28:06 -07:00
Belen Curcio 37e093f60a Linting 2017-04-26 23:15:40 -03:00
Belen Curcio 06ba5a53c1 Stateless Slot 2017-04-26 22:33:49 -03:00