summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2019-05-0229-835/+309
|\
| * Fix infinite loop in presence handlerRichard van der Hoff2019-04-261-0/+18
| * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-1769-3786/+2805
| |\
| | * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-172-18/+159
| | |\
| | * \ Merge pull request #5033 from matrix-org/erikj/fix_schema_deltaErik Johnston2019-04-101-1/+3
| | |\ \
| | | * | Fix schema upgrade when dropping tablesErik Johnston2019-04-091-1/+3
| | * | | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-092-0/+54
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-091-28/+46
| | * | | Remove unused server_tls_certificates functions (#5028)Richard van der Hoff2019-04-083-59/+5
| | * | | drop tables listed in #1830 (#4992)Neil Johnson2019-04-0824-752/+42
| | * | | Merge pull request #5001 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2019-04-081-2/+2
| | |\ \ \
| | | * | | Fix docstring on get_server_keys_jsonRichard van der Hoff2019-04-041-2/+2
| * | | | | Add management endpoints for account validityBrendan Abolivier2019-04-171-12/+17
| | |_|_|/ | |/| | |
| * | | | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-172-18/+159
| | |_|/ | |/| |
| * | | Add account expiration featureBrendan Abolivier2019-04-093-1/+55
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-04-0445-2587/+2360
|\ \ \ \ | | |/ / | |/| |
| * | | Clean up the database pagination code (#5007)Amber Brown2019-04-052-67/+63
| * | | Add functions to delete a groupErik Johnston2019-04-031-0/+37
| * | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-1/+1
| | |/ | |/|
| * | Remove presence lists (#4989)Neil Johnson2019-04-034-96/+20
| * | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-032-0/+141
| |\ \
| | * | Fixup docstringsErik Johnston2019-04-022-5/+5
| | * | Grandfather in existing user threepidsErik Johnston2019-04-012-0/+37
| | * | Track IS used to bind 3PIDsErik Johnston2019-04-012-0/+104
| * | | Run black on the rest of the storage module (#4996)Amber Brown2019-04-0341-2455/+2130
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-04-021-0/+30
|\| | |
| * | | Make starting pushers faster during start upErik Johnston2019-04-021-0/+30
* | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-04-024-401/+354
|\| | |
| * | | Fix sync bug when accepting invites (#4956)Richard van der Hoff2019-04-022-11/+18
| * | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-011-1/+2
| |/ /
| * | Merge pull request #4955 from matrix-org/rav/merge_state_into_eventsRichard van der Hoff2019-03-281-3/+0
| |\ \
| | * | Combine the CurrentStateDeltaStream into the EventStreamRichard van der Hoff2019-03-271-3/+0
| | |/
| * / Run `black` on some storage modules that the stats branch touches (#4959)Amber Brown2019-03-292-380/+335
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesNeil Johnson2019-03-271-8/+20
|\|
| * Use the state event amount for userdir import batching, not room count (#4944)Amber Brown2019-03-271-8/+20
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-03-253-65/+79
|\|
| * Fix bug where read-receipts lost their timestamps (#4927)Richard van der Hoff2019-03-251-1/+3
| * Refactor out state delta handling into its own class (#4917)Amber Brown2019-03-252-64/+76
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-212-2/+27
|\|
| * Fix upsertErik Johnston2019-03-211-0/+1
| * comment block_roomErik Johnston2019-03-201-0/+9
| * Allow blocking a room multiple timesErik Johnston2019-03-201-2/+4
| * Batching in the user directory import (#4900)Amber Brown2019-03-211-0/+13
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-03-193-96/+312
|\|
| * Fix user directory background update (#4887)Erik Johnston2019-03-191-1/+1
| * Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-193-96/+312
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-147-90/+152
|\|
| * Merge pull request #4846 from matrix-org/hawkowl/userdir-searchErik Johnston2019-03-144-75/+92
| |\
| | * fixupAmber Brown2019-03-131-1/+1
| | * fixupAmber Brown2019-03-132-55/+11
| | * fixupAmber Brown2019-03-121-1/+1
| | * fixupAmber Brown2019-03-121-1/+2
| | * fixupAmber Brown2019-03-122-113/+69
| | * fixupAmber Brown2019-03-121-1/+1
| | * use the old methodAmber Brown2019-03-121-3/+2
| | * fixAmber Brown2019-03-121-1/+1
| | * pep8Amber Brown2019-03-121-2/+1
| | * fixesAmber Brown2019-03-122-9/+56
| | * Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-searchAmber Brown2019-03-112-15/+2
| | |\
| | * | initialAmber Brown2019-03-113-3/+62
| * | | Transfer local user's push rules on room upgrade (#4838)Andrew Morgan2019-03-121-0/+57
| | |/ | |/|
| * | Add comment to schemaErik Johnston2019-03-081-0/+2
| * | Make `prev_state` field optionalErik Johnston2019-03-081-15/+0
| |/
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_...Erik Johnston2019-03-083-181/+156
| |\
| * | Implement soft failErik Johnston2019-03-061-0/+1
* | | Merge branch 'develop' of ssh://github.com/matrix-org/synapse intoAmber Brown2019-03-072-181/+137
|\ \ \ | | |/ | |/|
| * | Rewrite userdir to be faster (#4537)Amber Brown2019-03-072-181/+137
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-061-6/+10
|\| |
| * | Add docstrings from matrix-org-hotfixesErik Johnston2019-03-061-0/+19
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-03-056-580/+621
|\|
| * Merge pull request #4699 from matrix-org/erikj/stop_fed_not_in_roomErik Johnston2019-03-051-0/+22
| |\
| | * s/get_forward_events/get_successor_events/Erik Johnston2019-03-041-2/+2
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_n...Erik Johnston2019-03-044-43/+120
| | |\
| | * | Stop backpaginating when events not visibleErik Johnston2019-02-201-0/+22
| * | | Merge pull request #4796 from matrix-org/erikj/factor_out_e2e_keysErik Johnston2019-03-053-541/+546
| |\ \ \
| | * | | Fixup slave storesErik Johnston2019-03-043-541/+546
| | | |/ | | |/|
| * / | Add some debug about processing read receipts.Richard van der Hoff2019-03-041-6/+20
| |/ /
| * | Move /account/3pid to client_readerErik Johnston2019-02-271-33/+33
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-02-273-4/+53
|\| |
| * | Limit cache invalidation replication line length (#4748)Erik Johnston2019-02-271-4/+11
| * | Add database version to phonehome stats. (#4753)Richard van der Hoff2019-02-273-0/+42
* | | Add more debug for membership syncing issues (#4719)Richard van der Hoff2019-02-251-0/+15
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-02-221-6/+34
|\| |
| * | Fix state cache invalidation on workersErik Johnston2019-02-221-6/+34
| |/
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-02-201-12/+134
|\|
| * UPSERT many functionality (#4644)Amber Brown2019-02-201-12/+134
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-02-193-181/+214
|\|
| * Merge pull request #4671 from matrix-org/erikj/state_cache_invalidationErik Johnston2019-02-192-25/+58
| |\
| | * DocsErik Johnston2019-02-191-2/+3
| | * Use itertoolsErik Johnston2019-02-191-2/+2
| | * DocumentationErik Johnston2019-02-191-4/+4
| | * Batch cache invalidation over replicationErik Johnston2019-02-182-25/+57
| * | Split /login into client_readerErik Johnston2019-02-181-41/+41
| |/
| * Split out registration to workerErik Johnston2019-02-181-115/+115
* | Revert "Merge pull request #4654 from matrix-org/hawkowl/registration-worker"Erik Johnston2019-02-191-7/+4
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-02-152-87/+91
|\|
| * Add configurable room list publishing rulesErik Johnston2019-02-141-0/+25
| * Run `black` on user directory code (#4635)Amber Brown2019-02-131-87/+66
* | add cache remover endpoint and wire it upAmber Brown2019-02-161-4/+7
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-02-136-27/+172
|\|
| * Merge pull request #4627 from matrix-org/erikj/user_ips_analyzeErik Johnston2019-02-122-3/+31
| |\
| | * Fix pep8Erik Johnston2019-02-121-1/+1
| | * Analyze user_ips before running deduplicationErik Johnston2019-02-122-3/+31
| * | Reduce user_ips bloat during dedupe background updateErik Johnston2019-02-121-3/+60
| |/
| * Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-111-0/+21
| |\
| | * add new endpoint to update backup versionsHubert Chathi2019-02-061-0/+21
| * | Fix 'no unique or exclusion constraint' error (#4591)Richard van der Hoff2019-02-081-6/+21
| * | Filter user directory state query to a subset of state events (#4462)Andrew Morgan2019-02-051-4/+12
| |/
| * Merge pull request #4530 from matrix-org/anoa/room_upgrade_federatableAndrew Morgan2019-01-311-11/+27
| |\
| | * Raise an exception instead of returning NoneAndrew Morgan2019-01-311-2/+9
| | * New function for getting room's create eventAndrew Morgan2019-01-311-11/+20
* | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2019-01-311-5/+32
|\| |
| * | Fix infinite loop when an event is redacted in a v3 room (#4535)Richard van der Hoff2019-01-311-5/+32
| |/
* | Revert "Break infinite loop on redaction in v3 rooms"Richard van der Hoff2019-01-311-1/+1
* | Break infinite loop on redaction in v3 roomsRichard van der Hoff2019-01-311-1/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-01-304-89/+148
|\|
| * Fix flake8 (#4519)Amber Brown2019-01-303-86/+86
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-291-0/+23
| |\
| | * Refactor event building into EventBuilderErik Johnston2019-01-291-0/+23
| * | Update synapse/storage/events_worker.pyErik Johnston2019-01-291-1/+1
| * | Check redaction state when event is pulled out of the databaseErik Johnston2019-01-291-0/+13
| * | Fix typoErik Johnston2019-01-291-1/+1
| * | Remove unused argErik Johnston2019-01-291-2/+1
| * | Update synapse/storage/events_worker.pyRichard van der Hoff2019-01-291-1/+1
| * | Implement rechecking of redactionsErik Johnston2019-01-291-1/+25
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2019-01-295-19/+23
|\|
| * Fix typo in upserts code (#4505)Amber Brown2019-01-291-1/+1
| * Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-283-12/+20
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-282-10/+9
| |\
| | * Merge pull request #4470 from matrix-org/erikj/require_format_versionErik Johnston2019-01-251-6/+2
| | |\
| | | * Replace missed usages of FrozenEventErik Johnston2019-01-251-6/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-2512-64/+334
| |\ \ \
| * | | | Fix typosAndrew Morgan2019-01-221-1/+1
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2019-01-256-12/+67
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat...Erik Johnston2019-01-252-2/+25
| |\ \ \ \
| | * | | | Don't require sqlite3 when using postgres (#4466)Andrew Morgan2019-01-251-2/+1
| | | |/ / | | |/| |
| | * | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+24
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap...Andrew Morgan2019-01-241-1/+1
| | | |\ \
| | | | * | Apply suggestions from code reviewRichard 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-221-1/+0
| | | * | Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-221-1/+28
| | | * | Search for messages across predecessor roomsAndrew Morgan2019-01-181-0/+1
| * | | | Disable native upserts for sqlite, as they don't workErik Johnston2019-01-251-3/+7
| |/ / /
| * | | Revert "Require event format version to parse or create events"Erik Johnston2019-01-251-2/+6
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-248-33/+238
| |\ \ \
| | * \ \ Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invitesErik Johnston2019-01-241-4/+4
| | |\ \ \
| | | * | | Use term 'out of band membership' insteadErik Johnston2019-01-241-3/+3
| | * | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-243-4/+32
| | |\ \ \ \
| * | | | | | Replace missed usages of FrozenEventErik Johnston2019-01-241-6/+2
| * | | | | | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse...Erik Johnston2019-01-231-4/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Clarify the invite flowsErik Johnston2019-01-231-4/+7
| | * | | | | Store rejected remote invite events as outliersErik Johnston2019-01-231-4/+1
| * | | | | | Merge branch 'erikj/get_pdu_versions' into erikj/require_format_versionErik Johnston2019-01-231-1/+5
| |\| | | | | | | |_|/ / / | |/| | | |
| * | | | | isortErik Johnston2019-01-231-1/+1
| * | | | | Add support for persisting event format versionsErik Johnston2019-01-233-4/+32
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2019-01-241-5/+28
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix UPSERT check (#4459)Amber Brown2019-01-241-5/+28
* | | | | | Merge branch 'anoa/room_dir_quick_fix' into matrix-org-hotfixesAndrew Morgan2019-01-249-36/+406
|\| | | | |
| * | | | | Use native UPSERTs where possible (#4306)Amber Brown2019-01-247-30/+212
| | |/ / / | |/| | |
| * | | | Fixup removal of duplicate `user_ips` rows (#4432)Erik Johnston2019-01-231-1/+5
| |/ / /
| * | | 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
| | |/ | |/|
| * | Fix race when persisting create event (#4404)Erik Johnston2019-01-181-1/+12
| |/
| * Remove duplicates in the user_ips table and add an index (#4370)Amber Brown2019-01-122-4/+160
| * Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-1/+9
* | Merge tag 'v0.34.1rc1' into matrix-org-hotfixesRichard van der Hoff2019-01-085-18/+102
|\|
| * Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-021-25/+25
| * Log roomid along with Unknown room (#4297)Will Hunt2018-12-241-1/+1
| * create support user (#4141)Neil Johnson2018-12-143-4/+83
| * Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| * Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-7/+13
| * drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-061-7/+6
* | Merge remote-tracking branch 'origin/release-v0.34.0' into matrix-org-hotfixesRichard van der Hoff2018-12-191-1/+1
|\ \
| * | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-141-1/+1
| |/
* | Merge tag 'v0.34.0rc1' into matrix-org-hotfixesRichard van der Hoff2018-12-049-90/+27
|\|
| * Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-0/+6
| * 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-041-7/+8
| * Drop sent_transactionsAaron Raimist2018-12-016-74/+3
| * Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-281-2/+3
| * Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-201-1/+1
* | Revert "Merge branch 'rav/timestamp_patch' into matrix-org-hotfixes"Richard van der Hoff2018-12-031-39/+0
* | Fix buglet and remove thread_id stuffRichard van der Hoff2018-11-301-5/+4
* | Initial patch from ErikRichard van der Hoff2018-11-301-0/+40
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-11-201-34/+40
|\|
| * Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-151-34/+40
* | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-11-142-2/+70
|\|
| * Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a...David Baker2018-11-098-65/+274
| |\
| * | pep8David Baker2018-11-091-1/+2
| * | add docsDavid Baker2018-11-091-1/+4
| * | 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-292-1/+54
* | | Merge remote-tracking branch 'origin/erikj/fix_device_comparison' into matrix...Richard van der Hoff2018-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
* | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesRichard van der Hoff2018-11-065-17/+134
|\| |
| * | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-062-6/+6
| * | 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 remote-tracking branch 'origin/develop' into matrix-org-hotfixesAmber Brown2018-10-314-48/+137
|\| |
| * | Merge pull request #4006 from matrix-org/erikj/purge_state_groupsErik Johnston2018-10-304-48/+137
| |\ \ | | |/ | |/|
| | * Move _find_unreferenced_groupsErik Johnston2018-10-292-81/+83
| | * Fix set operations thinkoErik Johnston2018-10-291-3/+4
| | * Don't make temporary listErik Johnston2018-10-291-3/+2
| | * Make SQL a bit cleanerErik Johnston2018-10-291-3/+2
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-2610-379/+635
| | |\
| | * | pep8Erik Johnston2018-10-191-1/+1
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_stat...Erik Johnston2018-10-196-56/+461
| | |\ \
| | * | | Batch process handling state groupsErik Johnston2018-10-192-101/+92
| | * | | Fix up commentsErik Johnston2018-10-121-3/+3
| | * | | Add state_group index to event_to_state_groupsErik Johnston2018-10-043-1/+27
| | * | | Delete unreferened state groups during purgeErik Johnston2018-10-042-6/+77
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-10-292-2/+6
|\| | | |
| * | | | Deduplicate device updates sent over replicationErik Johnston2018-10-291-1/+5
| * | | | preserve room visibilityRichard van der Hoff2018-10-251-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2018-10-265-373/+629
|\| | |
| * | | Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-252-327/+520
| * | | Merge pull request #4081 from matrix-org/neilj/fix_mau_initNeil Johnson2018-10-252-23/+83
| |\ \ \
| | * | | add new lineNeil Johnson2018-10-251-0/+1
| | * | | improve commentsNeil Johnson2018-10-251-6/+6
| | * | | fix style inconsistenciesNeil Johnson2018-10-242-15/+47
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_mau_initNeil Johnson2018-10-242-22/+25
| | |\ \ \
| | * | | | remove white spaceNeil Johnson2018-10-231-2/+1
| | * | | | fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-232-17/+45
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-2512-51/+423
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #4082 from matrix-org/rav/fix_pep8Richard van der Hoff2018-10-241-1/+1
| | |\ \ \ \
| | | * | | | Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
| | | |/ / /
| | * | | | Merge pull request #4040 from matrix-org/erikj/states_res_v2_rebaseErik Johnston2018-10-241-21/+24
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Update event_auth table for rejected eventsErik Johnston2018-10-161-15/+21
| | | * | | Add v2 state res algorithm.Erik Johnston2018-10-161-6/+3
| * | | | | Merge branch 'develop' into matthew/autocreate_autojoinNeil Johnson2018-10-042-34/+91
| |\ \ \ \ \
| * | | | | | fix thinkosMatthew Hodgson2018-09-291-1/+1
* | | | | | | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixesAmber Brown2018-10-225-6/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-205-6/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2018-10-184-22/+377
|\| | | | |
| * | | | | Fix incorrect truncation in get_missing_eventsRichard van der Hoff2018-10-161-22/+16
| | |_|/ / | |/| | |
| * | | | Merge pull request #4019 from matrix-org/dbkr/e2e_backupsDavid Baker2018-10-153-0/+361
| |\ \ \ \
| | * | | | Misc PR feedback bitsDavid Baker2018-10-121-2/+2
| | * | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0916-116/+330
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Don't reuse backup versionsDavid Baker2018-10-052-3/+9
| | * | | | WIP e2e key backupsDavid Baker2018-09-131-0/+0
| | * | | | try to make flake8 and isort happyHubert Chathi2018-09-061-2/+4
| | * | | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-2414-195/+674
| | |\ \ \ \
| | * | | | | allow session_data to be any JSON instead of just a stringHubert Chathi2018-08-211-2/+4
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-24 18:50:54 +0000