wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 05:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,586 Commits 10 Branches 125 Tags
6a46fb822d82237db9443bf94de63e8ed95de5d7
Commit Graph

1961 Commits

Author SHA1 Message Date
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
David Jay 979b54166b Updating search with delay. 2016-12-16 16:24:32 -05:00
Dan Zajdband 6ddece4717 Fixed closing at 2016-12-16 16:16:48 -05:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Riley Davis 5d96ff9d63 Merge branch 'master' into my-comments-designs 2016-12-16 12:29:38 -07:00
Riley Davis 647d62969d design tweaks per kim 2016-12-16 12:24:32 -07:00
Dan Zajdband decdfad39b Adding show shortcuts button and minor fixes (#177) 
* Adding show shortcuts button and minor fixes

* Lint

* Unwrapping the showComments method
 2016-12-16 12:32:09 -05:00
Dan Zajdband 9e9291ba64 Lint 2016-12-16 12:07:54 -05:00
Dan Zajdband 8631c3bd9b Adding show shortcuts button and minor fixes 2016-12-16 12:03:37 -05:00
gaba 4a76e43309 Merge branch 'master' into csrf 2016-12-15 14:25:08 -08:00
riley c7d4bb6961 add a newline so lint doesn't complain 2016-12-15 15:20:50 -07:00
riley 632956e084 failed to update tests. working now 2016-12-15 15:20:02 -07:00
gaba 70c86bf8f5 Merge branch 'master' into csrf 2016-12-15 13:54:22 -08:00
Gabriela Rodríguez Berón 70ef071464 Merge branch 'master' into fix-embed-pathing 2016-12-15 13:50:41 -08:00
Riley Davis 181e558b28 comments not showing on embed page 2016-12-15 14:36:14 -07:00
Riley Davis 203d35e6d1 link to comment instead of article 2016-12-15 14:33:33 -07:00
gaba e76d6e4694 Merge branch 'master' into csrf 2016-12-15 13:23:18 -08:00
Riley Davis 6f0de84144 fix lint 2016-12-15 14:03:54 -07:00
gaba fc042779c2 Adds csurf to and cookie-parser to manage CRSF protection. 2016-12-15 12:56:34 -08:00
Gabriela Rodríguez Berón 5ffc575fae Merge branch 'master' into my-comments-fix 2016-12-15 12:52:26 -08:00