5497 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Baker	d7ac861d3b	Pull guest access token out of the auth session params, otherwise it will break if you open the email on a different device.	2016-02-01 16:33:19 +00:00
Erik Johnston	2d3837bec7	Merge pull request #543 from matrix-org/erikj/sync ... Cache get_room_changes_for_user	2016-02-01 15:05:06 +00:00
Erik Johnston	498c2e60fd	Merge pull request #544 from matrix-org/erikj/stream_rooms ... Only use room_ids if in get_room_events_stream if is_guest	2016-02-01 15:04:57 +00:00
Erik Johnston	ceb6b8680a	Only use room_ids if in get_room_events_stream if is_guest	2016-02-01 10:33:52 +00:00
Erik Johnston	d98a9f2583	Don't use before_token. Its wrong. Use actual limit.	2016-01-31 13:31:15 +00:00
Erik Johnston	226a9a5fa6	Merge pull request #542 from matrix-org/erikj/cache_fix ... Cache fixes	2016-01-29 16:54:34 +00:00
Erik Johnston	25c311eaf6	Cache get_room_changes_for_user	2016-01-29 16:52:48 +00:00
Erik Johnston	cc9c97e0dc	Invalidate _account_data_stream_cache correctly	2016-01-29 16:41:51 +00:00
Erik Johnston	e70165039c	If stream pos is greater then earliest known key and entity hasn't changed, then entity hasn't changed	2016-01-29 16:41:32 +00:00
Erik Johnston	c1de91aca4	Merge pull request #540 from matrix-org/erikj/sync ... Prefill stream change caches	2016-01-29 15:52:42 +00:00
Erik Johnston	b55b90bfb4	Merge pull request #541 from matrix-org/erikj/fixsomeofpush ... Make /events always return a newer token, if one exists	2016-01-29 15:45:35 +00:00
Erik Johnston	8da95b6f1b	Comment. Remove superfluous order by	2016-01-29 15:39:17 +00:00
Mark Haines	b91baae09d	Merge pull request #539 from matrix-org/markjh/3pid ... Fix up the /account/3pid API	2016-01-29 16:34:13 +01:00
Erik Johnston	13724569ec	Deal with None limit	2016-01-29 15:33:44 +00:00
Erik Johnston	4a6eb5eb45	Make /events always return a newer token, if one exists	2016-01-29 15:22:17 +00:00
Mark Haines	6927d0e091	Add missing param to the log line	2016-01-29 15:01:26 +00:00
Erik Johnston	b5dbced938	Don't prefill account data	2016-01-29 14:53:59 +00:00
Mark Haines	f2d5ff5bf2	Fix the mock homserver used in the tests	2016-01-29 14:53:14 +00:00
Erik Johnston	3d60686c0c	Actually use cache	2016-01-29 14:49:11 +00:00
Erik Johnston	45488e0ffa	Max is not a function	2016-01-29 14:42:01 +00:00
Erik Johnston	f67d60496a	Convert param style	2016-01-29 14:41:16 +00:00
Erik Johnston	18579534ea	Prefill stream change caches	2016-01-29 14:37:59 +00:00
Mark Haines	47374a33fc	Merge remote-tracking branch 'origin/develop' into markjh/3pid	2016-01-29 14:15:12 +00:00
Mark Haines	0fcafbece8	Add config option for setting the trusted id servers, disabling checking the ID server in integration tests	2016-01-29 14:12:26 +00:00
Erik Johnston	ebc5f00efe	Bump AccountDataAndTagsChangeCache size	2016-01-29 13:37:40 +00:00
Erik Johnston	ea320d3464	Don't work out unread_notifs_for_room_id unless needed	2016-01-29 13:34:48 +00:00
Mark Haines	5687a00e4e	Allow three_pid_creds as well as threePidCreds in /account/3pid	2016-01-29 13:26:15 +00:00
Erik Johnston	b18114e19e	Merge pull request #536 from matrix-org/erikj/sync ... Make /sync "better".	2016-01-29 13:04:51 +00:00
Erik Johnston	02a9c3be6c	Merge pull request #538 from matrix-org/erikj/fix_lru_cache ... Fix LruCache. Make TreeCache track its own size.	2016-01-29 11:53:55 +00:00
Erik Johnston	4fce59f274	Add tests	2016-01-29 11:33:11 +00:00
Erik Johnston	fb7299800f	Directly set self.value	2016-01-29 11:29:14 +00:00
Erik Johnston	c046630c33	Remove spurious self.size	2016-01-29 11:17:54 +00:00
Erik Johnston	a30364c1f9	Correctly bookkeep the size of TreeCache	2016-01-29 10:44:46 +00:00
Erik Johnston	766526e114	Make TreeCache keep track of its own size.	2016-01-29 10:11:21 +00:00
Erik Johnston	50e18938a9	Reset size on clear	2016-01-29 10:00:45 +00:00
Erik Johnston	f3af1840cb	Merge pull request #537 from matrix-org/erikj/cache_filters ... Cache user filters.	2016-01-28 18:26:16 +00:00
Erik Johnston	467c27a1f9	Amalgamate tags and account data stream caches	2016-01-28 18:20:00 +00:00
Erik Johnston	3f5dd18bd4	If the same as the earliest key, assume nothing has changed.	2016-01-28 18:11:41 +00:00
Erik Johnston	40431251cb	Correctly update _entity_to_key	2016-01-28 18:05:43 +00:00
Erik Johnston	82cf3a8043	Fix inequalities	2016-01-28 17:44:04 +00:00
Erik Johnston	03b2c2577c	Don't use defer.returnValue	2016-01-28 17:29:24 +00:00
Erik Johnston	0663c5bd52	Include cache hits with has_entity_changed	2016-01-28 17:27:28 +00:00
Erik Johnston	35981c8b71	Fix test	2016-01-28 17:20:05 +00:00
Erik Johnston	8fe8951a8d	Cache filters	2016-01-28 17:09:09 +00:00
Erik Johnston	fdca8ec418	Add events index	2016-01-28 16:41:59 +00:00
Erik Johnston	45cf827c8f	Change name and doc has_entity_changed	2016-01-28 16:39:18 +00:00
Erik Johnston	00cb3eb24b	Cache tags and account data	2016-01-28 16:37:41 +00:00
Erik Johnston	c23a8c7833	Ensure keys to RoomStreamChangeCache are ints	2016-01-28 15:55:26 +00:00
Erik Johnston	e1941442d4	Invalidate caches properly. Remove unused arg	2016-01-28 15:02:41 +00:00
Daniel Wagner-Hall	49c328a892	Prune on fetching ... So we don't try to checkout a stale ref	2016-01-28 14:57:40 +00:00