wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 03:57:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,268 Commits 10 Branches 125 Tags
3dfa4969e52fc31f8d14a0458440c76bc1188a21
Commit Graph

256 Commits

Author SHA1 Message Date
Riley Davis 9d1d109ec0 Merge branch 'master' 
Conflicts:
	client/coral-admin/src/reducers/index.js
 2016-12-22 12:28:55 -07:00
Riley Davis c6170f558a Merge branch 'master' into add-flag-option 2016-12-22 10:38:34 -07:00
Riley Davis b8b47e9c2c normalize constant names 2016-12-21 16:56:29 -07:00
Wyatt Johnson 6db2361edb Adjusted middleware 2016-12-21 16:19:19 -07:00
Wyatt Johnson 8233937f7a Moved wordlist loading into the middleware 2016-12-21 15:55:40 -07:00
David Jay c867ae8eeb Removing Next and Prev from pager and updating tests. 2016-12-21 12:11:42 -08:00
David Jay a490aaeaf0 Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:02:24 -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
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 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
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 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 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
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
Riley Davis bcfff516cc Merged branch master into suspect-wordlist 2016-12-16 13:57:34 -07:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Riley Davis 0aa7a216be update tests 2016-12-16 12:29:27 -07:00
riley 27116b84ce Merged master into suspect-wordlist 2016-12-15 16:12:19 -07:00
Riley Davis 64ac1610eb address different comment in result 2016-12-15 15:58:56 -07:00
riley 833094b6dd check the author_id instead of comment.id 2016-12-15 15:53:47 -07:00
riley 115d19945b add tests for comment stream for non-admins 2016-12-15 15:43:22 -07:00
riley 632956e084 failed to update tests. working now 2016-12-15 15:20:02 -07:00
Wyatt Johnson 9cf2d88ce2 Merge branch 'master' into suspect-wordlist 2016-12-15 13:51:16 -07:00
David Jay 328eaad8e5 Adding update state to reducer. 2016-12-15 14:05:10 -05:00
David Jay c7b232f0b3 Adding action to upate asset state. 2016-12-15 13:10:23 -05:00
David Jay 78c81aeaf4 Adding asset reducer. 2016-12-14 19:30:59 -05:00
David Jay b98201afa3 Adding and testing function to fetch assets in talk reducer. 2016-12-14 19:03:07 -05:00
Riley Davis a6fdd2e46b remove redundant endpoint 2016-12-14 13:53:07 -07:00
Riley Davis a072601c3e ignore html files 2016-12-14 13:35:28 -07:00