Commit Graph

1578 Commits

Author SHA1 Message Date
Wyatt Johnson 228fdeac4d Removed root .babelrc file, upgrades
- Upgraded packages
- Fixed sourcemaps
- Moved .babelrc config into client folder
- Created .babelrc in tests folder for client tests
2017-03-24 11:12:57 -06:00
Riley Davis 67e04bf156 Merge branch 'master' into reset-password-redirect 2017-03-23 10:29:05 -06:00
David Erwin 903aa23f19 Revert "Story 138187767 - Moderate Flag User Names" 2017-03-23 11:18:55 -04:00
David Erwin 53ba313f57 Merge branch 'master' into my-comments-ux 2017-03-23 10:53:47 -04:00
David Erwin 6c83b2e60d Merge branch 'master' into design-more 2017-03-23 10:49:26 -04:00
David Erwin ae457f1951 Merge branch 'master' into my-comments-ux 2017-03-23 10:40:00 -04:00
David Erwin a01c6f0f78 Merge branch 'master' into admin-ux 2017-03-23 09:04:36 -04:00
Belen Curcio 23833886bb missing tab name 2017-03-23 09:51:26 -03:00
Belen Curcio 464539d6a3 missing tab name 2017-03-23 09:50:18 -03:00
Riley Davis 375ff08584 Merge branch 'master' into reset-password-redirect 2017-03-22 18:45:40 -06:00
Gabriela Rodríguez Berón ae96cb1e44 Merge branch 'master' into my-comments-ux 2017-03-22 16:18:45 -07:00
Riley Davis fb2f8ef074 redirect to the parent url when resetting your password 2017-03-22 16:49:34 -06:00
Riley Davis 7af16471cd if the asset_url is not present, attempt to find the canonical link tag. if not, warn the user and strip the query params. 2017-03-22 15:41:06 -06:00
Belen Curcio 0bae6fe76c design tweaks 2017-03-22 17:06:41 -03:00
Belén Curcio 1e54a997d6 Merge branch 'master' into my-comments-ux 2017-03-22 16:25:06 -03:00
Riley Davis d8e92968a5 Merge branch 'master' into admin-ux 2017-03-22 13:22:21 -06:00
Belén Curcio ae672d038c Merge branch 'master' into my-comments-ux 2017-03-22 15:37:48 -03:00
Belen Curcio 5729b03656 my-comments-ux 2017-03-22 15:35:40 -03:00
Belen Curcio 71415877b3 comment tweaks 2017-03-22 14:04:08 -03:00
Belen Curcio cd27ffe86a wip 2017-03-22 13:37:44 -03:00
Belen Curcio 6a5f667336 hover, menu order 2017-03-22 13:20:26 -03:00
Riley Davis b51cbebe1d Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 09:57:29 -06:00
David Erwin 63fca6ba4c Merge branch 'master' into no-reply-closed-streams 2017-03-22 10:45:02 -04:00
gaba 7522bd9cd6 Sends a mail to the suspended user. 2017-03-21 15:08:46 -07: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 94619ca291 actually pass the asset_id instead of undefined 2017-03-21 12:30:27 -06:00
Gabriela Rodríguez Berón b9960c3cc7 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-21 10:42:48 -07:00
gaba a09d41053f It uses Button instead of FabButton from coral-ui. 2017-03-21 10:36:21 -07:00
Riley Davis c8dc3c5ad2 disable replies too 2017-03-21 10:27:11 -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
Riley Davis 9bfc4b5815 how did this get duplicated? 2017-03-20 16:26:52 -06:00
Riley Davis 546dd63d8c why did only this get changed? 2017-03-20 16:21:01 -06:00
gaba e5bac88bb5 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-20 15:02:38 -07: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
gaba be2ecf0838 Adds user and message to flagaction to display in FE. 2017-03-20 13:38:11 -07:00
gaba 9e76ca5d27 Fix CSS. 2017-03-20 12:37:21 -07:00
riley d7e554a055 hide reply button if stream is closed 2017-03-20 13:01:38 -06:00
Riley Davis 09ec2dba94 combine destructuring 2017-03-20 10:47:00 -07:00
Wyatt Johnson 46ecf0c06f Renamed pageData -> config 2017-03-20 10:46:59 -07:00
Wyatt Johnson b35170484e Merge branch 'master' into recaptcha-fix 2017-03-20 10:46:59 -07:00
Wyatt Johnson 8eac8d6890 Merge branch 'master' into recaptcha-fix 2017-03-20 10:46:58 -07:00
Wyatt Johnson 5768d30a7a Added new pageData action/reducer 2017-03-20 10:46:57 -07:00
Riley Davis 9d64639f8e differentiate between top- and comment-level LoadMore 2017-03-20 10:45:31 -07:00
Riley Davis 316aa12481 add spanish translations 2017-03-20 10:45:31 -07:00
Riley Davis 73c59cb137 show different copy per # of replies 2017-03-20 10:45:30 -07:00