Commit Graph

120 Commits

Author SHA1 Message Date
Benjamin Goering eb1c1db09b Ignore users queries are excludeIgnored: Boolean instead of notIgnoredBy: String 2017-04-11 14:20:39 -07:00
Benjamin Goering 7dfe12b874 Users cannot ignore themselves at service layer 2017-04-11 14:20:37 -07:00
Benjamin Goering 873da1cea9 Embed doesn't show comments from ignored users 2017-04-11 14:20:37 -07:00
Benjamin Goering 2656141d59 Add stopIgnoringUser mutation and Embed uses it 2017-04-11 14:19:34 -07:00
Benjamin Goering c59ddb72a6 Manage ignored users UI 2017-04-11 14:19:34 -07:00
Benjamin Goering 545f176bb8 Add ignoreUser mutation and myIgnoredUsers root query 2017-04-11 14:19:32 -07:00
Riley Davis ca04db80dc Merge branch 'master' into optional-google-fonts 2017-04-07 10:42:20 -06:00
Riley Davis b24ee81e34 remove Lato from google fonts 2017-04-05 12:14:51 -06:00
Belen Curcio 659c63e5cb Adds graph functionality for plugins 2017-03-29 22:14:56 -03:00
Belen Curcio cfb28c4c2a Merge 2017-03-29 16:42:59 -03:00
Wyatt Johnson 8680d6cab8 Fixes issues with wordlist and usernames
- Ensure that the wordlist can't contain emoji's
- Ensure that username checks user the correct tokenizer
2017-03-29 10:57:12 -06:00
Gabriela Rodríguez Berón 155be523ff Merge branch 'master' into community-flags 2017-03-28 07:14:30 -07:00
gaba 9eaed90318 Revert "Revert "Story 138187767 - Moderate Flag User Names""
This reverts commit 903aa23f19.
2017-03-24 11:15:42 -07:00
Wyatt Johnson 228fdeac4d Removed root .babelrc file, upgrades
- Upgraded packages
- Fixed sourcemaps
- Moved .babelrc config into client folder
- Created .babelrc in tests folder for client tests
2017-03-24 11:12:57 -06:00
Belen Curcio 2e80d2a36e fixing and separating broken tests /client /server 2017-03-23 12:27:30 -03:00
David Erwin 903aa23f19 Revert "Story 138187767 - Moderate Flag User Names" 2017-03-23 11:18:55 -04:00
Belén Curcio 1e54a997d6 Merge branch 'master' into my-comments-ux 2017-03-22 16:25:06 -03:00
Belen Curcio 4f50e8f19c Removing tests for now until we find a better solution for this 2017-03-22 16:19:05 -03:00
riley ca07406b1a Merge branch 'master' into recaptcha-support 2017-03-20 07:36:20 -07:00
riley b1f426e70d Merge branch 'master' into recaptcha-support 2017-03-13 12:27:19 -06:00
Gabriela Rodríguez Berón dae2e7d9d6 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-08 20:09:50 +01:00
gaba 564b8d8eaa Merge branch 'master' into story-138187767-mod-flag-names 2017-03-07 13:04:28 +01:00
Wyatt Johnson d82f3d0f0d Added initial recaptcha + RL support 2017-03-06 15:26:44 -07:00
Riley Davis 5cb7172bbe Merge branch 'master'
Conflicts:
	client/coral-embed-stream/src/Embed.js
2017-03-06 11:01:37 -07:00
Riley Davis 000833509f remove notification reducer. have parent show notifications 2017-03-06 10:59:12 -07:00
Belén Curcio f30275e375 Merge branch 'master' into 138617379_best_comments 2017-03-03 09:51:25 -05:00
David Jay 06f9c12f5e Updating comment count. 2017-03-02 13:11:16 -05:00
David Jay 609af767e8 Merge branch 'master' of github.com:coralproject/talk into bugfix-e2e-permalink 2017-03-02 13:04:32 -05:00
David Jay acda388d4e Updating e2e tests. 2017-03-02 13:00:54 -05:00
Wyatt Johnson ec09f1ca44 Merge branch 'master' into 138617379_best_comments 2017-03-01 16:47:03 -07:00
Wyatt Johnson 57fc4b8a3f Fixed test 2017-03-01 16:40:47 -07:00
Benjamin Goering 5cb522c419 Merge branch 'master' into 138617379_best_comments 2017-03-01 20:49:04 +08:00
Benjamin Goering 405dac292c Only transform-async-to-generator for client code. Allows async to work with mocha tests (if proper node version) 2017-03-01 13:43:39 +08:00
Benjamin Goering 378622f7e8 commentTag mutation tests await SettingsService 2017-03-01 12:46:35 +08:00
Benjamin Goering d9df38fc3a fix e2e tests with .comment selector that avoids hidden dialog 2017-02-28 20:00:41 +08:00
Benjamin Goering f8479a8661 fix e2e tests with .comment selector that avoids hidden dialog 2017-02-28 20:00:41 +08:00
Benjamin Goering 96d1447602 remove debugging code from embedStreamPage 2017-02-28 19:59:35 +08:00
Benjamin Goering bce84f24fd Embed can remove best tag 2017-02-28 19:59:33 +08:00
Benjamin Goering 98f3033326 Add permission checking to addCommentTag,removeCommentTag 2017-02-28 19:59:33 +08:00
Benjamin Goering 30ee80b12c basic working removeCommentTag mutation 2017-02-28 19:59:33 +08:00
Benjamin Goering 4ff6bce8ec Add ComentsService#removeTag 2017-02-28 19:59:33 +08:00
Benjamin Goering 1bb20923a2 Fix Commenter/BestCommentTest to postComment before checking things. 2017-02-28 19:59:32 +08:00
Benjamin Goering 6e338290a1 addCommentTag mutation works 2017-02-28 19:59:32 +08:00
Benjamin Goering 907c4526da BestButton only shows if currentUser can use it (and e2e) 2017-02-28 19:57:50 +08:00
Benjamin Goering a26a60cc67 minial best button uionly and e2e 2017-02-28 19:57:50 +08:00
Wyatt Johnson 799727264e Removed log 2017-02-24 09:57:57 -07:00
Wyatt Johnson f5277ce5e3 Patched silly bug 2017-02-24 09:57:24 -07:00
Riley Davis 5d1139dbdd Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2017-02-24 08:49:30 -07:00
Wyatt Johnson 9e759c7667 Adjusted BE beheviour 2017-02-22 13:55:48 -07:00
David Jay 9149b737f5 Retrieving counts and displaying new comments to user. 2017-02-21 17:23:09 -05:00