wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-27 11:28:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,179 Commits 10 Branches 125 Tags
652a41971b337f77ca7c8be74942e00ddecfaa4b
Commit Graph
221 Commits
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
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
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
Riley Davis 13994686e4 fix some config warnings 2016-12-16 15:20:02 -07: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 JayandGitHub 5cb1a15273 Merge branch 'master' into use-js-while-rendering 2016-12-13 13:06:47 -05:00
Gabriela Rodríguez BerónandGitHub b895dbc8cd Update translations.json 2016-12-12 22:38:53 -08:00
David Jay e88e8212f4 Updating translations. 2016-12-12 20:33:55 -05:00
David Jay 426e0a02bd Raising error if no count is entered. 2016-12-12 19:12:53 -05:00
David Jay bd240923cc Updating default charcount setting. 2016-12-12 19:10:54 -05:00
David Jay cd63f49a5e Disabling save button on error and updating translations. 2016-12-12 19:08:35 -05:00
David Jay ba8a845741 Making character input field green to match designs. 2016-12-12 18:14:03 -05:00
David Jay 4a4b92299c Adding error message. 2016-12-12 18:10:47 -05:00
David Jay 48b1f7fc2b Moving text to translations file. 2016-12-12 17:45:20 -05:00
David Jay 182c504edb Updating settings box style. 2016-12-12 17:35:33 -05:00
David Jay 39479fd9ad Add character count field. 2016-12-12 17:07:43 -05:00
Riley DavisandGitHub 749a5d9853 Merge branch 'master' into use-js-while-rendering 2016-12-12 07:34:36 -10:00
Riley DavisandGitHub c18f885277 Merge branch 'master' into use-js-while-rendering 2016-12-09 15:06:51 -10:00
Riley DavisandGitHub 9e353eaae8 Merge branch 'master' into simplify-community-page 2016-12-09 15:06:43 -10:00
Riley DavisandGitHub 84453ef7bd Merge branch 'master' into use-js-while-rendering 2016-12-09 14:53:56 -10:00
Riley Davis 0f7e4bd239 simplify Community page 2016-12-09 14:52:17 -10:00
Riley Davis 7bfd9e2e71 remove lodash implementation 2016-12-09 14:48:29 -10:00
Riley Davis 74c4d812cd less changes 2016-12-09 14:39:16 -10:00
Riley Davis 7186c2b060 have moderation queue use proper mapStateToProps 2016-12-09 14:38:29 -10:00
David Jay faca09dbd2 Merge branch 'master' of github.com:coralproject/talk into update-users-api 2016-12-09 19:35:09 -05:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
Riley Davis b05f4cfb16 remove logs 2016-12-09 14:25:24 -10:00
Riley Davis 7732aa4abe typo 2016-12-09 14:20:46 -10:00