wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-29 21:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,179 Commits 10 Branches 125 Tags
652a41971b337f77ca7c8be74942e00ddecfaa4b
Commit Graph

1179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riley Davis 652a41971b Merge branch 'master' 
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
 2016-12-20 14:51:36 -07: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
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
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
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
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
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
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
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 ee6c4bb831 Merge branch 'master' into issue-186 2016-12-16 17:55:21 -08:00