Commit Graph
179 Commits
Author SHA1 Message Date
David Jay 0f24ab6b28 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-06 15:56:03 -05:00
Gabriela Rodríguez BerónandGitHub 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
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
gaba 7b9dbb5afd Review changes. 2017-01-04 12:24:01 -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 111e83a1e6 Removes plugin csrf 2017-01-03 08:41:28 -03: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
gaba 8e6aa23d32 More CSRF in front-end. 2016-12-23 13:07:16 -08: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
gaba 7562edc168 Removes console log. 2016-12-21 08:52:39 -08:00
David Jay c4510c1abf Updating action documentation. 2016-12-20 13:43:38 -08:00
gaba f49ca9f89a PAss the token around. 2016-12-19 18:11:11 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
riley c7d4bb6961 add a newline so lint doesn't complain 2016-12-15 15:20:50 -07:00
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07:00
Riley Davis 1ea284d428 remove fromJS call 2016-12-15 13:43:06 -07:00
Riley Davis f4ee28c618 allow non-admin folks to list their comments 2016-12-15 13:05:59 -07:00
Riley Davis d599a65c05 file not being used anywhere 2016-12-15 10:44:20 -07:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
Riley Davis 601010f1f9 update constant names 2016-12-14 13:58:28 -07:00
Riley Davis a6fdd2e46b remove redundant endpoint 2016-12-14 13:53:07 -07:00
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -07:00
riley 2be60b3208 Merged master into my-comments 2016-12-13 14:33:17 -07:00
Riley Davis 52771fc82c pluralize asset endpoints 2016-12-13 12:45:58 -07:00
Riley Davis 37d8c3ad38 try to request a list of assets and fail 2016-12-13 12:40:06 -07:00
gaba 387e20309a We already have the default for closedMessage to be null in the model. Removing the passing of a blank closedMEssage. 2016-12-13 10:42:30 -08:00
gaba 475c84dfbc Fix date comparision and change article for asset. 2016-12-12 22:18:11 -08:00
gaba 0648b2b1c8 More tests. 2016-12-12 15:38:28 -08:00
Riley Davis d43cd9caf9 list comments out 2016-12-12 16:26:02 -07:00
gaba 83a7ffee6f Merge branch 'master' into asset-status 2016-12-12 13:03:58 -08:00
gaba 3b131ce315 Removes status field for Asset. Now closedAt and closedMessage are in the settings field. 2016-12-12 13:02:39 -08:00
David JayandGitHub 409c9c3eb5 Merge branch 'master' into fix-signup-bug 2016-12-12 15:56:26 -05:00
David Jay cb576dca8f Updating signup endpoint to reflect current api. 2016-12-12 15:52:34 -05:00
Riley Davis c016e29290 separate route for loading comments per user 2016-12-12 13:00:39 -07:00
Riley Davis c999e1c1a9 use new coralApi fetch 2016-12-12 12:28:10 -07:00
Riley Davis c9a8d448ba use plugin CommentHistory component 2016-12-12 12:20:38 -07:00
Riley Davis a5b2a4ebc0 merge master 2016-12-12 11:35:25 -07:00
Belen Curcio a872128a55 logOut Stae 2016-12-11 22:52:47 -03:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
David Jay f5ac576187 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 16:33:06 -05:00
David Jay 90ef16e111 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 15:51:13 -05:00
Gabriela Rodríguez BerónandGitHub f29c0a3a09 Merge branch 'master' into ban-user 2016-12-09 10:43:55 -10:00
Gabriela Rodríguez BerónandGitHub ba169147e7 Merge branch 'master' into ban-user 2016-12-09 10:28:32 -10:00
Gabriela Rodríguez BerónandGitHub 1fefd3c8b4 Merge branch 'master' into wordlist 2016-12-09 10:26:39 -10:00