wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-07 11:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,586 Commits 10 Branches 125 Tags
6a46fb822d82237db9443bf94de63e8ed95de5d7
Commit Graph
800 Commits
Author SHA1 Message Date
Riley Davis 7cbd06834f set defaults on fetchAssets 2016-12-21 16:39:29 -07:00
David Jay cfed42be2c Correcting bug in fetchAssets. 2016-12-21 12:05:25 -08:00
David Jay 29fa26260c Handling undefined values in fetchAssets call. 2016-12-21 11:39:21 -08:00
Riley Davis 50112d3166 create mapStateToProps 2016-12-21 12:22:54 -07:00
Riley Davis 4f9e793810 remove logs 2016-12-21 11:23:08 -07:00
riley f5b8c0bbba fix lint 2016-12-21 11:19:17 -07:00
Riley Davis 18d4c58a48 allow pasting comma-separated lists 2016-12-21 11:12:09 -07: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 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
Riley Davis 652a41971b Merge branch 'master' 
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
 2016-12-20 14:51:36 -07: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
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 2d9ee1d9d7 Moderaion Queue updated to master 2016-12-19 13:34:42 -03:00
Belen Curcio f52a1668b0 Test logouts and approves after commenting 2016-12-18 19:07:31 -03:00
Belen Curcio 927a3fcd83 Updating package.json and nightwatch package 2016-12-17 10:50:47 -03:00
gaba ee6c4bb831 Merge branch 'master' into issue-186 2016-12-16 17:55:21 -08:00
Gabriela Rodríguez BerónandGitHub 4f0c0d2e42 Merge branch 'master' into fix-config-warnings 2016-12-16 17:44:21 -08:00
gaba 3266934fc8 It needed to have the Moderation Modal inside a tab container too. 2016-12-16 17:39:22 -08: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
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
David Jay 979b54166b Updating search with delay. 2016-12-16 16:24:32 -05:00
David Jay d4880ff183 Adding asset sorting to endpoint. 2016-12-16 15:35:15 -05:00
Dan ZajdbandandGitHub 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
Dan ZajdbandandGitHub fcb107aefe Global comment stream close setting (#171) 
* Added basic ui

* Added functionality

* Linted code

* using named params instead of props

* lint

* fixed missing merge
 2016-12-15 15:50:19 -05:00
David Jay 1154b65c91 Updating state from menu. 2016-12-15 14:19:44 -05: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 86eef68b16 Adding status menu. 2016-12-15 12:25:43 -05:00
David Jay d526898962 Loading assets into Streams component. 2016-12-14 20:19:27 -05:00
David Jay faafbfa78c Loading assets and adding to store. 2016-12-14 19:58:04 -05:00