5838 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	d5fda6e3b0	Merge pull request #640 from matrix-org/erikj/keyclient_host ... Make key client send a Host header	2016-03-11 13:32:59 +00:00
Erik Johnston	58443a022d	Merge pull request #635 from matrix-org/erikj/sync_order ... Use topological orders for initial sync timeline	2016-03-11 13:17:49 +00:00
Erik Johnston	2e2be463f8	Make key client send a Host header	2016-03-11 10:29:05 +00:00
Daniel Wagner-Hall	379c60b08d	Merge pull request #638 from matrix-org/daniel/appserviceid ... Store appservice ID on register	2016-03-10 15:58:27 +00:00
Daniel Wagner-Hall	465605d616	Store appservice ID on register	2016-03-10 15:58:22 +00:00
Erik Johnston	703826886c	Merge pull request #639 from matrix-org/erikj/as_user_update_batch ... Update users table in a batched manner	2016-03-10 15:38:00 +00:00
Erik Johnston	9669a99d1a	Update users table in a batched manner	2016-03-10 15:12:19 +00:00
Erik Johnston	c22a3f37a9	Merge pull request #637 from blide/develop ... SYN-646 - Register endpoint returns refresh_token	2016-03-10 14:03:48 +00:00
blide	1be438f2a6	Flake8 fix	2016-03-10 12:13:35 +03:00
blide	40160e24ab	Register endpoint returns refresh_token ... Guest registration still doesn't return refresh_token	2016-03-10 10:29:19 +03:00
Erik Johnston	8a88684736	Add comment	2016-03-09 16:51:22 +00:00
Erik Johnston	af2fe6110c	Return the correct token form	2016-03-09 16:11:53 +00:00
Erik Johnston	3ecaabc7fd	Use topological orders for initial sync timeline	2016-03-09 15:45:34 +00:00
Erik Johnston	1309b8ca97	Merge pull request #634 from matrix-org/erikj/pin_saml2_version ... Pin pysaml2 version to 3.x	2016-03-09 11:57:33 +00:00
Erik Johnston	07cf96ebf7	Pin pysaml2 version to 3.x ... This is due to the fact that `from saml2 import config` fails in version 4.x	2016-03-09 11:54:56 +00:00
Mark Haines	b7b899cae6	Merge pull request #628 from matrix-org/markjh/parse_json ... Add a parse_json_object function to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.	2016-03-09 11:26:30 +00:00
Mark Haines	b7dbe5147a	Add a parse_json_object function ... to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.	2016-03-09 11:26:26 +00:00
Erik Johnston	158a322e82	Ensure integer is an integer	2016-03-09 10:20:48 +00:00
Richard van der Hoff	ce829c2aef	Reinstate coverage checks for integ tests	2016-03-09 00:14:19 +00:00
Richard van der Hoff	4814e7c9b2	Specify synapse-directory for integ tests	2016-03-09 00:06:57 +00:00
Richard van der Hoff	866d0e7cb8	Only build py27 tox env for integ tests	2016-03-08 23:47:50 +00:00
Richard van der Hoff	1748d4b739	Use sytest build scripts, rather than reinventing the wheel	2016-03-08 23:37:39 +00:00
Mark Haines	5f5817ab05	Merge pull request #632 from matrix-org/markjh/py3v2 ... Fix relative imports so they work in both py3 and py27	2016-03-08 18:11:10 +00:00
Daniel Wagner-Hall	b117f67227	Merge pull request #633 from matrix-org/daniel/ick ... Idempotent-ise schema update script	2016-03-08 17:45:46 +00:00
Daniel Wagner-Hall	3b97797c8d	Merge branch 'develop' into daniel/ick	2016-03-08 17:35:09 +00:00
Daniel Wagner-Hall	edca2d9891	Idempotent-ise schema update script ... If any ASes don't have an ID, the schema will fail, and then it will error when trying to add the column again.	2016-03-08 17:32:29 +00:00
David Baker	c00f4e48ba	Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params ... Encode unicode objects given to post_urlencode*	2016-03-08 13:51:49 +00:00
Mark Haines	7076082ae6	Fix relative imports so they work in both py3 and py27	2016-03-08 11:45:50 +00:00
Mark Haines	ea72bd9600	Merge pull request #631 from matrix-org/markjh/py3v1 ... Use syntax that's valid on both py2.7 and py3	2016-03-08 11:08:20 +00:00
David Baker	f40131b4d9	Merge pull request #627 from matrix-org/dbkr/guest_reuse_send_user_id ... Send the user ID matching the guest access token	2016-03-08 10:20:41 +00:00
David Baker	9a3c80a348	pep8	2016-03-08 10:09:07 +00:00
David Baker	7bcee4733a	Encode unicode objects given to post_urlencode* otherwise urllib.urlencode chokes.	2016-03-08 10:04:38 +00:00
Mark Haines	239badea9b	Use syntax that works on both py2.7 and py3	2016-03-07 20:13:10 +00:00
David Baker	316c00936f	Fix tests	2016-03-07 17:32:36 +00:00
David Baker	874fd43257	Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.	2016-03-07 17:13:56 +00:00
Erik Johnston	80916e6884	Merge pull request #626 from matrix-org/erikj/visibility ... Send history visibility on boundary changes	2016-03-07 11:56:07 +00:00
Erik Johnston	2ab0bf4b97	Send history visibility on boundary changes	2016-03-04 16:54:32 +00:00
Mark Haines	b7a3be693b	Merge pull request #618 from matrix-org/markjh/pushrule_stream ... Add a stream for push rule updates	2016-03-04 16:35:08 +00:00
Erik Johnston	beebc0a40f	Merge pull request #625 from matrix-org/erikj/kick_ban_sync ... Always include kicks and bans in full /sync	2016-03-04 16:33:52 +00:00
Mark Haines	9848b54cac	Prefill from the correct stream	2016-03-04 16:20:22 +00:00
Mark Haines	deda48068c	prefill the push rules stream change cache	2016-03-04 16:19:42 +00:00
Mark Haines	ebcbb23226	s/stream_ordering/event_stream_ordering/ in push	2016-03-04 16:15:23 +00:00
Mark Haines	7e9fc9b6af	/FNARG/d	2016-03-04 15:54:09 +00:00
Erik Johnston	1a1abd8d05	Merge pull request #624 from matrix-org/erikj/invite_profile ... Add profile information to invites	2016-03-04 15:29:45 +00:00
Erik Johnston	125f674eae	Always include kicks and bans in full /sync	2016-03-04 15:27:55 +00:00
Erik Johnston	13cbd31040	Spelling	2016-03-04 15:22:39 +00:00
Mark Haines	0ff9aaf6c1	poke jenkins	2016-03-04 15:15:06 +00:00
Mark Haines	3110c37d02	Fix unit tests	2016-03-04 14:48:17 +00:00
Mark Haines	ec7460b4f2	Merge branch 'develop' into markjh/pushrule_stream	2016-03-04 14:44:34 +00:00
Mark Haines	1b4f4a936f	Hook up the push rules stream to account_data in /sync	2016-03-04 14:44:01 +00:00