 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 |
|
|
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 |
|
|
Chi Vinh Le
|
362c072181
|
If only one tab left make it not clickable
|
2017-07-10 17:03:07 +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 |
|
|
Belén Curcio
|
e819b96473
|
Merge branch 'master' into create-plugin
|
2017-07-09 12:21:49 -03:00 |
|
|
Kiwi
|
7baa551a5c
|
Merge branch 'master' into rm-commonjs-framework
|
2017-07-07 12:39:00 +02: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 |
|
|
Kiwi
|
f32c03f002
|
Merge branch 'master' into threading-cleanup
|
2017-07-05 17:13:43 +02:00 |
|
|
Chi Vinh Le
|
693879647e
|
Cleanup
|
2017-07-05 22:11:55 +07:00 |
|
|
Kim Gardner
|
65d6d3221b
|
Merge branch 'master' into french-translation
|
2017-07-05 15:36:14 +01:00 |
|
|
Kim Gardner
|
c976ba0ea4
|
Merge branch 'master' into french-translation
|
2017-07-05 09:17:36 +01:00 |
|
|
Chi Vinh Le
|
6d71bcbee9
|
Fix styling issues
|
2017-07-04 22:56:58 +07:00 |
|
|
Chi Vinh Le
|
9be2a520db
|
Merge branch 'master' into threading
|
2017-07-04 22:42:49 +07:00 |
|
|
Chi Vinh Le
|
d155615102
|
Add pending comment
|
2017-07-04 22:41:38 +07:00 |
|
|
Chi Vinh Le
|
cfa7a74742
|
Fix isSlotEmpty logic and handle empty plugin_config
|
2017-07-04 22:22:52 +07:00 |
|
|
Chi Vinh Le
|
524be1b869
|
Allow customizing thread levels via TALK_THREADING_LEVEL env
|
2017-07-04 22:10:40 +07:00 |
|
|
Chi Vinh Le
|
31ab54d13c
|
First round styling
|
2017-07-04 21:32:33 +07:00 |
|
|
David Erwin
|
79c1bd9bdd
|
Merge branch 'master' into dont-show-popup-when-empty
|
2017-07-03 14:35:44 -04:00 |
|
|
Chi Vinh Le
|
3a2a4379b8
|
Change to 4 levels
|
2017-07-04 01:09:27 +07:00 |
|
|
Chi Vinh Le
|
f1899f2f4a
|
Threading support
|
2017-07-04 01:09:12 +07: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
|
7858ccc45d
|
Switch to prop-types
|
2017-06-30 23:25:11 +07:00 |
|