3586 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wyatt Johnson	36c9f51aa8	Initial support for Heroku Deployment	2016-12-20 17:33:18 -07:00
David Jay	7faa3eeecf	Merge branch 'master' of github.com:coralproject/talk into add-flag-option	2016-12-20 16:23:39 -08:00
David Jay	8052dd9149	Merge branch 'docs-add-reactions' of github.com:coralproject/talk into docs-add-reactions	2016-12-20 16:19:57 -08:00
David Jay	d998549fd0	Updating swagger docs.	2016-12-20 16:16:10 -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
Gabriela Rodríguez Berón	9d22dcd0d4	Merge pull request #190 from coralproject/refactor-talk-adapter ... Refactor talk adapter	2016-12-20 13:45:19 -08:00
David Jay	c4510c1abf	Updating action documentation.	2016-12-20 13:43:38 -08:00
David Jay	67225b3a4b	Updating documentation for actions.	2016-12-20 13:39:04 -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
gaba	e16bc8f7ad	Adds agent to persist session in tests.	2016-12-20 12:18:30 -08: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	f05ef58720	Merge branch 'master' into admin-asset-list	2016-12-20 11:24:01 -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	dff8413404	Adding pending users and actions to moderation queue call.	2016-12-19 20:34:27 -05:00
David Jay	20505acfbe	Updating tests for pending users endpoint.	2016-12-19 20:27:58 -05:00
David Jay	be3d506459	Moving action metadata to nested object.	2016-12-19 20:10:42 -05:00
David Jay	845d274b9b	Creatind endpoint to return pending users and action summaries.	2016-12-19 19:54:20 -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
Wyatt Johnson	2e3594000d	Merge pull request #188 from coralproject/e2e-tests ... E2e tests	2016-12-19 12:19:52 -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
Belen Curcio	3fbb8f2345	test env	2016-12-19 14:54:27 -03:00
Belen Curcio	f901b07fd8	Updated script	2016-12-19 14:39:25 -03:00
David Jay	3b17ae5313	Merge branch 'master' into add-flag-option	2016-12-19 12:37:24 -05:00
Belen Curcio	374de3cd27	Replacing export default by module.exports	2016-12-19 14:34:26 -03:00
Riley Davis	d65f786dcd	Merge branch 'master' ... Conflicts: routes/api/comments/index.js	2016-12-19 10:28:54 -07:00
Belen Curcio	2d9ee1d9d7	Moderaion Queue updated to master	2016-12-19 13:34:42 -03:00
Belen Curcio	29ee652ac8	ready to push changes	2016-12-19 13:12:20 -03:00
Belen Curcio	155351a88f	Base tests	2016-12-19 12:49:00 -03:00
Belen Curcio	ab05403d1c	Sign Up test	2016-12-19 12:20:18 -03:00
Belen Curcio	3646b07178	Visitor updated test	2016-12-19 12:03:36 -03:00
Belen Curcio	142d513b6c	Permalink tests	2016-12-19 11:50:53 -03:00