7162 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Belen Curcio	6d473f780a	Permalink tests	2016-12-19 11:23:49 -03:00
Belen Curcio	89709a80c1	Flag Comment	2016-12-19 10:31:51 -03:00
Belen Curcio	f493e5413d	Passing tests	2016-12-19 09:30:28 -03:00
Belen Curcio	34b56a3044	Visitor tries to flag a comment	2016-12-18 20:21:26 -03:00
Belen Curcio	3f56fcba07	Like tests text check	2016-12-18 20:13:02 -03:00
Belen Curcio	e2e278e296	Ádding visitor tests	2016-12-18 19:56:11 -03:00
Belen Curcio	02b8bb61dd	Ádding visitor tests	2016-12-18 19:41:16 -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	0cc0681559	post Comments as a logged in commenter	2016-12-18 13:39:25 -03:00
Belen Curcio	fab9f96eb3	Commenter posts a comment	2016-12-18 13:28:45 -03:00
Belen Curcio	67aeb223d6	Login tests	2016-12-18 13:07:16 -03:00
Belen Curcio	428a62ffd4	tests	2016-12-18 11:31:27 -03:00
Belen Curcio	27ffb05454	Creating the test users before de e2e	2016-12-17 11:22:01 -03:00
Belen Curcio	f32f300345	Nightwatch config	2016-12-17 10:53:42 -03:00
Belen Curcio	927a3fcd83	Updating package.json and nightwatch package	2016-12-17 10:50:47 -03:00
Belen Curcio	72d36713e9	Merge branch 'master' of github.com:coralproject/talk into e2e-tests	2016-12-17 10:48:37 -03:00
Belen Curcio	0548b5faf1	Adding Actions	2016-12-17 10:48:26 -03:00
Belen Curcio	d36a471780	Updating package.json and nightwatch package	2016-12-17 10:45:53 -03:00
Belen Curcio	8eea656b96	Updated Nightwatch conf with Integration Enviroment	2016-12-17 10:45:24 -03:00
Belen Curcio	e5620fb718	eslint update	2016-12-17 10:44:59 -03:00
gaba	4172066c94	Silly commit.	2016-12-16 19:44:01 -08:00
Kim Gardner	2324ae2d20	Merge pull request #187 from coralproject/issue-186 ... It needed to have the Moderation Modal inside a tab container too.	2016-12-16 21:27:55 -05:00
gaba	dd032521c0	Merge branch 'master' into csrf	2016-12-16 17:55:49 -08:00