 Riley Davis
|
c8a0ded4ad
|
try to just add recaptcha manually
use react-recaptcha
remove recaptcha file
|
2017-03-20 07:36:21 -07:00 |
|
|
riley
|
ca07406b1a
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 07:36:20 -07:00 |
|
|
Riley Davis
|
6b332fbde1
|
Merge pull request #404 from coralproject/keyboard-shortcut-scroll
Scrolling to keep selected comments in view.
|
2017-03-20 07:36:19 -07:00 |
|
|
Riley Davis
|
f8b3c5752e
|
Merge branch 'master' into keyboard-shortcut-scroll
|
2017-03-20 07:36:19 -07:00 |
|
|
Riley Davis
|
46e8d30e22
|
scrollIntoView will work in more browsers
|
2017-03-20 07:36:18 -07:00 |
|
|
David Jay
|
ae4bae6cd2
|
Scrolling to keep selected comments in view.
|
2017-03-20 07:36:17 -07:00 |
|
|
David Erwin
|
2ee6335328
|
Merge pull request #409 from coralproject/revert-version-pin
Removed the version pin
|
2017-03-20 07:33:00 -07:00 |
|
|
Wyatt Johnson
|
894395bc65
|
Resolved #357
|
2017-03-20 07:32:59 -07:00 |
|
|
David Erwin
|
ebf675bf2c
|
Merge pull request #405 from coralproject/asset-comment-total-count
Added support for total comment count
|
2017-03-20 07:32:58 -07:00 |
|
|
David Erwin
|
30380ed5d7
|
Merge branch 'master' into asset-comment-total-count
|
2017-03-20 07:32:58 -07:00 |
|
|
David Erwin
|
408a74ad4d
|
Merge pull request #408 from coralproject/widen-notifications
make notifications wider
|
2017-03-20 07:32:57 -07:00 |
|
|
Riley Davis
|
09e7f483d1
|
Merge pull request #403 from coralproject/bugfix-ban-dialog-language
Hiding rejected note on ban dialog for rejected comments.
|
2017-03-20 07:32:56 -07:00 |
|
|
David Erwin
|
fe6e6fbd2f
|
Merge branch 'master' into widen-notifications
|
2017-03-20 07:32:56 -07:00 |
|
|
Riley Davis
|
eab5832457
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:32:55 -07:00 |
|
|
David Jay
|
a243310ecd
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:32:54 -07:00 |
|
|
gaba
|
be351e46fd
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:32:06 -07:00 |
|
|
Riley Davis
|
e5c108f8fb
|
make notifications wider
|
2017-03-20 07:29:09 -07:00 |
|
|
David Erwin
|
2f86b9eecf
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:29:09 -07:00 |
|
|
Wyatt Johnson
|
fcc93963c4
|
Added support for total comment count
|
2017-03-20 07:29:08 -07:00 |
|
|
Riley Davis
|
117b73adf7
|
Merge pull request #398 from coralproject/widget-auto-update
Auto-update Dashboard
|
2017-03-20 07:29:07 -07:00 |
|
|
Riley Davis
|
587ee82787
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:29:07 -07:00 |
|
|
Riley Davis
|
66efbf89d4
|
Merge pull request #401 from coralproject/remove-notification-warning
incorrectly using dispatch now that we do pym directly
|
2017-03-20 07:29:06 -07:00 |
|
|
David Jay
|
88538d7b64
|
Merge branch 'master' into remove-notification-warning
|
2017-03-20 07:29:05 -07:00 |
|
|
David Jay
|
2d968126ab
|
Merge branch 'master' into remove-notification-warning
|
2017-03-20 07:29:05 -07:00 |
|
|
Riley Davis
|
db38bcb477
|
modify to light grey
|
2017-03-20 07:29:04 -07:00 |
|
|
gaba
|
b2234bc3c9
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/containers/Dashboard/Widget.css
|
2017-03-20 07:28:17 -07:00 |
|
|
Riley Davis
|
d71ca8d3f9
|
Merge pull request #396 from coralproject/open-closed-stream-buttons
fix some firefox display things
|
2017-03-20 07:27:20 -07:00 |
|
|
Riley Davis
|
e0d3ad32e2
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:20 -07:00 |
|
|
David Erwin
|
5f5d33931e
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:19 -07:00 |
|
|
Riley Davis
|
b94401a8cf
|
make only the title clickable
|
2017-03-20 07:27:19 -07:00 |
|
|
David Jay
|
1fd74068cd
|
Merge branch 'master' into open-closed-stream-buttons
|
2017-03-20 07:27:18 -07:00 |
|
|
Riley Davis
|
1dd0b79a3e
|
Merge pull request #392 from coralproject/mod-queue-load-more
Load More button in mod queue
|
2017-03-20 07:27:17 -07:00 |
|
|
Riley Davis
|
90298436c6
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:27:17 -07:00 |
|
|
David Jay
|
203776d07c
|
Merge branch 'mod-queue-load-more' of github.com:coralproject/talk into mod-queue-load-more
|
2017-03-20 07:27:16 -07:00 |
|
|
David Jay
|
a5e6689f81
|
Merge pull request #402 from coralproject/autoreject-on-ban
Autoreject on ban
|
2017-03-20 07:27:15 -07:00 |
|
|
David Jay
|
a78648fc0d
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-20 07:27:15 -07:00 |
|
|
Belén Curcio
|
6d43969e3b
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-20 07:27:14 -07:00 |
|
|
Riley Davis
|
aec0f678c0
|
Merge branch 'master' into autoreject-on-ban
|
2017-03-20 07:27:13 -07:00 |
|
|
gaba
|
ff71908a10
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-20 07:26:00 -07:00 |
|
|
David Erwin
|
a430ca65c2
|
Merge branch 'master' into widget-auto-update
|
2017-03-20 07:24:17 -07:00 |
|
|
David Erwin
|
96cd4056c3
|
Merge pull request #400 from coralproject/flag-username-reset
Resetting report menu on close.
|
2017-03-20 07:24:16 -07:00 |
|
|
David Erwin
|
ede6c44c93
|
Merge branch 'master' into flag-username-reset
|
2017-03-20 07:24:15 -07:00 |
|
|
David Erwin
|
8b0f01f2aa
|
Merge pull request #394 from coralproject/bugfix-mod-queue-refresh
Preventing admin panel refresh on accept and reject
|
2017-03-20 07:24:14 -07:00 |
|
|
Riley Davis
|
065ccfbfc4
|
Merge branch 'master' into flag-username-reset
|
2017-03-20 07:24:13 -07:00 |
|
|
David Jay
|
a0953c0689
|
Adding proptypes to loadmore component.
|
2017-03-09 13:33:00 -05:00 |
|
|
Gabriela Rodríguez Berón
|
491694b9c1
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-09 17:20:00 +01:00 |
|
|
Belén Curcio
|
6a72f4d066
|
Merge pull request #397 from coralproject/long-titles
Adding fix for handling long titles in the Moderation Queue
|
2017-03-09 11:17:11 -05:00 |
|
|
Belén Curcio
|
9bfc7d2037
|
Merge branch 'master' into long-titles
|
2017-03-09 11:05:08 -05:00 |
|
|
Belen Curcio
|
438877d58f
|
Merge branch 'long-titles' of github.com:coralproject/talk into long-titles
|
2017-03-09 11:03:37 -05:00 |
|
|
Belen Curcio
|
ce7a2d54d0
|
Font Size
|
2017-03-09 10:59:28 -05:00 |
|