Commit Graph
1465 Commits
Author SHA1 Message Date
Belen Curcio 6a5f667336 hover, menu order 2017-03-22 13:20:26 -03:00
David ErwinandGitHub 63fca6ba4c Merge branch 'master' into no-reply-closed-streams 2017-03-22 10:45:02 -04:00
David ErwinandGitHub 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 94619ca291 actually pass the asset_id instead of undefined 2017-03-21 12:30:27 -06:00
Riley Davis c8dc3c5ad2 disable replies too 2017-03-21 10:27:11 -06:00
Riley DavisandGitHub ffc5379e11 Merge branch 'master' into stream-sorting 2017-03-21 09:12:04 -06:00
Riley DavisandGitHub f5d1e0df8f Merge branch 'master' into no-reply-closed-streams 2017-03-21 09:11:54 -06:00
Riley DavisandGitHub 894ea634c9 Merge branch 'master' into view-more-no-worky 2017-03-21 09:09:57 -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
Riley Davis 43119e5e15 sort the stories by date 2017-03-17 14:30:11 -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 JohnsonandGitHub edeedfaa71 Merge branch 'master' into recaptcha-fix 2017-03-17 08:01:47 -06: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 JohnsonandGitHub b277f3be75 Merge branch 'master' into recaptcha-fix 2017-03-16 11:59:56 -06:00
Riley Davis 39596399ec dashboard reload fix 2017-03-16 11:45:10 -06:00
Wyatt Johnson 598fcc4cb0 Added new pageData action/reducer 2017-03-16 11:07:38 -06:00
Riley Davis 736ac11782 Merge branch 'master' into recaptcha-support 2017-03-16 10:12:28 -06: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 GardnerandGitHub babd1b3d8d Merge branch 'master' into config-shuffle 2017-03-15 13:30:43 -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
Riley Davis 04298aca7d change Stream > Story sometimes 2017-03-14 16:30:02 -06:00
Riley DavisandGitHub dbd1366c26 Merge branch 'master' into recaptcha-support 2017-03-14 15:56:20 -06:00
Riley Davis b612bbd96c Merge branch 'master' into remove-like-widget 2017-03-14 15:35:07 -06:00
Riley DavisandGitHub 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 ErwinandGitHub 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 GardnerandGitHub c50d25c0e9 Merge branch 'master' into hide-dashboard-cta 2017-03-14 13:19:23 -04:00
Kim GardnerandGitHub d85473e20c Merge branch 'master' into firefox-mod-buttons 2017-03-14 13:01:24 -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 DavisandGitHub 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 ErwinandGitHub cf753632bf Merge branch 'master' into asset-comment-metrics 2017-03-13 10:18:57 -04:00
David ErwinandGitHub 9f5648b4c3 Merge branch 'master' into widen-notifications 2017-03-13 10:14:51 -04:00
Riley DavisandGitHub e159435293 Merge branch 'master' into bugfix-ban-dialog-language 2017-03-10 14:50:49 -07:00