1961 Commits

Author	SHA1	Message	Date
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
Riley Davis	517ede1977	dashboard reload fix	2017-03-20 10:45:29 -07:00
gaba	2a66a78d41	Merge branch 'master' into recaptcha-support	2017-03-20 10:37:18 -07:00
Riley Davis	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 Gardner	1a83ffe482	Merge branch 'master' into config-shuffle	2017-03-20 10:21:59 -07:00
Riley Davis	92055c7814	correctly handle error when not logged in	2017-03-20 10:21:58 -07:00
riley	e975d6d809	move pre-mod links	2017-03-20 10:21:57 -07:00
Riley Davis	63c3d02329	change Stream > Story sometimes	2017-03-20 10:21:56 -07:00
Riley Davis	dedcb87435	Merge branch 'master' into recaptcha-support	2017-03-20 10:21:55 -07:00
gaba	7232d09eb3	Merge branch 'master' into remove-like-widget	2017-03-20 07:47:37 -07:00
Riley Davis	5c767b6aa6	Merge branch 'master' into recaptcha-support	2017-03-20 07:42:31 -07:00
riley	1ff5ab2e3e	remove like widget for now	2017-03-20 07:42:31 -07:00
David Erwin	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 Gardner	6af8ef7838	Merge branch 'master' into hide-dashboard-cta	2017-03-20 07:39:31 -07:00
Kim Gardner	01db845814	Merge branch 'master' into firefox-mod-buttons	2017-03-20 07:39:29 -07:00
Riley Davis	337b6accec	remove fakeurl	2017-03-20 07:39:28 -07:00