Commit Graph

2733 Commits

Author SHA1 Message Date
Belen Curcio 6a5f667336 hover, menu order 2017-03-22 13:20:26 -03:00
David Erwin 2016546ca3 Merge pull request #426 from coralproject/no-reply-closed-streams
hide reply button if stream is closed
2017-03-22 10:53:15 -04:00
David Erwin 63fca6ba4c Merge branch 'master' into no-reply-closed-streams 2017-03-22 10:45:02 -04:00
David Erwin 9cf974d098 Merge pull request #427 from coralproject/view-more-no-worky
Comment Stream Bugfix
2017-03-21 17:59:40 -04:00
David Erwin 072d332027 Merge branch 'master' into view-more-no-worky 2017-03-21 17:54:37 -04:00
Riley Davis 80ff090c45 better tracking of new/old comments 2017-03-21 15:52:26 -06:00
Riley Davis a61b784d2b Merge pull request #425 from coralproject/reCAPTCHA-docs
Added reCAPTCHA docs
2017-03-21 15:03:42 -06:00
Riley Davis 8804b5b63f Merge branch 'master' into reCAPTCHA-docs 2017-03-21 14:59:59 -06:00
David Erwin d7adf0c792 Merge pull request #423 from coralproject/stream-sorting
sort the stories by date
2017-03-21 16:47:27 -04:00
Riley Davis 442e384298 Merge branch 'master' into no-reply-closed-streams 2017-03-21 13:21:01 -06:00
Riley Davis afaf9dd26d Merge branch 'master' into stream-sorting 2017-03-21 13:20:53 -06:00
Riley Davis 94619ca291 actually pass the asset_id instead of undefined 2017-03-21 12:30:27 -06:00
Belén Curcio b9fc1a6186 Merge branch 'master' into view-more-no-worky 2017-03-21 15:08:27 -03:00
David Erwin 481c22b7dd Merge pull request #429 from coralproject/documentation-fix
Fixed plugin examples
2017-03-21 13:44:57 -04:00
Riley Davis c8dc3c5ad2 disable replies too 2017-03-21 10:27:11 -06:00
Wyatt Johnson e5a2d627df Fixed plugin examples 2017-03-21 10:03:24 -06:00
Riley Davis ffc5379e11 Merge branch 'master' into stream-sorting 2017-03-21 09:12:04 -06:00
Riley Davis f5d1e0df8f Merge branch 'master' into no-reply-closed-streams 2017-03-21 09:11:54 -06:00
Riley Davis 894ea634c9 Merge branch 'master' into view-more-no-worky 2017-03-21 09:09:57 -06:00
Wyatt Johnson 033502626c Merge pull request #428 from coralproject/load-more-fix
Fixed bug in loading more comments
2017-03-21 08:07:00 -06:00
Wyatt Johnson 20348d5f05 Fixed bug in loading more comments 2017-03-20 15:58:33 -06:00
Riley Davis 0383d86021 load more replies if there are currently no replies 2017-03-20 15:09:45 -06:00
riley fb503798e8 use the reply id so we don't get weird behavior. fix a console warning 2017-03-20 14:46:59 -06:00
riley d7e554a055 hide reply button if stream is closed 2017-03-20 13:01:38 -06:00
Wyatt Johnson eceddf109a Added reCAPTCHA docs 2017-03-20 12:35:22 -06:00
Riley Davis 43119e5e15 sort the stories by date 2017-03-17 14:30:11 -06:00
David Erwin 471a55c3eb Merge pull request #422 from coralproject/plugin-patch
Update Dockerfile
2017-03-17 12:50:17 -04:00
Wyatt Johnson c79d1d40da Update Dockerfile 2017-03-17 10:46:45 -06:00
David Erwin dbc3c265a3 Merge pull request #421 from coralproject/plugins
Server Graph Plugins
2017-03-17 12:35:51 -04:00
David Erwin b3d80b2888 Merge branch 'master' into plugins 2017-03-17 12:31:40 -04:00
Riley Davis cb3572acc5 Merge pull request #418 from coralproject/recaptcha-fix
Added new pageData action/reducer
2017-03-17 10:24:22 -06:00
Riley Davis c48ce8323d combine destructuring 2017-03-17 10:18:07 -06:00
Wyatt Johnson df4e07d39c Renamed pageData -> config 2017-03-17 08:37:58 -06:00
Wyatt Johnson 6426663103 Merge branch 'master' into plugins 2017-03-17 08:26:42 -06:00
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
David Erwin 4b8fb48f63 Fix bug in example 2017-03-16 14:32:59 -04:00
Wyatt Johnson 4a416d9477 Fixed bug in docs 2017-03-16 12:31:25 -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