5826 Commits (3ecaabc7fd8a1a461c319248a94617cf24dd4070)

 

All Branches   

Search

Author	SHA1	Message	Date
Erik Johnston	3ecaabc7fd	Use topological orders for initial sync timeline	9 years ago
Erik Johnston	1309b8ca97	Merge pull request #634 from matrix-org/erikj/pin_saml2_version ... Pin pysaml2 version to 3.x	9 years ago
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	9 years ago
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.	9 years ago
Mark Haines	b7dbe5147a	Add a parse_json_object function ... to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions.	9 years ago
Erik Johnston	158a322e82	Ensure integer is an integer	9 years ago
Richard van der Hoff	ce829c2aef	Reinstate coverage checks for integ tests	9 years ago
Richard van der Hoff	4814e7c9b2	Specify synapse-directory for integ tests	9 years ago
Richard van der Hoff	866d0e7cb8	Only build py27 tox env for integ tests	9 years ago
Richard van der Hoff	1748d4b739	Use sytest build scripts, rather than reinventing the wheel	9 years ago
Mark Haines	5f5817ab05	Merge pull request #632 from matrix-org/markjh/py3v2 ... Fix relative imports so they work in both py3 and py27	9 years ago
Daniel Wagner-Hall	b117f67227	Merge pull request #633 from matrix-org/daniel/ick ... Idempotent-ise schema update script	9 years ago
Daniel Wagner-Hall	3b97797c8d	Merge branch 'develop' into daniel/ick	9 years ago
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.	9 years ago
David Baker	c00f4e48ba	Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params ... Encode unicode objects given to post_urlencode*	9 years ago
Mark Haines	7076082ae6	Fix relative imports so they work in both py3 and py27	9 years ago
Mark Haines	ea72bd9600	Merge pull request #631 from matrix-org/markjh/py3v1 ... Use syntax that's valid on both py2.7 and py3	9 years ago
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	9 years ago
David Baker	9a3c80a348	pep8	9 years ago
David Baker	7bcee4733a	Encode unicode objects given to post_urlencode* otherwise urllib.urlencode chokes.	9 years ago
Mark Haines	239badea9b	Use syntax that works on both py2.7 and py3	9 years ago
David Baker	316c00936f	Fix tests	9 years ago
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.	9 years ago
Erik Johnston	80916e6884	Merge pull request #626 from matrix-org/erikj/visibility ... Send history visibility on boundary changes	9 years ago
Erik Johnston	2ab0bf4b97	Send history visibility on boundary changes	9 years ago
Mark Haines	b7a3be693b	Merge pull request #618 from matrix-org/markjh/pushrule_stream ... Add a stream for push rule updates	9 years ago
Erik Johnston	beebc0a40f	Merge pull request #625 from matrix-org/erikj/kick_ban_sync ... Always include kicks and bans in full /sync	9 years ago
Mark Haines	9848b54cac	Prefill from the correct stream	9 years ago
Mark Haines	deda48068c	prefill the push rules stream change cache	9 years ago
Mark Haines	ebcbb23226	s/stream_ordering/event_stream_ordering/ in push	9 years ago
Mark Haines	7e9fc9b6af	/FNARG/d	9 years ago
Erik Johnston	1a1abd8d05	Merge pull request #624 from matrix-org/erikj/invite_profile ... Add profile information to invites	9 years ago
Erik Johnston	125f674eae	Always include kicks and bans in full /sync	9 years ago
Erik Johnston	13cbd31040	Spelling	9 years ago
Mark Haines	0ff9aaf6c1	poke jenkins	9 years ago
Mark Haines	3110c37d02	Fix unit tests	9 years ago
Mark Haines	ec7460b4f2	Merge branch 'develop' into markjh/pushrule_stream	9 years ago
Mark Haines	1b4f4a936f	Hook up the push rules stream to account_data in /sync	9 years ago
Erik Johnston	ed61a49169	Add profile information to invites	9 years ago
Erik Johnston	389d558a3b	Merge pull request #598 from Rugvip/invite-state ... config,handlers/_base: added homeserver config for what state is included in a room invite	9 years ago
Erik Johnston	44b084a75e	Merge pull request #596 from Rugvip/create ... handlers/_base: don't allow room create event to be changed	9 years ago
Patrik Oldsberg	bb0e82fff1	tests/utils: added room_invite_state_types to test config ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	9 years ago
Patrik Oldsberg	5fc59f009c	config,handlers/_base: added homeserver config for what state is included in a room invite ... Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>	9 years ago
Erik Johnston	ce82b9e48f	Merge pull request #610 from Rugvip/unique-user ... handlers/register: make sure another user id is generated when a collision occurs	9 years ago
Richard van der Hoff	09b1d98070	Merge pull request #623 from matrix-org/rav/fix_createroom_race ... Make sure we add all invited members before returning from createRoom	9 years ago
Erik Johnston	dd463e246d	Merge pull request #614 from matrix-org/erikj/alias_delete ... Allow alias creators to delete aliases	9 years ago
Richard van der Hoff	fa6d6bbceb	Merge pull request #615 from matrix-org/rav/SYN-642 ... Handle rejections of invites from local users locally	9 years ago
Richard van der Hoff	a92b4ea76f	Make sure we add all invited members before returning from createRoom ... add a missing yield.	9 years ago
Richard van der Hoff	361fc53917	Merge branch 'develop' into rav/SYN-642	9 years ago
Richard van der Hoff	62d808becc	jenkins-*.sh: set -x ... Also move the options from the shebang line to the body of the script, so that they take effect even if somebody explicitly runs "bash jenkins.sh"	9 years ago