4030 Commits

Author	SHA1	Message	Date
David Jay	0235d26295	Correcting accidentally moved pager files.	2016-12-20 16:34:27 -08:00
David Jay	7faa3eeecf	Merge branch 'master' of github.com:coralproject/talk into add-flag-option	2016-12-20 16:23:39 -08:00
Riley Davis	9315337ce6	suspect words are marked up	2016-12-20 16:56:16 -07:00
Riley Davis	ef0055e689	highlight suspect words	2016-12-20 16:42:16 -07:00
Riley Davis	9e0ab7d2a1	load actions in a reducer	2016-12-20 15:47:27 -07:00
David Jay	c85daa2ece	Merge branch 'master' into docs-add-reactions	2016-12-20 13:53:49 -08:00
Riley Davis	652a41971b	Merge branch 'master' ... Conflicts: client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js	2016-12-20 14:51:36 -07:00
gaba	16a4daaeb3	Merge branch 'master' into csrf	2016-12-20 13:46:08 -08:00
David Jay	c4510c1abf	Updating action documentation.	2016-12-20 13:43:38 -08:00
Riley Davis	7351aecade	update user constants	2016-12-20 13:48:00 -07:00
Riley Davis	55c5f6d5be	use spread operator. update action constants	2016-12-20 13:25:21 -07:00
Riley Davis	96141d8abc	remove status from new comment	2016-12-20 13:23:36 -07:00
David Jay	d7829232a3	Making font sizes relative.	2016-12-20 12:00:56 -08:00
Riley Davis	7a1c3e730b	fix lint	2016-12-20 12:56:44 -07:00
Riley Davis	96ed008b96	remove some more string literals	2016-12-20 12:50:12 -07:00
Riley Davis	0a19a284ab	simplify banUser dialog action creators	2016-12-20 12:47:23 -07:00
Riley Davis	268f6616a5	update the status correctly	2016-12-20 12:45:30 -07:00
Riley Davis	11d8b2cd91	update a comment's status	2016-12-20 12:39:57 -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
David Jay	889f29739c	Merge branch 'master' into add-flag-option	2016-12-20 11:22:38 -08:00
Riley Davis	b4b3420549	remove banUser and create fetchModerationQueueComments actions	2016-12-20 12:21:10 -07:00
Riley Davis	8849dcbf5c	add propTypes to CommentList	2016-12-20 10:29:49 -07: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
Riley Davis	706cefad9e	simplify wordlist ui further	2016-12-19 16:49:05 -07:00
Riley Davis	123ba07b63	add tag package to simplify wordlist ui	2016-12-19 16:43:00 -07:00
Riley Davis	86c74d69c7	save wordlist to the server	2016-12-19 15:03:18 -07:00
Riley Davis	7742dbf9a2	add a suspect words card	2016-12-19 13:07:50 -07:00
David Jay	4d508f6afa	Merge branch 'master' of github.com:coralproject/talk into admin-asset-list	2016-12-19 13:41:43 -05:00
David Jay	3b17ae5313	Merge branch 'master' into add-flag-option	2016-12-19 12:37:24 -05:00
Belen Curcio	2d9ee1d9d7	Moderaion Queue updated to master	2016-12-19 13:34:42 -03:00
Belen Curcio	9950595245	Commenter likes a comment	2016-12-18 19:34:41 -03:00
Belen Curcio	f52a1668b0	Test logouts and approves after commenting	2016-12-18 19:07:31 -03:00
Belen Curcio	428a62ffd4	tests	2016-12-18 11:31:27 -03:00
Belen Curcio	927a3fcd83	Updating package.json and nightwatch package	2016-12-17 10:50:47 -03:00
gaba	dd032521c0	Merge branch 'master' into csrf	2016-12-16 17:55:49 -08:00
gaba	ee6c4bb831	Merge branch 'master' into issue-186	2016-12-16 17:55:21 -08:00
Gabriela Rodríguez Berón	fcb3eeca9e	Merge branch 'master' into add-flag-option	2016-12-16 17:53:22 -08:00
Gabriela Rodríguez Berón	4f0c0d2e42	Merge branch 'master' into fix-config-warnings	2016-12-16 17:44:21 -08:00
Gabriela Rodríguez Berón	0e0aafeb1c	Merge branch 'master' into add-flag-option	2016-12-16 17:44:03 -08:00
gaba	3266934fc8	It needed to have the Moderation Modal inside a tab container too.	2016-12-16 17:39:22 -08: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	5973560043	Updating translation.	2016-12-16 18:20:31 -05:00
David Jay	871836f636	Adding description field to flags.	2016-12-16 18:19:05 -05: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	c34bf5036e	Updating page count.	2016-12-16 17:20:31 -05:00
Riley Davis	13994686e4	fix some config warnings	2016-12-16 15:20:02 -07:00
David Jay	0d2d6b52a5	Adding pagination.	2016-12-16 17:07:59 -05:00
Dan Zajdband	ad084847e5	Lint	2016-12-16 16:35:39 -05:00