Commit Graph

7162 Commits

Author SHA1 Message Date
Belen Curcio 367ec00a02 Refactor for setUserStatus to setUserBanStatus 2017-11-19 21:18:50 -03:00
Belen Curcio e34ba248b9 Refactor for setUserStatus to setUserBanStatus 2017-11-19 21:04:04 -03:00
Belen Curcio 6d6030d60a Removing setCommenterStatus 2017-11-19 20:38:13 -03:00
Belen Curcio e941f00384 Suspend User Mutation 2017-11-19 20:30:11 -03:00
Wyatt Johnson e17b15ec2c Merge branch 'next' into user-status-refactor 2017-11-17 09:43:59 -07:00
Wyatt Johnson c98c9b3369 Merge branch 'master' into next 2017-11-17 09:29:31 -07:00
Wyatt Johnson 73cec00fb9 fixed migration issues 2017-11-17 09:17:43 -07:00
Kim Gardner 2d43eef508 Merge pull request #1167 from coralproject/query-status-history
Fix SetCommentStatus mutation on admin side
v3.8.0
2017-11-16 19:05:23 +00:00
Kiwi fa22e45a4d Merge branch 'master' into query-status-history 2017-11-16 19:53:23 +01:00
Chi Vinh Le abdf5335da Add status_history to query 2017-11-16 19:52:47 +01:00
Wyatt Johnson c24454e234 Merge pull request #1165 from alleyinteractive/expose-recaptcha
Export CheckRecaptcha, so that it can be used in other services.
2017-11-16 11:36:25 -07:00
Wyatt Johnson 97e2e61a4b Merge branch 'master' into expose-recaptcha 2017-11-16 10:19:18 -07:00
Kim Gardner 57ced3c91f Merge pull request #1155 from coralproject/bump-version-3-8-0
Bump version 3.8.0
2017-11-16 16:57:36 +00:00
Max Eddy c664438ade Export CheckRecaptcha, so that it can be used in other services. 2017-11-16 09:09:16 -05:00
Kim Gardner a5b5043a0d Merge branch 'master' into bump-version-3-8-0 2017-11-16 11:47:34 +00:00
Belén Curcio 03a0d904d2 Merge pull request #1164 from coralproject/correct-proptype
Correct proptype
2017-11-15 16:45:30 -03:00
Chi Vinh Le 315d3babde Correct prop types 2 2017-11-15 20:03:41 +01:00
Chi Vinh Le 4d6055b9b8 Correct prop type 2017-11-15 19:53:58 +01:00
Kim Gardner 77c8d966ab Merge pull request #1162 from coralproject/slot-classnames
Slot Classnames
2017-11-15 18:20:21 +00:00
Kim Gardner cabadf467f Merge branch 'master' into slot-classnames 2017-11-15 18:09:11 +00:00
Kim Gardner 0807acc98f Merge pull request #1159 from coralproject/more-undo
Enhanced undo
2017-11-15 18:09:04 +00:00
Belén Curcio 3c5b56c599 Merge branch 'master' into more-undo 2017-11-15 15:00:48 -03:00
Belen Curcio 899bba7327 Adding Proptypes and classNames for the Slots 🎉 2017-11-15 14:50:33 -03:00
Belen Curcio 41dd3eb180 Merge branch 'master' of github.com:coralproject/talk 2017-11-15 14:40:22 -03:00
Belen Curcio 90a9ff251d wip 2017-11-15 14:39:59 -03:00
Belen Curcio a626dfafc8 Refactor Admin Side queries 2017-11-15 13:53:32 -03:00
Belen Curcio b4aeee9433 Client Refactor 2017-11-15 13:21:20 -03:00
Kim Gardner 81d90cb138 Merge pull request #1161 from coralproject/break-word-2
Support long words for my and featured comments
2017-11-15 12:46:49 +00:00
Chi Vinh Le 2882dfbadb Fix flexbox overflowing 2017-11-15 13:34:29 +01:00
Chi Vinh Le f2b9db9dbc Support long words for my and featured comments 2017-11-15 13:07:33 +01:00
Kim Gardner c563a13e7c Merge pull request #1160 from coralproject/break-word
Break long words in comment
2017-11-14 16:31:55 +00:00
Belen Curcio 5976595871 Merge branch 'master' of github.com:coralproject/talk 2017-11-14 13:03:10 -03:00
Chi Vinh Le 8a4a7d3589 Break long words in comment 2017-11-14 15:37:26 +01:00
Chi Vinh Le 5073e60df5 Translate 2017-11-14 14:05:30 +01:00
Chi Vinh Le 5a71db2568 Undo to previous status + Live updates 2017-11-14 13:58:18 +01:00
Kiwi ac0acea22b Merge pull request #1149 from devonJS/undo-reject
undo reject comment on stream
2017-11-14 12:49:48 +01:00
Wyatt Johnson ef40e9dce5 spelling 2017-11-13 16:08:20 -07:00
Wyatt Johnson e090ba9123 Merge branch 'next' into user-status-refactor 2017-11-13 16:06:16 -07:00
Wyatt Johnson 81f825d4b3 Merge branch 'master' into next 2017-11-13 16:01:11 -07:00
Wyatt Johnson ecf02f454c staff members cannot be flagged 2017-11-13 15:57:54 -07:00
Wyatt Johnson 9f823c0b11 added action counts for users 2017-11-13 15:46:49 -07:00
Belen Curcio 6198c9e730 Merge branch 'master' of github.com:coralproject/talk 2017-11-13 12:34:44 -03:00
Kiwi 9ac06281e9 Merge branch 'master' into undo-reject 2017-11-13 14:00:21 +01:00
Kim Gardner 78e5cb7aa6 Merge branch 'master' into bump-version-3-8-0 2017-11-13 12:49:47 +00:00
Kiwi 882bf57bbc Merge pull request #1152 from coralproject/user-status
More e2e tests - User Status
2017-11-10 21:16:59 +01:00
Chi Vinh Le 789fb3dfce Disable bs on this branch 2017-11-10 20:59:01 +01:00
Belen Curcio 819b1c597c refactor: working tests 2017-11-10 13:04:46 -03:00
Belen Curcio 38148ad51c Adding post animation test 2017-11-10 12:09:55 -03:00
Belen Curcio 8f6ff46244 passing suspendUserDialog to the adminPage scope 2017-11-10 11:16:35 -03:00
Belen Curcio 4727c52de4 camelCase lodash 2017-11-10 10:48:12 -03:00