 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 |
|
|
Chi Vinh Le
|
706a12d2e2
|
No MoreMore
|
2017-06-21 02:48:59 +07:00 |
|
|
Chi Vinh Le
|
fc14e9d2fd
|
Prevent double execution of fetchMore
|
2017-06-21 01:29:10 +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
|
23fcba4ccc
|
Don't show caret when logged out
|
2017-06-20 19:55:53 +07:00 |
|
|
Chi Vinh Le
|
14311dc298
|
Merge branch 'master' into subscribe-mod-actions
Conflicts:
client/coral-admin/src/routes/Moderation/components/Comment.js
|
2017-06-20 19:34:56 +07:00 |
|
|
Chi Vinh Le
|
523f23269b
|
Translate, pep up notifications
|
2017-06-20 01:38:38 +07:00 |
|
|
Belen Curcio
|
1f2eca300a
|
Report vbox
|
2017-06-19 14:55:58 -03:00 |
|
|
Belen Curcio
|
3c99b8e7fb
|
Sign In Button Position
|
2017-06-19 14:35:26 -03:00 |
|
|
Belen Curcio
|
073fccebd3
|
Show likes
|
2017-06-19 14:30:56 -03:00 |
|
|
IAmSamHankins
|
dcee2a4438
|
adjust comment stream sizing to allow for chrome focus state
|
2017-06-16 15:00:42 -04:00 |
|
|
Belen Curcio
|
25376bd00f
|
replacing coral-ui in plugins
|
2017-06-14 13:22:03 -03:00 |
|
|
Belen Curcio
|
60905bb99d
|
Default Components for Slots
|
2017-06-14 13:02:51 -03:00 |
|
|
Belen Curcio
|
65f7ee2ab3
|
coral-plugin-commnet-content
|
2017-06-12 19:09:42 -03:00 |
|
|
KiwiandGitHub
|
66c9e0e232
|
Merge branch 'master' into port-perm-checks
|
2017-06-09 16:59:48 +07:00 |
|
|
Chi Vinh Le
|
428246cbe2
|
Make it work without iframe
|
2017-06-09 01:16:39 +07:00 |
|
|
Belen Curcio
|
283c13fae8
|
Ádding typenames to update the store
|
2017-06-08 12:43:02 -03:00 |
|
|
Belen Curcio
|
8d5085b7a3
|
Merge branch 'master' of github.com:coralproject/talk into 142993479-tags
|
2017-06-08 12:39:10 -03:00 |
|
|
Belen Curcio
|
1f261f5216
|
Fully working
|
2017-06-08 12:35:42 -03:00 |
|
|
Kim GardnerandGitHub
|
177edf8ed8
|
Merge branch 'master' into port-perm-checks
|
2017-06-08 11:10:05 -04:00 |
|
|
Belen Curcio
|
82a72e506f
|
Off-topic and Staff working
|
2017-06-08 12:04:33 -03:00 |
|
|
Belen Curcio
|
15b5dc2236
|
Linting
|
2017-06-08 11:58:38 -03:00 |
|
|
Belen Curcio
|
38077cf3cf
|
Missing fragment
|
2017-06-08 11:56:38 -03:00 |
|
|
Belen Curcio
|
ef43ba3a35
|
new merge conflicts to master
|
2017-06-08 11:55:06 -03:00 |
|
|
Chi Vinh Le
|
d61ede2396
|
Fix bugs related to reply box
|
2017-06-08 18:44:07 +07:00 |
|
|
Chi Vinh Le
|
fb39446c6a
|
Port perm checks to the new framework
|
2017-06-08 18:28:46 +07:00 |
|
|
Kim GardnerandGitHub
|
801d0a92af
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 17:07:39 -04:00 |
|
|
Belen Curcio
|
63a35cbceb
|
Merge issues
|
2017-06-07 16:38:36 -03:00 |
|
|
Kim GardnerandGitHub
|
14a35033da
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 14:33:29 -04:00 |
|
|
Chi Vinh Le
|
4e56406c37
|
Fix tabsize in css
|
2017-06-08 00:49:18 +07:00 |
|
|
Chi Vinh Le
|
66e4f02a1a
|
Selectors, resolving merge errors, better class names, removing comment reducer
|
2017-06-08 00:29:05 +07:00 |
|
|
IAmSamHankins
|
c3d76c6a4f
|
messaging style updates, and update to translation files.
|
2017-06-07 12:55:40 -04:00 |
|
|
Belen Curcio
|
87ddfea689
|
indexes css
|
2017-06-07 13:53:33 -03:00 |
|
|
Belen Curcio
|
847a30ff92
|
Adding correct classNames
|
2017-06-07 13:19:36 -03:00 |
|
|
Chi Vinh Le
|
7a2fd95eca
|
Merge branch 'master' into off-topic-features
Conflicts:
client/coral-embed-stream/src/components/Comment.css
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/components/Stream.js
client/coral-embed-stream/src/reducers/index.js
client/coral-framework/helpers/plugins.js
|
2017-06-07 22:37:06 +07:00 |
|
|
Belen Curcio
|
d7dfae89a3
|
Global classNames, and more
|
2017-06-07 12:05:53 -03:00 |
|
|
Belen Curcio
|
4725f07757
|
Viewing Options state and name conventions
|
2017-06-07 09:53:53 -03:00 |
|
|
Belen Curcio
|
e24f6ca9f1
|
Renaming to commentClassNames
|
2017-06-07 09:28:12 -03:00 |
|
|
Chi Vinh Le
|
ceb99cf205
|
Better refetch detection
|
2017-06-07 17:45:33 +07:00 |
|
|
Belen Curcio
|
b5c9e92cc6
|
Adding streamBox slot and coral-plugin-viewing-options 🎉
|
2017-06-06 20:42:42 -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
|
1c7ad9a8ac
|
Plugin reducers working again with reducer name
|
2017-06-06 17:29:56 -03:00 |
|
|
Belen Curcio
|
4aa7900769
|
Not connecting comment Component to the Store
|
2017-06-06 17:09:13 -03:00 |
|
|
Belen Curcio
|
b5a64bd2f9
|
Filter State
|
2017-06-06 15:45:56 -03:00 |
|
|
Chi Vinh Le
|
c50fe9f91d
|
Merge branch 'master' into subscribe-to-comments
Conflicts:
client/coral-embed-stream/src/components/Comment.js
|
2017-06-06 23:44:27 +07:00 |
|
|
Riley Davis
|
6fcd003e76
|
remove console.log
|
2017-06-06 10:32:14 -06:00 |
|