649 Commits

Author	SHA1	Message	Date
Gabriela Rodríguez Berón	1accc54238	Merge branch 'master' into unique-username	2017-01-13 14:21:42 -08:00
Riley Davis	44a06aef46	do not render tab content unless they're active	2017-01-13 14:33:01 -07:00
Gabriela Rodríguez Berón	1cc048d46e	Merge branch 'master' into unique-username	2017-01-12 14:53:13 -08:00
gaba	1027b19a49	Added regex to look for the field that is duplicated. Not sure if there is a better way to do it.	2017-01-12 14:43:36 -08:00
Riley Davis	0eefd3364b	update tests	2017-01-12 15:25:36 -07:00
Riley Davis	f1272338cd	re-use dispatch function	2017-01-12 13:30:53 -07:00
Riley Davis	3285a5ec29	add status to Comment. /comments/pending and /comments/rejected ONLY return the respective comments	2017-01-12 12:16:13 -07:00
gaba	acf3ad5e28	Some conflicts were added.	2017-01-12 11:10:07 -08:00
gaba	873ec09f62	Merge branch 'master' into unique-username	2017-01-12 08:46:51 -08:00
David Jay	11f18c23cb	Merge branch 'master' into users-bug-fix	2017-01-10 14:13:31 -05:00
David Jay	d9147da8fc	Making user action item_type 'users' for consistency.	2017-01-10 13:59:36 -05:00
riley	7bc848b801	make tests pass	2017-01-09 10:47:28 -07:00
Riley Davis	a3bb8e2f41	remove logs. missed some errors	2017-01-06 13:11:37 -07:00
Riley Davis	6a61f47ddf	Merged branch master into bad-words	2017-01-06 12:45:41 -07:00
gaba	712e436f58	Cleans error on email address or name. We need to go through all the errors and manage them better with translations.	2017-01-06 16:38:44 -03:00
Riley Davis	72cd78da8c	use wordlist service	2017-01-06 12:35:08 -07:00
Gabriela Rodríguez Berón	1e445efaec	Merge branch 'master' into issue-191	2017-01-06 13:33:25 -03:00
Wyatt Johnson	4eb7c72ae2	Merge branch 'master' into email-confirm	2017-01-05 18:45:06 -07:00
Wyatt Johnson	be72ebf2a1	Added tests + model implementation.	2017-01-05 17:01:41 -07:00
Riley Davis	368b431893	pre-validate usernames on the fe	2017-01-05 15:26:42 -07:00
Riley Davis	7e7e8891b4	display errors when trying to sign up with a bad username	2017-01-05 12:47:39 -07:00
gaba	ac6fba2286	Clean user state on logout. Allow flagging only if not banned.	2017-01-05 15:34:27 -03:00
gaba	ab825512b9	Adding missing translation. Not sure how to translate streams.	2017-01-04 16:46:19 -03:00
Riley Davis	12f6bb1ffe	fetch settings on mod queue load	2017-01-04 11:14:23 -07:00
gaba	7b9dbb5afd	Review changes.	2017-01-04 12:24:01 -03:00
Gabriela Rodríguez Berón	2755cc61e4	Merge branch 'master' into csrf	2017-01-04 10:56:37 -03:00
Wyatt Johnson	a7680ae5d9	Initial pass at email confirmation	2017-01-03 17:35:58 -07:00
gaba	0fd6f4b44e	Working on the tests & sending CSRF	2017-01-03 18:01:21 -03:00
gaba	e2a032d4a5	Merge branch 'master' into csrf	2017-01-03 16:25:05 -03:00
Riley Davis	d4dc381aca	Merge branch 'master' into bug_203	2017-01-03 12:29:48 -06:00
gaba	950340d5e7	Fix lint.	2017-01-03 15:18:39 -03:00
Gabriela Rodríguez Berón	43846651dd	Merge branch 'master' into bug_203	2017-01-03 14:33:57 -03:00
Riley Davis	a1def6f950	missing state for the wordlist.	2017-01-03 10:33:25 -07:00
Dan Zajdband	759e74a88d	coral-admin: Fixed check for component unmount removing a listener when there is no object	2017-01-03 10:46:55 -03:00
gaba	111e83a1e6	Removes plugin csrf	2017-01-03 08:41:28 -03:00
gaba	036ed8ac78	Removes wrong csrf.	2017-01-03 08:41:28 -03:00
gaba	d35875145c	Changes field for metadata. Needs to look at this test better.	2016-12-23 15:38:45 -08:00
gaba	8e5e75ed6f	It works for user signin/signup and posting comments.	2016-12-23 14:57:39 -08:00
gaba	6892ef85f8	Sending the CSRF to the POST request.	2016-12-23 13:56:42 -08:00
Kim Gardner	ac66a7bb0e	Merge branch 'master' into csrf	2016-12-23 16:12:53 -05:00
gaba	8e6aa23d32	More CSRF in front-end.	2016-12-23 13:07:16 -08:00
Belen Curcio	8d992f7809	merg	2016-12-23 16:13:36 -03:00
Belen Curcio	168248f975	Presentational and Container Components added	2016-12-23 16:09:46 -03:00
gaba	ec3e9d1cd4	Merge branch 'master' into csrf	2016-12-22 14:23:01 -08:00
gaba	54d0096dd1	More CSRF in forms.	2016-12-22 14:17:09 -08:00
Riley Davis	1239141eb9	use setIn to simplify	2016-12-22 14:11:04 -07:00
Riley Davis	a9a9ebdfd9	normalize constant names	2016-12-22 13:53:42 -07:00
Riley Davis	9d1d109ec0	Merge branch 'master' ... Conflicts: client/coral-admin/src/reducers/index.js	2016-12-22 12:28:55 -07:00
Riley Davis	6cca99e75e	Merge branch 'master' into map-dispatch-mod-queue	2016-12-22 12:25:51 -07:00
Riley Davis	e37696e64f	Merge branch 'master' into docs-add-reactions	2016-12-22 12:17:49 -07:00