Commit Graph
254 Commits
Author SHA1 Message Date
Wyatt Johnson 4c5b85a2ae Fixed session bug 2017-01-05 19:02:06 -07:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
Wyatt Johnson cabe546ecf Added email send on new user if enabled for confirming 2017-01-05 17:19:38 -07:00
Wyatt Johnson be72ebf2a1 Added tests + model implementation. 2017-01-05 17:01:41 -07:00
Wyatt Johnson a7680ae5d9 Initial pass at email confirmation 2017-01-03 17:35:58 -07:00
gaba e2a032d4a5 Merge branch 'master' into csrf 2017-01-03 16:25:05 -03:00
gaba a02ad69568 Adds specific fields to the metadata in the action when flagging because suspect word. 2017-01-03 09:36:20 -03:00
gaba 8e5e75ed6f It works for user signin/signup and posting comments. 2016-12-23 14:57:39 -08:00
Kim GardnerandGitHub 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
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 4e3d286740 add environment var for pw reset FROM field 2016-12-22 14:53:33 -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 DavisandGitHub c6170f558a Merge branch 'master' into add-flag-option 2016-12-22 10:38:34 -07:00
David Jay a3eb4f5c76 Merge branch 'add-flag-option' of github.com:coralproject/talk into add-flag-option 2016-12-20 11:31:57 -08:00
gaba f49ca9f89a PAss the token around. 2016-12-19 18:11:11 -08:00
David Jay be3d506459 Moving action metadata to nested object. 2016-12-19 20:10:42 -05:00
David Jay 4d508f6afa Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-19 13:41:43 -05:00
Riley Davis d65f786dcd Merge branch 'master'
Conflicts:
	routes/api/comments/index.js
2016-12-19 10:28:54 -07:00
gaba dd032521c0 Merge branch 'master' into csrf 2016-12-16 17:55:49 -08:00
Wyatt Johnson dc966afe8e adjusted query style 2016-12-16 17:06:56 -07:00
gaba d8d30e512b Only on POST check for CSRF. 2016-12-16 16:02:45 -08:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
David Jay 8f1a6a777c Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-16 17:22:32 -05:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
riley 27116b84ce Merged master into suspect-wordlist 2016-12-15 16:12:19 -07:00
Wyatt Johnson 9cf2d88ce2 Merge branch 'master' into suspect-wordlist 2016-12-15 13:51:16 -07:00
Riley Davis 39fdd168fa admins can still view all comment streams 2016-12-15 13:18:28 -07:00
Riley Davis f4ee28c618 allow non-admin folks to list their comments 2016-12-15 13:05:59 -07:00
Riley Davis 0892996be0 remove this route until someone is actually using it 2016-12-15 10:41:34 -07:00
David Jay faafbfa78c Loading assets and adding to store. 2016-12-14 19:58:04 -05:00
Riley Davis 29b6fc08cd hydrate the assets in the comment response 2016-12-14 14:41:54 -07:00
Riley Davis a6fdd2e46b remove redundant endpoint 2016-12-14 13:53:07 -07:00
Riley Davis 755d090289 Merged branch master into my-comments 2016-12-14 12:01:39 -07:00
Wyatt Johnson 55bd600d96 Removed public function in favor of filterForUser transformer 2016-12-13 16:14:49 -07:00
Riley Davis 5962037c21 display list of comments with asset url 2016-12-13 16:03:50 -07:00
Riley Davis 243bd50894 Merged branch master into my-comments 2016-12-13 15:01:34 -07:00
riley 2be60b3208 Merged master into my-comments 2016-12-13 14:33:17 -07:00
David JayandGitHub f17564ec36 Merge branch 'master' into view-char-count 2016-12-13 15:34:58 -05:00
Gabriela Rodríguez BerónandGitHub 497fbaef25 Merge branch 'master' into pluralize-asset 2016-12-13 12:00:33 -08:00
Riley Davis 52771fc82c pluralize asset endpoints 2016-12-13 12:45:58 -07:00
Gabriela Rodríguez BerónandGitHub 163fa5fbeb Merge branch 'master' into hide-wordlist-from-fe 2016-12-13 11:40:18 -08:00
Riley Davis 37d8c3ad38 try to request a list of assets and fail 2016-12-13 12:40:06 -07:00
Riley DavisandGitHub 454357fa55 Merge branch 'master' into view-char-count 2016-12-13 12:09:52 -07:00
David Jay cb1d12f757 Preventing backend from sending banned words to frontend. 2016-12-13 14:09:50 -05: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
David Jay 643373e224 Rejecting comments on the server if the character count is too long. 2016-12-13 13:36:54 -05:00
Wyatt Johnson 61128e9c06 Updated docs, services, tests. 2016-12-13 11:29:48 -07:00
gaba 475c84dfbc Fix date comparision and change article for asset. 2016-12-12 22:18:11 -08:00