Commit Graph

649 Commits

Author SHA1 Message Date
David Jay b8fc2c9cc7 Addressing CSRF and user status issues. 2017-01-09 15:39:08 -05:00
David Jay 0f24ab6b28 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-06 15:56:03 -05:00
David Jay ec020df488 Adding account flags tab. 2017-01-06 15:42:19 -05:00
David Jay d5a82f04c2 Fixing issues with e-mail and status update. 2017-01-06 15:35:32 -05:00
David Jay 9e651a9292 Adding actions to suspend users and send e-mail. 2017-01-06 15:16:23 -05:00
Gabriela Rodríguez Berón 1e445efaec Merge branch 'master' into issue-191 2017-01-06 13:33:25 -03:00
David Jay e510f99754 Adding style to suspension modal. 2017-01-05 20:51:40 -05: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
David Jay a468fe4c28 Adding language and e-mail input to suspend user modal. 2017-01-05 16:51:37 -05:00
David Jay 890ab810f3 Activating SuspendUserModal and updating language for clarity. 2017-01-05 14:50:21 -05:00
gaba ac6fba2286 Clean user state on logout. Allow flagging only if not banned. 2017-01-05 15:34:27 -03:00
David Jay 9ba0176b3c Seperating username and bio flags 2017-01-04 16:11:31 -05:00
David Jay 7a239c02ab Limiting to user actions. 2017-01-04 15:56:52 -05:00
David Jay 216b21251d Styling UserActions Component. 2017-01-04 15:33:41 -05:00
gaba ab825512b9 Adding missing translation. Not sure how to translate streams. 2017-01-04 16:46:19 -03:00
David Jay c1e3580ef7 Resolving error in moderation list. 2017-01-04 14:46:06 -05:00
David Jay 0a064c0e11 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-04 14:33:27 -05:00
David Jay 3fa0460f34 Sending actions to ModerationList. 2017-01-04 14:20:00 -05:00
David Jay f792aeccd2 Adding user display. 2017-01-04 13:39:10 -05: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
David Jay b517adab56 Moving commentList to ModerationList 2017-01-03 16:57:53 -05:00
gaba 0fd6f4b44e Working on the tests & sending CSRF 2017-01-03 18:01:21 -03:00
David Jay 5c5a7f5ba5 Switching to central call for mod queue to support current reducer structure. 2017-01-03 15:13:09 -05:00
David Jay dd7bdb8a26 Adding actions for fetching user moderation queue. 2017-01-03 15:05:45 -05: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