Commit Graph
877 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 8f1ce9cef6 Merge branch 'master' into remember-sort 2017-09-11 11:53:07 +01:00
Belén CurcioandGitHub b75539fb57 Merge branch 'master' into reject-instream 2017-09-08 17:47:09 -03:00
Belen Curcio 72530e7501 Linting and Indenting 2017-09-08 17:17:03 -03:00
Belen Curcio 790c20e7ac Indent 2017-09-08 17:14:15 -03:00
Belen Curcio 2cbd59b4b5 Featured comments error in permalink view, handling permaview moderation and handling replies moderation 2017-09-08 17:05:20 -03:00
KiwiandGitHub d88919e27b Merge branch 'master' into remember-sort 2017-09-08 19:29:08 +02:00
KiwiandGitHub be86a6f3dc Merge branch 'master' into remember-sort 2017-09-08 19:28:26 +02:00
Chi Vinh Le 4046b6e0a6 Remove zombie files 2017-09-09 00:20:18 +07:00
Chi Vinh Le 9f33a77745 Implement and use pymStorage 2017-09-09 00:11:15 +07:00
Belen Curcio f33c31c70e Merge branch 'master' of github.com:coralproject/talk into reject-instream 2017-09-08 13:49:54 -03:00
Belen Curcio fefacf039f Featured comments should have ACCEPTED status 2017-09-08 13:25:23 -03:00
Chi Vinh Le 0cfd8afce7 Merge branch 'master' into remember-sort
Conflicts:
	.eslintignore
	.gitignore
2017-09-08 17:56:18 +07:00
Chi Vinh Le e5bd8e2a3b No need to check for loading config anymore 2017-09-08 17:47:02 +07:00
Chi Vinh Le 7051c76b40 Init step for plugins and bootstrap, introspection service 2017-09-08 17:37:27 +07:00
Kim GardnerandGitHub 76fd261141 Merge branch 'master' into prop-types 2017-09-08 10:56:35 +01:00
Kim GardnerandGitHub 299c6f1ffd Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-08 10:16:40 +01:00
Wyatt Johnson f69703a8ba fixed missing 2017-09-08 00:47:08 -06:00
Wyatt Johnson 2e350c2244 Merge branch 'master' into prop-types 2017-09-08 00:44:09 -06:00
Wyatt Johnson 2b91bcffda fixes #923 2017-09-07 13:49:22 -06:00
Belen Curcio f6b02a52fe Cache and Tombstoning rejected comment working 2017-09-07 13:08:52 -03:00
Chi Vinh Le f1c5d479ad Merge branch 'master' into feature/talk-plugin-toxic-comments
Conflicts:
	graph/resolvers/root_mutation.js
	graph/typeDefs.graphql
2017-09-07 16:59:46 +07:00
Chi Vinh Le 6f82fd76f5 First draft of toxic-comments 2017-09-06 22:11:48 +07:00
Wyatt Johnson 7b27feee96 fixed typo 2017-09-05 09:45:31 -06:00
KiwiandGitHub 00b46fe0ea Merge branch 'master' into author-menu 2017-09-04 20:27:19 +02:00
Chi Vinh Le 77396ccc31 Fix graphql tree bug 2017-09-05 01:17:05 +07:00
Chi Vinh Le e1a5a64b39 Pluginize stop ignoring user feature in profile 2017-09-05 01:09:43 +07:00
Chi Vinh Le c0252e160b Fix reply fragments 2017-09-04 16:44:53 +07:00
Chi Vinh Le b2ef7fa795 Fix tombstone bug 2017-09-04 15:51:04 +07:00
Chi Vinh Le ffef2f640d First implementation of ignore user plugin 2017-09-04 15:40:39 +07:00
Belen Curcio 7bb4b03daa Retrieving me from Comment triggers a change 2017-09-01 12:17:48 -03:00
Chi Vinh Le b61afbc1d6 Make rendering edit pure 2017-08-31 19:04:54 +07:00
Wyatt Johnson c8d1871418 Merge branch 'master' into lint-upgrade 2017-08-29 11:56:59 -06:00
Chi Vinh Le 90a0446afa Move Spinner down to replacing TabContent 2017-08-30 00:35:55 +07:00
Chi Vinh Le 21e4cf5865 Live update replies on all sort and always refetch 2017-08-30 00:27:14 +07:00
Wyatt JohnsonandGitHub 30e6f1d169 Merge branch 'master' into lint-upgrade 2017-08-28 16:19:10 -06:00
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -06:00
Wyatt Johnson deb69d4e8c fixed prop-types deprecation 2017-08-28 12:03:20 -06:00
Belén CurcioandGitHub 96006a0196 Merge branch 'master' into subscriber 2017-08-28 12:26:08 -03:00
Belén CurcioandGitHub 3108f3dac3 Merge branch 'master' into subscriber 2017-08-28 12:22:05 -03:00
Kim GardnerandGitHub 1e2c617775 Merge branch 'master' into fix-permalink-liveupdates 2017-08-28 16:17:40 +01:00
Belen Curcio 12d66a49d0 Adding commentAuthorTags 2017-08-28 12:17:01 -03:00
Chi Vinh Le 7856c9d947 Fix live update false comments in permalink view 2017-08-28 21:05:32 +07:00
Chi Vinh Le e4490e20a7 Merge branch 'master' into user-sort
Conflicts:
	package.json
2017-08-28 18:16:18 +07:00
Chi Vinh Le f9bc5f79ec Don't sort and ignore duplicate comments (embed-stream) 2017-08-28 18:08:33 +07:00
Wyatt Johnson 8a5db167ff changed sort -> sortOrder 2017-08-25 09:59:37 -06:00
Chi Vinh Le 48595a1bbf Merge branch 'master' into user-sort
Conflicts:
	client/coral-admin/src/reducers/moderation.js
	client/coral-embed-stream/src/actions/stream.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-framework/components/Slot.js
	plugin-api/beta/client/utils/index.js
	test/server/routes/api/account/index.js
2017-08-25 21:55:00 +07:00
Belén CurcioandGitHub ce63942902 Merge branch 'master' into questionbox 2017-08-25 11:52:11 -03:00
Chi Vinh Le 7f899b0440 Attach to fragments tree 2017-08-25 21:40:57 +07:00
Chi Vinh Le 6b96fcfad1 Only unsubscribe from newest comments 2017-08-25 21:05:30 +07:00
Chi Vinh Le 9e2f6f1f63 Use factory 2017-08-25 19:40:55 +07:00