 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 |
|
|
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 |
|
|
Belén CurcioandGitHub
|
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
|
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
|
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 |
|
|
KiwiandGitHub
|
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 |
|
|
Chi Vinh Le
|
693879647e
|
Cleanup
|
2017-07-05 22:11:55 +07:00 |
|
|
Chi Vinh Le
|
d155615102
|
Add pending comment
|
2017-07-04 22:41:38 +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 |
|
|
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
|
7858ccc45d
|
Switch to prop-types
|
2017-06-30 23:25:11 +07:00 |
|
|
Chi Vinh Le
|
e244d4a286
|
Merge branch 'master' into button-states
Conflicts:
client/coral-embed-stream/src/components/Stream.js
|
2017-06-30 17:46: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 |
|
|
Belen Curcio
|
2289c405d1
|
Translatios
|
2017-06-29 13:25:50 -03:00 |
|
|
Belen Curcio
|
db9c3b45c1
|
Stream Error
|
2017-06-29 11:06:52 -03:00 |
|
|
Belen Curcio
|
ddac5c2c85
|
Avoid Error due to invalid queries
|
2017-06-29 10:48:29 -03:00 |
|
|
Chi Vinh Le
|
b92afff4e7
|
Don't alias username 2
|
2017-06-28 21:14:34 +07:00 |
|
|
KiwiandGitHub
|
b7a981e84b
|
Merge branch 'master' into no-username-alias
|
2017-06-28 16:37:01 +07:00 |
|
|
Kim Gardner
|
3f03994a51
|
Merge branch 'master' into flag-reason
|
2017-06-28 10:27:48 +01:00 |
|
|
KiwiandGitHub
|
aff486e909
|
Merge branch 'master' into no-username-alias
|
2017-06-28 16:22:12 +07:00 |
|
|
Belén CurcioandGitHub
|
04b562543e
|
Merge branch 'master' into flag-reason
|
2017-06-27 16:53:56 -03:00 |
|
|
Belen Curcio
|
35ccc5070d
|
Flag refactor
|
2017-06-27 14:52:12 -03:00 |
|
|
KiwiandGitHub
|
2338ff1694
|
Merge branch 'master' into no-username-alias
|
2017-06-28 00:15:14 +07:00 |
|
|
Chi Vinh Le
|
b134d4099c
|
More concise and functional subscribing
|
2017-06-28 00:13:47 +07:00 |
|
|
Kim GardnerandGitHub
|
1b40521f88
|
Merge branch 'master' into live-suspension
|
2017-06-27 17:53:58 +01:00 |
|
|
Chi Vinh Le
|
97ab338486
|
Don't alias username
|
2017-06-27 23:51:49 +07:00 |
|
|
Chi Vinh Le
|
b67ac375ba
|
Pass current user to CommentBox
|
2017-06-27 22:14:06 +07:00 |
|
|
Chi Vinh Le
|
500d5d582e
|
Fix edit
|
2017-06-27 21:51:19 +07:00 |
|
|
Chi Vinh Le
|
175dd30d27
|
Keep comment box when user is degraded (live)
|
2017-06-27 21:40:48 +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 |
|
|
Belen Curcio
|
fedca113d2
|
Adding plugin
|
2017-06-26 11:50:51 -03:00 |
|
|
KiwiandGitHub
|
83096dbcce
|
Merge branch 'master' into bug-sweep
|
2017-06-22 00:52:30 +07: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
|
57ecba6f33
|
Remove unessecary binds
|
2017-06-21 21:36:27 +07:00 |
|
|
Chi Vinh Le
|
f709057933
|
Require username to be different when editing it
|
2017-06-21 21:18:28 +07:00 |
|
|
Chi Vinh Le
|
420513804c
|
Show correct notification message when edit fails
|
2017-06-21 19:37:19 +07:00 |
|