 Wyatt Johnson
|
edeedfaa71
|
Merge branch 'master' into recaptcha-fix
|
2017-03-17 08:01:47 -06:00 |
|
|
Kim Gardner
|
42beac9a39
|
Merge pull request #420 from coralproject/view-more-bug
show different copy per # of replies
|
2017-03-17 09:05:24 -04:00 |
|
|
Riley Davis
|
a7cdce3579
|
differentiate between top- and comment-level LoadMore
|
2017-03-16 15:35:38 -06:00 |
|
|
Riley Davis
|
528e2ff851
|
add spanish translations
|
2017-03-16 14:54:09 -06:00 |
|
|
Riley Davis
|
c61b249a37
|
show different copy per # of replies
|
2017-03-16 14:37:29 -06:00 |
|
|
Wyatt Johnson
|
b277f3be75
|
Merge branch 'master' into recaptcha-fix
|
2017-03-16 11:59:56 -06:00 |
|
|
Kim Gardner
|
4219520002
|
Merge pull request #419 from coralproject/dashboard-reload-bugfix
dashboard refresh fix
|
2017-03-16 13:55:17 -04:00 |
|
|
Riley Davis
|
39596399ec
|
dashboard reload fix
|
2017-03-16 11:45:10 -06:00 |
|
|
Wyatt Johnson
|
681bdb1d92
|
bug fix
|
2017-03-16 11:11:24 -06:00 |
|
|
Wyatt Johnson
|
598fcc4cb0
|
Added new pageData action/reducer
|
2017-03-16 11:07:38 -06:00 |
|
|
Kim Gardner
|
3277923a8c
|
Merge pull request #412 from coralproject/recaptcha-support
recaptcha + RL support
|
2017-03-16 12:16:50 -04:00 |
|
|
Riley Davis
|
736ac11782
|
Merge branch 'master' into recaptcha-support
|
2017-03-16 10:12:28 -06:00 |
|
|
Kim Gardner
|
080895c70b
|
Merge pull request #417 from coralproject/dashboard-bug
move CountdownTimer to its own component
|
2017-03-16 12:07:49 -04:00 |
|
|
Riley Davis
|
1043a37eef
|
do a null check.
|
2017-03-16 09:28:17 -06:00 |
|
|
Riley Davis
|
378e855c4c
|
remove logs
|
2017-03-15 14:20:27 -06:00 |
|
|
Riley Davis
|
9ddc3aa0b7
|
move CountdownTimer to its own component
|
2017-03-15 14:13:18 -06:00 |
|
|
Kim Gardner
|
8d87af2115
|
Merge pull request #415 from coralproject/config-shuffle
move pre-mod links
|
2017-03-15 14:12:24 -04:00 |
|
|
Kim Gardner
|
babd1b3d8d
|
Merge branch 'master' into config-shuffle
|
2017-03-15 13:30:43 -04:00 |
|
|
Kim Gardner
|
9e890101fa
|
Merge pull request #416 from coralproject/login-error-fix
correctly handle error when not logged in
|
2017-03-15 13:28:45 -04:00 |
|
|
Riley Davis
|
9beff74862
|
correctly handle error when not logged in
|
2017-03-15 11:16:13 -06:00 |
|
|
riley
|
3071b3783e
|
move pre-mod links
|
2017-03-15 10:15:47 -06:00 |
|
|
Kim Gardner
|
8a84587e54
|
Merge pull request #414 from coralproject/streams-to-stories
change Stream > Story sometimes
|
2017-03-15 11:28:11 -04:00 |
|
|
Riley Davis
|
04298aca7d
|
change Stream > Story sometimes
|
2017-03-14 16:30:02 -06:00 |
|
|
Riley Davis
|
dbd1366c26
|
Merge branch 'master' into recaptcha-support
|
2017-03-14 15:56:20 -06:00 |
|
|
Kim Gardner
|
d8ce015b98
|
Merge pull request #411 from coralproject/remove-like-widget
remove like widget for now
|
2017-03-14 17:45:26 -04:00 |
|
|
Riley Davis
|
b612bbd96c
|
Merge branch 'master' into remove-like-widget
|
2017-03-14 15:35:07 -06:00 |
|
|
Riley Davis
|
099cc36b89
|
Merge branch 'master' into recaptcha-support
|
2017-03-14 15:33:18 -06:00 |
|
|
Riley Davis
|
7bbf8abd3d
|
try to just add recaptcha manually
use react-recaptcha
remove recaptcha file
|
2017-03-14 15:32:16 -06:00 |
|
|
David Erwin
|
66d04ab5ca
|
Merge pull request #406 from coralproject/asset-comment-metrics
Asset comment metrics
|
2017-03-14 17:16:15 -04:00 |
|
|
David Erwin
|
6758a178eb
|
Removing log
|
2017-03-14 17:10:37 -04:00 |
|
|
David Erwin
|
13dad0c895
|
Language update
|
2017-03-14 17:07:48 -04:00 |
|
|
Riley Davis
|
b4d236df36
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-14 15:00:27 -06:00 |
|
|
Kim Gardner
|
8876c10254
|
Merge pull request #407 from coralproject/hide-dashboard-cta
save dismissed timer note to localStorage
|
2017-03-14 13:29:45 -04:00 |
|
|
Kim Gardner
|
c50d25c0e9
|
Merge branch 'master' into hide-dashboard-cta
|
2017-03-14 13:19:23 -04:00 |
|
|
Kim Gardner
|
1330ffd394
|
Merge pull request #410 from coralproject/firefox-mod-buttons
button text was wrapping in firefox
|
2017-03-14 13:17:45 -04:00 |
|
|
Kim Gardner
|
d85473e20c
|
Merge branch 'master' into firefox-mod-buttons
|
2017-03-14 13:01:24 -04:00 |
|
|
Kim Gardner
|
13e2766ae9
|
Merge pull request #413 from coralproject/reporting-messaging
indentation and flag -> report
|
2017-03-14 13:00:49 -04:00 |
|
|
Riley Davis
|
fa66bab937
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-14 10:46:21 -06:00 |
|
|
Riley Davis
|
f0eaf01ccc
|
remove fakeurl
|
2017-03-13 13:33:31 -06:00 |
|
|
riley
|
147345505f
|
indentation and flag -> report
|
2017-03-13 13:23:00 -06:00 |
|
|
riley
|
b1f426e70d
|
Merge branch 'master' into recaptcha-support
|
2017-03-13 12:27:19 -06:00 |
|
|
riley
|
7bfa718830
|
remove like widget for now
|
2017-03-13 12:15:38 -06:00 |
|
|
riley
|
801555e66e
|
button text was wrapping in firefox
|
2017-03-13 12:08:57 -06:00 |
|
|
Riley Davis
|
bf31f07053
|
Merge pull request #404 from coralproject/keyboard-shortcut-scroll
Scrolling to keep selected comments in view.
|
2017-03-13 11:52:08 -06:00 |
|
|
Riley Davis
|
6d3bb6af03
|
Merge branch 'master' into keyboard-shortcut-scroll
|
2017-03-13 11:14:04 -06:00 |
|
|
Riley Davis
|
f999be6fbf
|
scrollIntoView will work in more browsers
|
2017-03-13 11:13:28 -06:00 |
|
|
David Erwin
|
15e962c985
|
Merge pull request #409 from coralproject/revert-version-pin
Removed the version pin
|
2017-03-13 12:01:18 -04:00 |
|
|
Wyatt Johnson
|
8e6c2e8075
|
Resolved #357
|
2017-03-13 09:43:47 -06:00 |
|
|
David Erwin
|
eb00320a0c
|
Merge pull request #405 from coralproject/asset-comment-total-count
Added support for total comment count
|
2017-03-13 11:32:35 -04:00 |
|
|
David Erwin
|
33062ca43e
|
Merge branch 'master' into asset-comment-total-count
|
2017-03-13 11:14:36 -04:00 |
|