Commit Graph

217 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 a2dabcac0e Hide action labels on mobile 2017-07-11 01:26:25 +07:00
Chi Vinh Le 8960f67a4d Add todo comments 2017-07-10 22:49:06 +07:00
Chi Vinh Le ae52b27009 Don't use div inside p 2017-07-10 21:53:55 +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
Chi Vinh Le ef172ae5f8 Change streamBox to streamFilter 2017-07-10 17:03:07 +07:00
Chi Vinh Le 1e4e1cb413 Implement Stream TabBar 2017-07-10 17:03:06 +07:00
Belen Curcio 2a9535f88a Featured Comment Styles 2017-07-05 12:28:09 -03:00
Belen Curcio f9bece468f Merge branch 'master' of github.com:coralproject/talk into featured-comments 2017-07-05 12:19:09 -03:00
Kim Gardner 65d6d3221b Merge branch 'master' into french-translation 2017-07-05 15:36:14 +01:00
Belen Curcio 3ca62cab65 wip 2017-07-05 11:36:03 -03:00
Kim Gardner c976ba0ea4 Merge branch 'master' into french-translation 2017-07-05 09:17:36 +01:00
Chi Vinh Le 31ab54d13c First round styling 2017-07-04 21:32:33 +07:00
Belen Curcio 34dbbb0984 Removing Best from the core 2017-07-03 15:27:08 -03:00
Belen Curcio 002dc377a6 Featured Comments container, and FeaturedComment component 2017-07-03 13:31:13 -03:00
Belen Curcio fbdb044551 Moving withTags to the plugin api, adding perms to Feature comments 2017-07-03 11:55:09 -03:00
Belen Curcio 23ebe9f8e3 Translations and functionality 2017-07-03 11:46:34 -03:00
Belen Curcio e3aecd645e Ádding withTags hoc, and creating withTags buttons 2017-07-03 10:16:35 -03:00
Belen Curcio 95e820e9de Creating Tag Featured 2017-07-03 09:25:18 -03:00
Kim Gardner 997dffd326 Merge branch 'master' into permalink-id 2017-06-29 17:30:38 +01:00
Kim Gardner 867f6966ba Update dependencies to fix build 2017-06-29 16:52:01 +01:00
Belen Curcio 0312530b86 Modifying permalink plugin 2017-06-29 10:20:33 -03:00
Kim Gardner 1b40521f88 Merge branch 'master' into live-suspension 2017-06-27 17:53:58 +01: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
Belen Curcio bee1cc124c renamed to talk 2017-06-26 16:26:05 -03:00
Belen Curcio 2ac6ad8eb8 Using the plugin api 2017-06-26 16:16:40 -03:00
Belen Curcio fa9a4ecc50 Clearing the timeout 2017-06-26 16:08:32 -03:00
Belen Curcio b00d2f569e Removing styles from default.css 2017-06-26 16:01:07 -03:00
Belen Curcio 5e1450ffb0 Renaming to talk 2017-06-26 15:46:53 -03:00
Belen Curcio a14e4859a9 refactor 2017-06-26 14:49:24 -03:00
Belen Curcio fedca113d2 Adding plugin 2017-06-26 11:50:51 -03:00
Chi Vinh Le a088827568 Use new import path for coral-ui 2017-06-15 18:31:53 +07:00
Chi Vinh Le c30d05fd6c Switch all plugins to components/ui 2017-06-15 01:21:12 +07:00
Belen Curcio b40d592819 import lint 2017-06-14 13:27:06 -03:00
Belen Curcio 25376bd00f replacing coral-ui in plugins 2017-06-14 13:22:03 -03:00
Belen Curcio 5633dd27fc Link should be target blank 2017-06-13 15:53:59 -03:00
Belen Curcio fd2fcb4ed9 Parent target 2017-06-13 15:28:18 -03:00
Belen Curcio b8c5461b90 Adding react-linkify 2017-06-13 15:13:26 -03:00
Belen Curcio 65f7ee2ab3 coral-plugin-commnet-content 2017-06-12 19:09:42 -03:00
Chi Vinh Le 2a283a9a5a Support live updates 2017-06-12 23:21:27 +07:00
Chi Vinh Le 74ad3c3a35 Refactor all reactions and encapsulate server code 2017-06-12 17:02:14 +07:00
gaba d22f5215ed Adding french translation to the auth plugin. 2017-06-09 16:09:13 -07:00
Kiwi 66c9e0e232 Merge branch 'master' into port-perm-checks 2017-06-09 16:59:48 +07:00
Chi Vinh Le 8eb8010a33 Implement Response interface 2017-06-08 23:54:08 +07:00
Belen Curcio 1f261f5216 Fully working 2017-06-08 12:35:42 -03:00
Belen Curcio 15b5dc2236 Linting 2017-06-08 11:58:38 -03:00
Belen Curcio ef43ba3a35 new merge conflicts to master 2017-06-08 11:55:06 -03:00
Chi Vinh Le fb39446c6a Port perm checks to the new framework 2017-06-08 18:28:46 +07:00