Commit Graph
8775 Commits
Author SHA1 Message Date
Wyatt Johnsonandgaba dfffbbe619 bug fix 2017-03-20 10:46:58 -07:00
Wyatt Johnsonandgaba 5768d30a7a Added new pageData action/reducer 2017-03-20 10:46:57 -07:00
gaba 2fff47c753 Merge branch 'master' into plugins 2017-03-20 10:46:30 -07:00
Kim Gardnerandgaba 74a561a770 Merge pull request #420 from coralproject/view-more-bug
show different copy per # of replies
2017-03-20 10:45:32 -07:00
Riley Davisandgaba 9d64639f8e differentiate between top- and comment-level LoadMore 2017-03-20 10:45:31 -07:00
Riley Davisandgaba 316aa12481 add spanish translations 2017-03-20 10:45:31 -07:00
Kim Gardnerandgaba 369d867e77 Merge pull request #419 from coralproject/dashboard-reload-bugfix
dashboard refresh fix
2017-03-20 10:45:30 -07:00
Riley Davisandgaba 73c59cb137 show different copy per # of replies 2017-03-20 10:45:30 -07:00
Riley Davisandgaba 517ede1977 dashboard reload fix 2017-03-20 10:45:29 -07:00
Kim Gardnerandgaba 5514f45ab3 Merge pull request #412 from coralproject/recaptcha-support
recaptcha + RL support
2017-03-20 10:45:28 -07:00
gaba 2a66a78d41 Merge branch 'master' into recaptcha-support 2017-03-20 10:37:18 -07:00
Kim Gardnerandgaba 61a2f1ed36 Merge pull request #417 from coralproject/dashboard-bug
move CountdownTimer to its own component
2017-03-20 10:27:31 -07:00
Riley Davisandgaba d2e2eef046 do a null check. 2017-03-20 10:27:31 -07:00
gaba a2833538a7 move CountdownTimer to its own component 2017-03-20 10:26:12 -07:00
Kim Gardnerandgaba ecb1c51a9f Merge pull request #415 from coralproject/config-shuffle
move pre-mod links
2017-03-20 10:21:59 -07:00
Kim Gardnerandgaba 1a83ffe482 Merge branch 'master' into config-shuffle 2017-03-20 10:21:59 -07:00
Kim Gardnerandgaba 2c2cbb720b Merge pull request #416 from coralproject/login-error-fix
correctly handle error when not logged in
2017-03-20 10:21:58 -07:00
Riley Davisandgaba 92055c7814 correctly handle error when not logged in 2017-03-20 10:21:58 -07:00
rileyandgaba e975d6d809 move pre-mod links 2017-03-20 10:21:57 -07:00
Kim Gardnerandgaba 8459c31b42 Merge pull request #414 from coralproject/streams-to-stories
change Stream > Story sometimes
2017-03-20 10:21:56 -07:00
Riley Davisandgaba 63c3d02329 change Stream > Story sometimes 2017-03-20 10:21:56 -07:00
Riley Davisandgaba dedcb87435 Merge branch 'master' into recaptcha-support 2017-03-20 10:21:55 -07:00
Kim Gardnerandgaba 22753e1e14 Merge pull request #411 from coralproject/remove-like-widget
remove like widget for now
2017-03-20 10:21:54 -07:00
gaba 7232d09eb3 Merge branch 'master' into remove-like-widget 2017-03-20 07:47:37 -07:00
Riley Davisandgaba 5c767b6aa6 Merge branch 'master' into recaptcha-support 2017-03-20 07:42:31 -07:00
rileyandgaba 1ff5ab2e3e remove like widget for now 2017-03-20 07:42:31 -07:00
David Erwinandgaba 75cb83014b Merge pull request #406 from coralproject/asset-comment-metrics
Asset comment metrics
2017-03-20 07:42:30 -07:00
David Erwinandgaba abd0b51441 Removing log 2017-03-20 07:42:29 -07:00
David Erwinandgaba c55b4d22d7 Language update 2017-03-20 07:42:29 -07:00
gaba a71b8a4ae4 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:41:12 -07:00
Kim Gardnerandgaba 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 Gardnerandgaba 6af8ef7838 Merge branch 'master' into hide-dashboard-cta 2017-03-20 07:39:31 -07:00
Kim Gardnerandgaba 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 Gardnerandgaba 01db845814 Merge branch 'master' into firefox-mod-buttons 2017-03-20 07:39:29 -07:00
Kim Gardnerandgaba aba9488aab Merge pull request #413 from coralproject/reporting-messaging
indentation and flag -> report
2017-03-20 07:39:28 -07:00
Riley Davisandgaba 337b6accec remove fakeurl 2017-03-20 07:39:28 -07:00
rileyandgaba 39e69f3bdc button text was wrapping in firefox 2017-03-20 07:39:27 -07:00
rileyandgaba 21acb0d1d7 indentation and flag -> report 2017-03-20 07:39:27 -07:00
Riley Davisandgaba 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 Erwinandgaba 1d061ce359 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:36:23 -07:00
Riley Davisandgaba f005907894 add some translations 2017-03-20 07:36:23 -07:00
Riley Davisandgaba 2c4bf52f6b add Activity widget 2017-03-20 07:36:22 -07:00
rileyandgaba 8348e1e462 Merge branch 'master' into asset-comment-metrics 2017-03-20 07:36:22 -07:00
Riley Davisandgaba c8a0ded4ad try to just add recaptcha manually
use react-recaptcha

remove recaptcha file
2017-03-20 07:36:21 -07:00
rileyandgaba ca07406b1a Merge branch 'master' into recaptcha-support 2017-03-20 07:36:20 -07:00
Riley Davisandgaba 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 Davisandgaba f8b3c5752e Merge branch 'master' into keyboard-shortcut-scroll 2017-03-20 07:36:19 -07:00
Riley Davisandgaba 46e8d30e22 scrollIntoView will work in more browsers 2017-03-20 07:36:18 -07:00
David Erwinandgaba 28b24ebb09 Fix bug in example 2017-03-20 07:36:17 -07:00