Commit Graph

381 Commits

Author SHA1 Message Date
Wyatt Johnson eb586f217b Upgraded/pruned deps, applied linting fixes 2017-08-28 14:06:54 -06:00
Wyatt Johnson e92f75d4ad Merge branch 'master' into debugging-optim 2017-08-28 11:50:02 -06:00
Wyatt Johnson 057d8cabd2 Increased debugging and optimized a query path 2017-08-28 11:47:51 -06:00
Kiwi afd3b1b3fe Merge branch 'master' into fix-action-type-query 2017-08-28 19:21:19 +02:00
Chi Vinh Le 44c6798959 Fix action_type query 2017-08-29 00:20:36 +07:00
Wyatt Johnson 8cfccb7b00 fixed query 2017-08-28 09:42:37 -06:00
Chi Vinh Le e4490e20a7 Merge branch 'master' into user-sort
Conflicts:
	package.json
2017-08-28 18:16:18 +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 Curcio ce63942902 Merge branch 'master' into questionbox 2017-08-25 11:52:11 -03:00
Chi Vinh Le 38c290958c Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort 2017-08-25 20:22:09 +07:00
Chi Vinh Le f0931b4dc6 Fix asset.comment resolver 2017-08-25 19:21:14 +07:00
Belen Curcio 5cb71eaee8 Icon List for Question Box 2017-08-24 16:32:07 -03:00
Wyatt Johnson 60677e3d2a cleaned up user query logic 2017-08-24 13:07:44 -06:00
Wyatt Johnson 9a1374070f small fixes 2017-08-24 09:47:27 -06:00
Chi Vinh Le df60ac4714 Merge branch 'master' into user-sort 2017-08-24 20:09:44 +07:00
Chi Vinh Le ca31dedca8 Make comments query optional 2017-08-24 20:07:45 +07:00
Wyatt Johnson acf792089d added more db optims 2017-08-23 15:42:30 -06:00
Chi Vinh Le ceba418e28 created_at is a Date 2017-08-23 20:14:55 +07:00
Chi Vinh Le 4dd20260a8 Unprotect User.created_at 2017-08-23 17:32:29 +07:00
Wyatt Johnson f85480c0ae Merge branch 'master' into user-sort 2017-08-22 13:04:32 -06:00
Wyatt Johnson ffc6a72017 added docs for Comments.Sort, some changes to interface 2017-08-22 11:47:52 -06:00
Wyatt Johnson b719168b18 Implemented sortBy 2017-08-22 10:11:47 -06:00
Wyatt Johnson e0f9bb4165 optimized to use new query path 2017-08-21 16:08:30 -06:00
Wyatt Johnson eec0e18600 bug fixes, removed dead code 2017-08-21 16:05:35 -06:00
Wyatt Johnson 78d4740abe drastically improved queries involving actions + comments 2017-08-21 15:54:14 -06:00
Wyatt Johnson 01ed9880f4 comment count optim, prep for sortBy 2017-08-21 15:26:04 -06:00
Belen Curcio a540dfe8d4 Adding hasParent on Comment to the Graph 2017-08-21 16:21:39 -03:00
Wyatt Johnson 7552e34a15 Merge branch 'master' into user-sort 2017-08-21 10:58:18 -06:00
Wyatt Johnson ec2c62a607 Merge branch 'master' into user-sort 2017-08-21 08:48:26 -06:00
Kim Gardner 262ec5b0f8 Merge branch 'master' into fix-routes-mount-path 2017-08-21 12:48:49 +01:00
Clint Brown 7a0e04ae56 Fix linting 2017-08-21 09:23:52 +10:00
Wyatt Johnson 7125250cd6 updated tests 2017-08-20 12:54:46 -06:00
Clint Brown b738961e1c Fix paths when using TALK_ROOT_URL_MOUNT_PATH 2017-08-20 23:29:03 +10:00
Wyatt Johnson 1b09825602 added more debugging to redis, improved retry 2017-08-18 11:50:51 -06:00
Wyatt Johnson 686eb614f7 changed cursor to Cursor scalar type, changed SORT_ORDER 2017-08-17 16:43:55 -06:00
Wyatt Johnson b126cc3cb3 initial impl of cached action counts using ee 2017-08-16 15:47:56 -06:00
Kim Gardner 1e00d75e3c Merge branch 'master' into paginate-my-comments 2017-08-09 10:26:18 +01:00
Chi Vinh Le 976bd1e9ad Paginate my comments in profile tab 2017-08-08 22:39:24 +07:00
Wyatt Johnson 567f8bf94e adjusted wrapResponse function 2017-08-07 14:54:11 +10:00
Kiwi 0523a1f828 Merge branch 'master' into view-more-history 2017-08-04 17:07:57 +02:00
Chi Vinh Le 12d3273d3d Support load more in user history 2017-08-04 22:02:44 +07:00
Chi Vinh Le b6d284495e Merge branch 'master' into correctly-resolve-isClosed 2017-08-03 21:00:28 +07:00
Chi Vinh Le da0d0349dd Implement approve and live updates 2017-08-02 21:34:48 +07:00
Chi Vinh Le b6b7570bcc Remove subscription code 2017-08-02 18:14:52 +07:00
Belen Curcio 4e5f1528f9 BE Subscription for Featured Comments 2017-08-01 18:27:02 -03:00
Chi Vinh Le b972f4305e Correctly determine the status of the asset 2017-08-02 00:04:11 +07:00
Wyatt Johnson 83762b880f Added support for reconfiguring the comment count cache expiry 2017-08-01 09:52:18 +10:00
Chi Vinh Le 1f3d97fd6b Allow admins / mods to view context of rejected or premod comments 2017-07-28 18:03:35 +07:00
Wyatt Johnson a54a240ae6 fixed bug with job init 2017-07-27 15:14:11 +10:00