3544 Commits

Author	SHA1	Message	Date
Kim Gardner	67da144391	Merge branch 'master' into highlighter-wordz	2017-03-24 12:58:24 -04:00
riley	701994f8f7	pass lint	2017-03-24 10:42:31 -06:00
riley	5d5ad2585d	autoclose an article toggle	2017-03-24 10:40:12 -06:00
gaba	323749915a	CSS alignments	2017-03-24 08:59:43 -07:00
gaba	84f1d3ece2	Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts.	2017-03-23 16:02:25 -07:00
riley	6b6d3d8bbb	highlight suspect, banned words and links	2017-03-23 16:09:36 -06:00
gaba	b9c816285d	Fix params for moduserflaggedquery.	2017-03-23 14:48:15 -07:00
Belen Curcio	3be9b13691	First draft of plugins working :)	2017-03-23 16:59:11 -03:00
Riley Davis	7f1b993ea6	always show moderation link to admins	2017-03-23 13:04:37 -06:00
Wyatt Johnson	63ef49d595	Initial subscription impl	2017-03-23 11:09:14 -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
Belen Curcio	341a7320f9	Adding dynamic imports	2017-03-23 11:48:32 -03: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	849be3d5fd	Merge branch 'master' into translations	2017-03-22 17:31:28 -07:00
gaba	35c8e1b5f9	Check spanish translations	2017-03-22 17:27:43 -07:00
gaba	4cbd6ebad2	Mooore translations.	2017-03-22 16:21:40 -07: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
gaba	27a8c994a8	Fixing more translations	2017-03-22 13:19:08 -07: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
gaba	78e7951ad7	Merge branch 'master' into translations	2017-03-22 12:11:52 -07:00
gaba	72e714a42c	Translations into json	2017-03-22 11:59:33 -07: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