5211 Commits (eb036256267dc76f13a8a25ab952356e1b1e9c00)

 

All Branches   

Search

Author	SHA1	Message	Date
Mark Haines	c058625959	Merge remote-tracking branch 'origin/develop' into markjh/guest_access ... Conflicts: synapse/api/filtering.py	9 years ago
Mark Haines	cdd04f7055	Hook up read receipts and typing notifications for guest access	9 years ago
Mark Haines	542ab0f886	Merge branch 'develop' into markjh/guest_access	9 years ago
Mark Haines	e525b46f12	Merge pull request #454 from matrix-org/markjh/room_filtering ... Add top level filters for filtering by room id Documented by matrix-org/matrix-doc#246	9 years ago
Mark Haines	b9b4466d0d	Add top level filters for filtering by room id ... Documented by matrix-org/matrix-doc#246	9 years ago
Mark Haines	c3fff251a9	Allow guest access to /sync	9 years ago
Mark Haines	45a9e0ae0c	Allow guest access if the user provides a list of rooms in the filter	9 years ago
Mark Haines	489a4cd1cf	Add top level filtering by room id	9 years ago
Mark Haines	2a2b2ef834	Remove bogus comment about branch coverage	9 years ago
Daniel Wagner-Hall	2e2eeb43a6	Merge pull request #453 from matrix-org/daniel/avatarurls ... Return room avatar URLs in /publicRooms Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121	9 years ago
Daniel Wagner-Hall	7f3148865c	Return room avatar URLs in /publicRooms ... Spec: https://github.com/matrix-org/matrix-doc/pull/244 Tests: https://github.com/matrix-org/sytest/pull/121	9 years ago
Mark Haines	bb9c7f2dd9	Delete all the .coverage files, including the combined .coverage	9 years ago
Mark Haines	9036d2d6a8	Use an absolute path when specifying the directory for synapse in jenkins.sh	9 years ago
David Baker	c061b47c57	Merge remote-tracking branch 'origin/develop' into store_event_actions	9 years ago
David Baker	f73f154ec2	Only run pushers for users on this hs!	9 years ago
Mark Haines	64b6606824	Remove accidentally committed debug logging	9 years ago
Mark Haines	42a7a09eea	Merge pull request #452 from matrix-org/paul/SYN-558 ... Actually look up required remote server key IDs	9 years ago
David Baker	091c545c4f	pep8	9 years ago
Paul "LeoNerd" Evans	a6ba41e078	Actually look up required remote server key IDs ... set.union() is a side-effect-free function that returns the union of two sets. This clearly wanted .update(), which is the side-effecting mutator version.	9 years ago
Mark Haines	f85949bde0	Merge pull request #451 from matrix-org/markjh/branch_coverage ... Generate code coverage report when running jenkins.sh	9 years ago
Mark Haines	2f871ad143	Generate code coverage report when running jenkins.sh	9 years ago
Matthew Hodgson	c8ea2d5b1f	Merge pull request #450 from matrix-org/matthew/no-identicons ... Matthew/no identicons	9 years ago
David Baker	b131fb1fe2	add list of things I want to fix with this branch	9 years ago
David Baker	413d0d6a24	Make unread notification count sending work: put the correct count in incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user...	9 years ago
David Baker	0a2d73fd60	Merge branch 'release-v0.12.0' into develop	9 years ago
David Baker	ce4999268a	Fix typo that broke registration on the mobile clients	9 years ago
Daniel Wagner-Hall	633ceb9bb1	Merge pull request #449 from matrix-org/daniel/3pid ... Add display_name to 3pid invite in m.room.member invites	9 years ago
Matthew Hodgson	64374bda5b	fix indentation level	9 years ago
Matthew Hodgson	772ad4f715	stop generating default identicons. reverts most of 582019f870 and solves vector-web/vector-im#346	9 years ago
Daniel Wagner-Hall	bdacee476d	Add display_name to 3pid invite in m.room.member invites	9 years ago
Daniel Wagner-Hall	10f82b4bea	Merge pull request #448 from matrix-org/daniel/3pid ... Strip address and such out of 3pid invites	9 years ago
Daniel Wagner-Hall	8c5f252edb	Strip address and such out of 3pid invites ... We're not meant to leak that into the graph	9 years ago
Mark Haines	8b9f471d27	Merge pull request #447 from matrix-org/rav/fix_search_pagination ... Fix 500 error when back-paginating search results	9 years ago
Richard van der Hoff	a64f9bbfe0	Fix 500 error when back-paginating search results ... We were mistakenly adding pagination clauses to the count query, which then failed because the count query doesn't join to the events table.	9 years ago
David Baker	42ad49f5b7	still very WIP, but now sends unread_notifications_count in the room object on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs).	9 years ago
Daniel Wagner-Hall	2b0f8a9482	Fix typo	9 years ago
Daniel Wagner-Hall	af4422c42a	Merge pull request #446 from matrix-org/daniel/invitemetadata ... Give the IS a bunch more 3pid invite context This allows it to form richer emails	9 years ago
Daniel Wagner-Hall	0311612ce9	Give the IS a bunch more 3pid invite context ... This allows it to form richer emails	9 years ago
Mark Haines	5fc03449c8	Merge pull request #440 from matrix-org/daniel/ise ... Include errcode on Internal Server Error	9 years ago
Mark Haines	4fab578b43	Merge branch 'release-v0.12.0' into develop	9 years ago
Mark Haines	661b76615b	Merge pull request #445 from matrix-org/markjh/rebind_threepid ... Allow users to change which account a 3pid is bound to	9 years ago
Mark Haines	dcfc70e8ed	Allow users to change which account a 3pid is bound to	9 years ago
Mark Haines	63fdd9fe0b	Changelog and version bump for v0.12.0-rc2	9 years ago
Mark Haines	910956b0ec	Merge pull request #443 from matrix-org/markjh/commentary ... Add commentary for fix in PR #442	9 years ago
Oddvar Lovaas	d3ac8fd87d	Added info abou Martin Giess' auto-deployment process with vagrant/ansible	9 years ago
Mark Haines	e98e00558a	Merge pull request #444 from matrix-org/markjh/presence_race ... Fix a race between started/stopped stream	9 years ago
Mark Haines	3ddf0b9722	Fix spacing	9 years ago
Mark Haines	2acae8300f	Fix logging to lie less	9 years ago
Mark Haines	dbe7892e03	Fix a race between started/stopped stream	9 years ago
Mark Haines	28c5181dfe	Add commentary for fix in PR#442	9 years ago