Commit Graph

632 Commits

Author SHA1 Message Date
David Jay d9147da8fc Making user action item_type 'users' for consistency. 2017-01-10 13:59:36 -05: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
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
David Jay 5e01fe4025 Fixing bug in text box display. 2016-12-22 11:01:59 -08:00
Riley Davis 7c999e2cc8 Merge branch 'master' into add-flag-option 2016-12-22 11:20:05 -07:00
Riley Davis b723d72254 Merge branch 'master' into font-size-docs 2016-12-22 10:40:30 -07:00
Riley Davis c6170f558a Merge branch 'master' into add-flag-option 2016-12-22 10:38:34 -07:00
David Jay fdf5da56cf Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list 2016-12-21 18:11:51 -08:00
David Jay 0fc3e09c74 Removing unused log statement and combining setState functions. 2016-12-21 18:08:57 -08:00
Riley Davis b8b47e9c2c normalize constant names 2016-12-21 16:56:29 -07:00
Riley Davis 7fc3dffc77 reload assets after updating state 2016-12-21 16:49:53 -07:00
Riley Davis 7cbd06834f set defaults on fetchAssets 2016-12-21 16:39:29 -07:00
David Jay c867ae8eeb Removing Next and Prev from pager and updating tests. 2016-12-21 12:11:42 -08:00
David Jay cfed42be2c Correcting bug in fetchAssets. 2016-12-21 12:05:25 -08:00
David Jay 29fa26260c Handling undefined values in fetchAssets call. 2016-12-21 11:39:21 -08:00
Riley Davis 50112d3166 create mapStateToProps 2016-12-21 12:22:54 -07:00
Riley Davis 4f9e793810 remove logs 2016-12-21 11:23:08 -07:00
riley f5b8c0bbba fix lint 2016-12-21 11:19:17 -07:00
Riley Davis 18d4c58a48 allow pasting comma-separated lists 2016-12-21 11:12:09 -07:00
gaba 7562edc168 Removes console log. 2016-12-21 08:52:39 -08:00