summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #4482 from matrix-org/erikj/event_auth_room_versionErik Johnston2019-01-288-25/+56
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Correctly use default room version if none is setErik Johnston2019-01-281-2/+2
| * | | | | | | | Pass through room version to event authErik Johnston2019-01-258-24/+55
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Fix worker TLS (#4492)Amber Brown2019-01-287-48/+48
| |/ / / / / / |/| | | | | |
* | | | | | | Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-283-12/+20
* | | | | | | Change return syntax in doc stringAndrew Morgan2019-01-281-1/+1
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2815-107/+342
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | docstrings for _RoutingResultRichard van der Hoff2019-01-281-0/+36
| * | | | | | Handle IP literals explicitlyRichard van der Hoff2019-01-281-0/+19
| * | | | | | MatrixFederationAgent: factor out routing logicRichard van der Hoff2019-01-281-18/+62
| * | | | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)Richard van der Hoff2019-01-281-11/+12
| |/ / / / /
| * | | | | Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-2511-82/+205
| |\ \ \ \ \
| | * | | | | Replace missed usages of FrozenEventErik Johnston2019-01-253-10/+14
| | * | | | | Require event format version to parse or create eventsErik Johnston2019-01-258-72/+191
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat...Erik Johnston2019-01-257-6/+99
| |\ \ \ \ \ \
| | * | | | | | Fix quoting for allowed_local_3pids example config (#4476)Richard van der Hoff2019-01-251-3/+3
| | * | | | | | Fix Host header sent by MatrixFederationAgent (#4468)Richard van der Hoff2019-01-252-1/+10
| | * | | | | | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-251-2/+1
| * | | | | | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Reuse predecessor methodAndrew Morgan2019-01-281-12/+8
* | | | | | | FixesAndrew Morgan2019-01-251-39/+39
* | | | | | | Clean up direct_rooms accessAndrew Morgan2019-01-251-3/+3
* | | | | | | Use python magicAndrew Morgan2019-01-251-2/+1
* | | | | | | Destructure account data tuple before useAndrew Morgan2019-01-251-3/+3
* | | | | | | Remove unnecessary null checkAndrew Morgan2019-01-251-7/+6
* | | | | | | Move room_tag declaration to be closer to its useAndrew Morgan2019-01-251-4/+5
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2538-409/+1140
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-253-0/+85
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap...Andrew Morgan2019-01-243-3/+3
| | |\ \ \ \ \
| | | * | | | | Apply suggestions from code reviewRichard van der Hoff2019-01-242-2/+2
| | | * | | | | Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| | * | | | | | Remove redundant create event None checkAndrew Morgan2019-01-241-3/+0
| | |/ / / / /
| | * | | | | Do not return in a deferred functionAndrew Morgan2019-01-221-3/+3
| | * | | | | Ensure new filter is actually createdAndrew Morgan2019-01-222-2/+1
| | * | | | | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-223-35/+51
| | * | | | | Search for messages across predecessor roomsAndrew Morgan2019-01-183-0/+73
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813Erik Johnston2019-01-2530-364/+920
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #4448 from matrix-org/erikj/get_pdu_versionsErik Johnston2019-01-244-13/+66
| | |\ \ \ \ \ \
| | | * | | | | | Review commentsErik Johnston2019-01-242-1/+7
| | | * | | | | | Add room_version param to get_pduErik Johnston2019-01-234-13/+60
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-244-39/+34
| | |\ \ \ \ \ \
| | | * | | | | | Update make_membership_event docsErik Johnston2019-01-241-2/+5
| | | * | | | | | Remove unecessary setting of outlier bitErik Johnston2019-01-241-2/+0
| | | * | | | | | Use term 'out of band membership' insteadErik Johnston2019-01-243-9/+10
| | | * | | | | | Clarify the invite flowsErik Johnston2019-01-233-7/+24
| | | * | | | | | Remove unnecessary '_sign_event'Erik Johnston2019-01-232-15/+8
| | | * | | | | | Store rejected remote invite events as outliersErik Johnston2019-01-233-38/+21
| | | |/ / / / /
| | * | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-245-4/+48
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fixAndrew Morgan2019-01-241-2/+12
| | |\ \ \ \ \ \
| | | * | | | | | Change default timeout value from 0 to NoneAndrew Morgan2019-01-241-1/+1
| | | * | | | | | Use self.clock instead of datetimeAndrew Morgan2019-01-241-4/+3
| | | * | | | | | isortAndrew Morgan2019-01-241-1/+1
| | | * | | | | | lintAndrew Morgan2019-01-241-1/+2
| | | * | | | | | Time out filtered room dir queries after 60sAndrew Morgan2019-01-241-2/+12
| | * | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookupRichard van der Hoff2019-01-241-1/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Look up the right SRV recordRichard van der Hoff2019-01-241-1/+2
| | * | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460)Richard van der Hoff2019-01-241-2/+3
| | |/ / / / / / /
| | * | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_checkNeil Johnson2019-01-243-8/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-222-6/+5
| | | * | | | | | | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-223-7/+12
| | * | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_docNeil Johnson2019-01-241-1/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Clarify docs for public_baseurlDavid Baker2019-01-241-1/+5
| | | | |/ / / / / / | | | |/| | | | | |
| | * / | | | | | | Fix UPSERT check (#4459)Amber Brown2019-01-241-5/+28
| | |/ / / / / / /
| | * | | | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-247-30/+212
| | * | | | | | | Don't send IP addresses as SNI (#4452)Richard van der Hoff2019-01-241-3/+12
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backportAndrew Morgan2019-01-231-0/+6
| | |\ \ \ \ \ \
| | | * | | | | | Add metric for user dir current event stream positionAndrew Morgan2019-01-231-0/+6
| | * | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agentRichard van der Hoff2019-01-234-232/+240
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | put resolve_service in an objectRichard van der Hoff2019-01-222-63/+86
| | | * | | | | | Require that service_name be a byte stringRichard van der Hoff2019-01-221-4/+4
| | | * | | | | | Kill off matrix_federation_endpointRichard van der Hoff2019-01-222-145/+0
| | | * | | | | | Make MatrixFederationClient use MatrixFederationAgentRichard van der Hoff2019-01-221-27/+10
| | | * | | | | | MatrixFederationAgentRichard van der Hoff2019-01-222-0/+147
| | * | | | | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-231-1/+5
| | * | | | | | | Support ACME for certificate provisioning (#4384)Amber Brown2019-01-236-35/+296
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Review commentsErik Johnston2019-01-242-2/+4
| * | | | | | | Implement MSC 1813 - Add room version to make APIsErik Johnston2019-01-234-8/+40
| | |_|_|/ / / | |/| | | | |
| * | | | | | isortErik Johnston2019-01-232-4/+2
| * | | | | | Add support for persisting event format versionsErik Johnston2019-01-235-4/+50
| |/ / / / /
| * | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedupErik Johnston2019-01-221-26/+35
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Refactor to rewrite the SQL insteadErik Johnston2019-01-221-13/+16
| | * | | | Don't shadow paramsErik Johnston2019-01-221-4/+3
| | * | | | Fix bug when removing duplicate rows from user_ipsErik Johnston2019-01-221-13/+20
| * | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registrationNeil Johnson2019-01-222-11/+14
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fix line lengthNeil Johnson2019-01-211-1/+3
| | * | | | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-212-11/+12
* | | | | | Move tag and direct state copying into separate functionAndrew Morgan2019-01-251-43/+63
* | | | | | lintAndrew Morgan2019-01-221-1/+3
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-222-172/+7
|\| | | | |
| * | | | | Make key fetches use regular federation client (#4426)Richard van der Hoff2019-01-222-172/+7
* | | | | | Prevent duplicate room IDs in m.directAndrew Morgan2019-01-221-10/+9
* | | | | | Fix commentsAndrew Morgan2019-01-221-2/+2
* | | | | | Join logic covers both room creator and arbitrary usersAndrew Morgan2019-01-221-33/+0
* | | | | | tags, m.direct copying over correctlyAndrew Morgan2019-01-222-11/+62
* | | | | | Fix typosAndrew Morgan2019-01-223-13/+13
* | | | | | Migrating dm and room tags work for migratorAndrew Morgan2019-01-221-2/+13
* | | | | | Prevent crash on user who doesn't have any direct roomsAndrew Morgan2019-01-221-1/+1
* | | | | | Preserve DM status of a room on upgradeAndrew Morgan2019-01-221-0/+19
* | | | | | Fix typoAndrew Morgan2019-01-221-2/+2
|/ / / / /
* | | | | Refactor and bugfix for resove_service (#4427)Richard van der Hoff2019-01-223-72/+141
* | | | | Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-222-42/+4
| |/ / / |/| | |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv...Erik Johnston2019-01-2110-111/+84
|\| | |
| * | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-213-68/+73
| |\ \ \
| * | | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-212-0/+2
| * | | | Fix race when persisting create event (#4404)Erik Johnston2019-01-181-1/+12
| * | | | Remove redundant WrappedConnection (#4409)Richard van der Hoff2019-01-182-86/+19
| * | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407)Richard van der Hoff2019-01-172-3/+12
| | |/ / | |/| |
| * | | sign_request -> build_auth_headers (#4408)Richard van der Hoff2019-01-172-15/+17
| * | | Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-161-3/+0
| * | | don't store more remote device lists if they have more than 1K devices (#4397)Richard van der Hoff2019-01-161-0/+19
| * | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynaclAndrej Shadura2019-01-161-1/+1
| * | | Use msgpack instead of msgpack-pythonAndrej Shadura2019-01-161-1/+1
| * | | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-151-1/+1
* | | | Add /v2/invite federation APIErik Johnston2019-01-153-6/+41
| |/ / |/| |
* | | Add groundwork for new versions of federation APIsErik Johnston2019-01-153-68/+73
|/ /
* | Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-122-4/+160
* | Merge remote-tracking branch 'origin/master' into developAmber Brown2019-01-113-41/+30
|\ \
| * | versionAmber Brown2019-01-111-1/+1
| * | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-102-40/+29
| |\ \
| | * | Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| | * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-102-43/+32
| | |\ \
| | | * | Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | | * | Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-101-38/+27
| | | * | Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
* | | | | Merge branch 'master' into developRichard van der Hoff2019-01-091-1/+1
|\| | | |
| * | | | 0.34.1 v0.34.1Richard van der Hoff2019-01-091-1/+1
| * | | | Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-092-6/+11
| |\ \ \ \
| * | | | | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
* | | | | | Merge pull request #4368 from matrix-org/erikj/better_errorsErik Johnston2019-01-091-68/+73
|\ \ \ \ \ \
| * | | | | | Fixup docstrings for matrixfederationclientErik Johnston2019-01-091-68/+73
| | |/ / / / | |/| | | |
* / | | | | Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-1/+9
|/ / / / /
* | | | | Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
* | | | | Don't log stack traces for HTTP error responsesErik Johnston2019-01-081-1/+6
|/ / / /
* | | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-084-41/+108
* | | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-081-1/+1
* | | | Add GET account data routes (#4303)Travis Ralston2019-01-071-1/+33
* | | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-073-28/+74
* | | | fix the check for whether `is_url` to match all the other ones in codebase (#...Michael Telatynski2019-01-061-3/+8
* | | | fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-021-10/+11
* | | | Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-021-25/+25
* | | | Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-294-445/+0
* | | | Log roomid along with Unknown room (#4297)Will Hunt2018-12-241-1/+1
* | | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-242-1/+5
|\ \ \ \
| * | | | Add v2 room versionErik Johnston2018-12-182-1/+5
* | | | | Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-7/+11
* | | | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-229-46/+89
* | | | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-221-35/+35
* | | | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-223-171/+255
* | | | | Make the dependencies more like a standard Python project and hook up the opt...Amber Brown2018-12-223-147/+90
* | | | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Prepare 0.34 releaseRichard van der Hoff2018-12-201-1/+1
| * | | | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-201-1/+1
| |\ \ \ \
| | * | | | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-202-2/+2
| * | | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-201-1/+2
| * | | | | Improved welcome page (#4294)Nad Chishtie2018-12-141-25/+62
| * | | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| |/ / / /
* | | | | Fixed line lengthNathan Pennie2018-12-191-1/+5
* | | | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
* | | | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-181-1/+1
* | | | | create support user (#4141)Neil Johnson2018-12-1410-33/+159
* | | | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
* | | | | Improved welcome page (#4294)Nad Chishtie2018-12-141-25/+62
* | | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-115-51/+68
|\| | | |
| * | | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-111-1/+1
| * | | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-113-50/+38
| |\ \ \ \
| | * | | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-113-50/+38
| * | | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-112-0/+29
| |\ \ \ \ \
| | * | | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-112-0/+29
| | |/ / / /
| * / / / / Prepare 0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| |/ / / /
* | | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-111-1/+2
* | | | | Move imports to one lineWill Hunt2018-12-101-4/+1
* | | | | Use `send_cors`Will Hunt2018-12-101-4/+1
* | | | | changelog & isortWill Hunt2018-12-091-1/+5
* | | | | Make /config more CORS-yWill Hunt2018-12-091-1/+3
* | | | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-074-14/+37
* | | | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-077-2/+256
* | | | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-073-31/+153
* | | | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-065-154/+3
| |_|_|/ |/| | |
* | | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-061-7/+6
* | | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-053-0/+81
|/ / /
* | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-042-9/+25
* | | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-041-12/+23
* | | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-043-1/+20
* | | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-041-6/+6
* | | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-042-8/+46
* | | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-046-74/+3
|\ \ \
| * | | Drop sent_transactionsAaron Raimist2018-12-016-74/+3
* | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-041-1/+1
|\ \ \ \
| * | | | fix type errorAmber Brown2018-12-031-1/+1
* | | | | Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-041-12/+24
|/ / / /
* / / / Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-031-1/+3
|/ / /
* | | Neilj/fix autojoin (#4223)Neil Johnson2018-11-283-2/+24
* | | Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-2/+3
* | | Support m.login.sso (#4220)Richard van der Hoff2018-11-274-52/+49
* | | Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-201-1/+1
* | | Remove riot.im from the list of trusted Identity Servers in the default confi...Neil Johnson2018-11-201-1/+3
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-201-2/+3
|\ \ \
| * | | Fix logcontext leak in EmailPusherRichard van der Hoff2018-11-191-2/+3
* | | | Merge remote-tracking branch 'origin/master' into developAmber Brown2018-11-191-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | versionAmber Brown2018-11-191-1/+1
| * | | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9Neil Johnson2018-11-141-1/+1
* | | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-22/+16
| |/ / |/| |
* | | Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-152-3/+3
* | | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-153-90/+110
* | | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-153-35/+47
* | | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-151-9/+22
|/ /
* | Add a test for the public T&Cs formRichard van der Hoff2018-11-141-1/+1
* | Fix an internal server error when viewing the public privacy policyRichard van der Hoff2018-11-141-4/+7
* | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbersDavid Baker2018-11-142-2/+70
|\ \
| * \ Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a...David Baker2018-11-0947-416/+763
| |\ \
| * | | pep8David Baker2018-11-091-1/+2
| * | | add docsDavid Baker2018-11-091-1/+4
| * | | Remove unnecessary str()David Baker2018-11-091-1/+1
| * | | Cast to int here tooDavid Baker2018-10-301-0/+5
| * | | Cast bacjup version to int when queryingDavid Baker2018-10-301-1/+6
| * | | Convert version back to a stringDavid Baker2018-10-301-0/+1
| * | | Try & make it work on postgresDavid Baker2018-10-301-2/+2
| * | | Make e2e backup versions numeric in the DBDavid Baker2018-10-293-2/+55
* | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-092-89/+74
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
| * | | Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
| * | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| * | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| * | | Drop PDUs of unknown roomsErik Johnston2018-11-081-1/+23
* | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparisonErik Johnston2018-11-081-1/+4
|\ \ \ \
| * | | | Lets convert bytes to unicode insteadErik Johnston2018-11-081-5/+3
| * | | | Fix noop checks when updating device keysErik Johnston2018-11-081-0/+5
| |/ / /
* | | | fix parse_string docstringRichard van der Hoff2018-11-081-5/+4
* | | | Fix encoding error for consent form on python3hera2018-11-081-1/+3
|/ / /
* | | Fix URL preview bugs (type error when loading cache from db, content-type inc...Amber Brown2018-11-082-10/+20
* | | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-064-3/+21
* | | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-052-10/+33
* | | Tests for user consent resource (#4140)Amber Brown2018-11-061-1/+1
* | | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-068-44/+60
* | | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-031-0/+1
* | | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-023-7/+4
|\ \ \
| * | | Clean up event accesses and testsErik Johnston2018-11-023-7/+4
* | | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-032-4/+24
* | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_lockingRichard van der Hoff2018-11-023-11/+128
|\ \ \ \
| * | | | Add unique indexes to a couple of tablesRichard van der Hoff2018-11-023-6/+88
| * | | | Remove redundant database locks for device list updatesRichard van der Hoff2018-11-021-5/+40
* | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-authRichard van der Hoff2018-11-021-1/+1
|\ \ \ \ \
| * | | | | Fix logic error that prevented guests from seeing the privacy policyTravis Ralston2018-11-011-1/+1
| |/ / / /
* | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-021-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix None exception in state res v2Erik Johnston2018-11-021-0/+4
| |/ / /
* | | | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-015-17/+135
|\ \ \ \ | |/ / / |/| | |
| * | | Include a version query string arg for the consent routeTravis Ralston2018-10-312-3/+8
| * | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3145-879/+1761
| |\ \ \
| * \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2446-503/+1136
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1821-106/+472
| |\ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-26 11:03:32 +0000