Commit Graph

8345 Commits

Author SHA1 Message Date
Kim Gardner 4ff6c08d4d Merge pull request #407 from coralproject/hide-dashboard-cta
save dismissed timer note to localStorage
2017-03-20 07:39:31 -07:00
Kim Gardner 6af8ef7838 Merge branch 'master' into hide-dashboard-cta 2017-03-20 07:39:31 -07:00
Kim Gardner 465e2012c5 Merge pull request #410 from coralproject/firefox-mod-buttons
button text was wrapping in firefox
2017-03-20 07:39:30 -07:00
Kim Gardner 01db845814 Merge branch 'master' into firefox-mod-buttons 2017-03-20 07:39:29 -07:00
Kim Gardner aba9488aab Merge pull request #413 from coralproject/reporting-messaging
indentation and flag -> report
2017-03-20 07:39:28 -07:00
Riley Davis 337b6accec remove fakeurl 2017-03-20 07:39:28 -07:00
riley 39e69f3bdc button text was wrapping in firefox 2017-03-20 07:39:27 -07:00
riley 21acb0d1d7 indentation and flag -> report 2017-03-20 07:39:27 -07:00
Riley Davis 2124ca0f34 save dismissed timer note to localStorage 2017-03-20 07:39:26 -07:00
gaba 6f3cb34817 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:39:00 -07:00
David Erwin 1d061ce359 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:36:23 -07:00
Riley Davis f005907894 add some translations 2017-03-20 07:36:23 -07:00
Riley Davis 2c4bf52f6b add Activity widget 2017-03-20 07:36:22 -07:00
riley 8348e1e462 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:36:22 -07:00
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 Erwin 28b24ebb09 Fix bug in example 2017-03-20 07:36:17 -07:00
David Jay ae4bae6cd2 Scrolling to keep selected comments in view. 2017-03-20 07:36:17 -07:00
Wyatt Johnson a7c946f9af Fixed bug in docs 2017-03-20 07:36:16 -07:00
Wyatt Johnson 32af28bfdc Fixed typo 2017-03-20 07:36:16 -07:00
Wyatt Johnson 86f0ed80ea Added docs and added new context based plugins. 2017-03-20 07:36:15 -07:00
Wyatt Johnson 7bf1510a8b Changed before/after to pre/post 2017-03-20 07:36:15 -07:00
gaba 258fd8b25a Initial implementation at plugins 2017-03-20 07:36:06 -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