summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | remove duplicates from groups tablesMatthew Hodgson2018-04-251-0/+34
| | | |/ | | |/|
| * | | Merge branch 'develop' into py3-xrange-1Richard van der Hoff2018-04-302-4/+6
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/develop' into rav/use_run_in_backgroundRichard van der Hoff2018-04-272-8/+18
| | |\ \ \
| | * | | | Use run_in_background in preference to preserve_fnRichard van der Hoff2018-04-272-4/+6
| | | |_|/ | | |/| |
| * | | | Move more xrange to sixAdrian Tschira2018-04-284-4/+12
| | |/ / | |/| |
| * | | Merge pull request #3138 from matrix-org/rav/catch_unhandled_exceptionsRichard van der Hoff2018-04-271-7/+17
| |\ \ \
| | * | | Improve exception handling for background processesRichard van der Hoff2018-04-271-7/+17
| | |/ /
| * / / Add missing consumeErrorsRichard van der Hoff2018-04-271-1/+1
| |/ /
| * | Fix media admin APIsErik Johnston2018-04-261-2/+2
| * | Also fix reindexing of searchErik Johnston2018-04-251-1/+1
| * | Fix quarantine media admin APIErik Johnston2018-04-251-1/+1
| |/
| * Merge pull request #3110 from NotAFile/py3-six-queueRichard van der Hoff2018-04-201-2/+4
| |\
| | * Replace Queue with six.moves.queueAdrian Tschira2018-04-161-2/+4
| * | Merge pull request #3117 from matrix-org/rav/refactor_have_eventsRichard van der Hoff2018-04-201-7/+42
| |\ \
| | * | Refactor store.have_eventsRichard van der Hoff2018-04-201-7/+42
| | |/
| * / Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-161-16/+41
| |/
| * Format docstringErik Johnston2018-04-121-2/+3
| * Doc we raise on unknown eventErik Johnston2018-04-121-2/+3
| * Track last processed event received_tsErik Johnston2018-04-111-0/+18
| * Track where event stream processing have gotten up toErik Johnston2018-04-111-0/+3
| * Merge pull request #2760 from Valodim/pypyRichard van der Hoff2018-04-112-1/+6
| |\
| | * Fix pep8 error on psycopg2cffi hackRichard van der Hoff2018-04-101-6/+5
| | * Use psycopg2cffi module instead of psycopg2 if running on pypyVincent Breitmoser2018-04-102-2/+8
| * | fix typoNeil Johnson2018-04-101-2/+2
| * | remove errant print v0.27.3-rc2Neil Johnson2018-04-091-1/+1
| * | Fix msec to sec, againNeil Johnson2018-04-091-3/+3
| * | Fix msec to secNeil Johnson2018-04-091-1/+1
| * | Fix psycopg2 interpolationNeil Johnson2018-04-091-5/+5
| |/
| * Don't use redundant inlineCallbacksLuke Barnard2018-04-061-4/+1
| * join_rule -> join_policyLuke Barnard2018-04-061-1/+1
| * is_joinable -> join_ruleLuke Barnard2018-04-061-4/+1
| * pep8David Baker2018-04-061-1/+2
| * Implement group join APIDavid Baker2018-04-061-3/+9
| * Merge pull request #3045 from matrix-org/dbkr/group_joinableLuke Barnard2018-04-053-0/+42
| |\
| | * NON NULL -> NOT NULLLuke Barnard2018-04-051-1/+1
| | * Use DEFAULT join_policy of "invite" in dbLuke Barnard2018-04-051-1/+1
| | * Document set_group_join_policyLuke Barnard2018-04-051-0/+6
| | * Use join_policy API instead of joinableLuke Barnard2018-04-032-4/+10
| | * OK, smallint it is thenDavid Baker2018-03-281-1/+1
| | * Grr. Copy the definition from is_adminDavid Baker2018-03-281-1/+1
| | * Make column definition that works on both dbsDavid Baker2018-03-281-1/+1
| | * Add schema delta fileDavid Baker2018-03-281-0/+16
| | * Add joinability for groupsDavid Baker2018-03-282-1/+15
| * | Merge pull request #3041 from matrix-org/r30_statsNeil Johnson2018-04-054-7/+111
| |\ \
| | * | Review commentsNeil Johnson2018-04-051-4/+5
| | * | pep8Neil Johnson2018-03-291-2/+4
| | * | Remove need for sqlite specific queryNeil Johnson2018-03-291-30/+57
| | * | fix pep8 errorsNeil Johnson2018-03-281-3/+0
| | * | remove twisted deferral cruftNeil Johnson2018-03-281-6/+3
| | * | bump schema versionNeil Johnson2018-03-281-1/+1
| | * | Support multi client R30 for psqlNeil Johnson2018-03-281-8/+28
| | * | Add user_ips last seen indexNeil Johnson2018-03-282-0/+24
| | * | No need to cast in count_daily_usersNeil Johnson2018-03-281-2/+2
| | * | query and call for r30 statsNeil Johnson2018-03-281-0/+36
| | * | count_daily_users failed if db was sqlite due to type failure - presumably th...Neil Johnson2018-03-281-1/+1
| | |/
| * | Merge pull request #3060 from matrix-org/rav/kill_event_contentRichard van der Hoff2018-04-053-7/+12
| |\ \
| | * | Remove uses of events.contentRichard van der Hoff2018-03-293-7/+12
| * | | Merge pull request #3049 from matrix-org/rav/use_staticjsonRichard van der Hoff2018-04-031-15/+8
| |\ \ \
| | * | | Use static JSONEncodersRichard van der Hoff2018-03-291-15/+8
| | |/ /
| * / / Use simplejson throughoutRichard van der Hoff2018-03-291-1/+2
| |/ /
| * | Fix search_user_dir multiple sqlite versions do different thingsNeil Johnson2018-03-281-2/+2
| * | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_idErik Johnston2018-03-281-3/+1
| |\ \
| | * | Don't use _cursor_to_dict in find_next_generated_user_id_localpartErik Johnston2018-03-261-3/+1
| | |/
| * | Merge pull request #3030 from matrix-org/erikj/no_ujsonErik Johnston2018-03-281-1/+1
| |\ \
| | * | Remove last usage of ujsonErik Johnston2018-03-261-1/+1
| | |/
| * | CommentErik Johnston2018-03-271-4/+5
| * | Fix indentErik Johnston2018-03-271-1/+1
| * | CommentErik Johnston2018-03-271-0/+7
| * | Add counter metrics for calculating state deltaErik Johnston2018-03-271-1/+30
| |/
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-1917-26/+25
| |\
| | * Remove wrong commentErik Johnston2018-03-161-1/+0
| | * Replace ujson with simplejsonErik Johnston2018-03-1517-26/+26
| * | Replace some ujson with simplejson to make it workErik Johnston2018-03-162-2/+2
* | | Replace some ujson with simplejson to make it workErik Johnston2018-03-162-2/+2
* | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-03-142-37/+43
|\| |
| * | Merge pull request #2988 from matrix-org/erikj/split_profile_storeErik Johnston2018-03-141-24/+26
| |\ \
| | * | Split up ProfileStoreErik Johnston2018-03-131-24/+26
| * | | Merge pull request #2993 from matrix-org/erikj/is_blockedErik Johnston2018-03-141-13/+17
| |\ \ \
| | * | | Add is_blocked to worker storeErik Johnston2018-03-131-13/+17
| | |/ /
| * / / fix bug #2926 (loading all state for a given type from the DB if the state_ke...Matthew Hodgson2018-03-131-7/+27
| |/ /
* | | pep8Matthew Hodgson2018-03-141-2/+2
* | | make it workMatthew Hodgson2018-03-131-4/+6
* | | remove comment now #2969 is fixedMatthew Hodgson2018-03-131-6/+0
* | | merge proper fix to bug 2969Matthew Hodgson2018-03-132-15/+30
|\ \ \
| * | | typoeMatthew Hodgson2018-03-131-1/+1
| * | | disable optimisation for searching for state groupsMatthew Hodgson2018-03-131-3/+13
| * | | build where_clause sanelyMatthew Hodgson2018-03-131-6/+4
| * | | PR feedbackzMatthew Hodgson2018-03-131-3/+2
| * | | fix bug #2926Matthew Hodgson2018-03-131-4/+17
| |/ /
| * | Add Measure block for persist_eventsRichard van der Hoff2018-03-131-4/+5
* | | correctly handle None state_keysMatthew Hodgson2018-03-121-10/+16
* | | fix sqlite where clauseMatthew Hodgson2018-03-121-2/+3
* | | typosMatthew Hodgson2018-03-111-0/+2
* | | WIP experiment in lazyloading room membersMatthew Hodgson2018-03-111-5/+42
|/ /
* | Fix race in sync when joining roomErik Johnston2018-03-072-2/+27
* | Merge pull request #2946 from matrix-org/rav/timestamp_to_purgeRichard van der Hoff2018-03-061-0/+27
|\ \
| * | Provide a means to pass a timestamp to purge_historyRichard van der Hoff2018-03-051-0/+27
* | | Merge pull request #2948 from matrix-org/erikj/kill_as_syncErik Johnston2018-03-062-153/+5
|\ \ \
| * | | Remove ability for AS users to call /events and /syncErik Johnston2018-03-052-153/+5
* | | | Merge pull request #2947 from matrix-org/erikj/split_directory_storeErik Johnston2018-03-051-23/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix cache invalidation on deletionErik Johnston2018-03-051-1/+4
| * | | Split Directory storeErik Johnston2018-03-051-22/+23
| |/ /
* | | Merge pull request #2943 from matrix-org/rav/fix_find_first_stream_ordering_a...Richard van der Hoff2018-03-051-12/+71
|\ \ \ | |/ / |/| |
| * | Test and fix find_first_stream_ordering_after_tsRichard van der Hoff2018-03-051-15/+53
| * | Add find_first_stream_ordering_after_tsRichard van der Hoff2018-03-051-0/+21
* | | Merge pull request #2934 from matrix-org/erikj/cache_fixErik Johnston2018-03-052-13/+15
|\ \ \
| * | | Fix bug with delayed cache invalidation streamErik Johnston2018-03-022-13/+15
* | | | Split registration storeErik Johnston2018-03-021-57/+61
|/ / /
* | | Merge pull request #2925 from matrix-org/erikj/split_sig_fedErik Johnston2018-03-012-133/+143
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_sig_fedErik Johnston2018-03-014-371/+406
| |\ \
| * | | Stub out broken function only used for cacheErik Johnston2018-03-011-1/+3
| * | | Split out SignatureStore and EventFederationStoreErik Johnston2018-03-012-132/+140
* | | | Merge pull request #2927 from matrix-org/erikj/read_marker_cachesErik Johnston2018-03-012-2/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | Fewer lies are betterErik Johnston2018-03-011-2/+2
| * | | Improve caching for read_marker APIErik Johnston2018-03-011-0/+35
| * | | Add some caches to help read marker APIErik Johnston2018-03-012-2/+4
| |/ /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_stre...Erik Johnston2018-03-013-197/+206
|\ \ \
| * \ \ Merge pull request #2923 from matrix-org/erikj/stream_ago_workerErik Johnston2018-03-012-79/+85
| |\ \ \
| | * | | Default stream_ordering_*_ago to NoneErik Johnston2018-03-011-2/+2
| | * | | Fix comment typoErik Johnston2018-03-011-1/+1
| | * | | Calculate stream_ordering_month_ago correctly on workersErik Johnston2018-03-012-79/+85
| | |/ /
| * / / Split up RoomStoreErik Johnston2018-03-011-118/+121
| |/ /
* | | Remove unused variablesErik Johnston2018-03-011-8/+1
* | | Document abstract class and method betterErik Johnston2018-03-011-8/+13
* | | Split out stream storeErik Johnston2018-03-012-165/+193
|/ /
* | Move storage functions for push calculationsErik Johnston2018-02-274-87/+99
* | Merge pull request #2904 from matrix-org/erikj/receipt_cache_invalidationErik Johnston2018-02-271-14/+14
|\ \
| * | Fix missing invalidations for receipt storageErik Johnston2018-02-211-14/+14
* | | Merge pull request #2903 from matrix-org/erikj/split_roommember_storeErik Johnston2018-02-271-179/+182
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_room...Erik Johnston2018-02-238-501/+607
| |\ \ \
| * | | | Update copyrightErik Johnston2018-02-232-0/+2
| * | | | Split out RoomMemberStoreErik Johnston2018-02-211-179/+181
* | | | | Merge pull request #2901 from matrix-org/erikj/split_as_storesErik Johnston2018-02-271-9/+22
|\ \ \ \ \
| * | | | | Add commentErik Johnston2018-02-271-0/+4
| * | | | | Update copyrightErik Johnston2018-02-231-0/+1
| * | | | | Split AS storesErik Johnston2018-02-211-9/+17
| |/ / / /
* | | | | Merge pull request #2892 from matrix-org/erikj/batch_inserts_push_actionsErik Johnston2018-02-261-17/+36
|\ \ \ \ \
| * | | | | Batch inserts into event_push_actions_stagingErik Johnston2018-02-201-17/+36
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/handle_unp...Erik Johnston2018-02-269-560/+700
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_even...Erik Johnston2018-02-237-424/+532
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #2902 from matrix-org/erikj/split_events_storeErik Johnston2018-02-232-359/+402
| | |\ \ \ \ \
| | | * | | | | Split EventsWorkerStore into separate fileErik Johnston2018-02-232-360/+400
| | | * | | | | Update copyrightErik Johnston2018-02-231-0/+1
| | | * | | | | Remove redundant clockErik Johnston2018-02-231-3/+0
| | | * | | | | _event_persist_queue shouldn't be in worker storeErik Johnston2018-02-231-4/+4
| | | | |/ / / | | | |/| | |
| | | * | | | Split out get_events and co into a worker storeErik Johnston2018-02-211-345/+350
| | | | |/ / | | | |/| |
| | * | | | Merge pull request #2899 from matrix-org/erikj/split_pushersErik Johnston2018-02-231-4/+7
| | |\ \ \ \
| | | * | | | Update copyrightErik Johnston2018-02-231-0/+1
| | | * | | | Split PusherStoreErik Johnston2018-02-211-4/+6
| | | |/ / /
| | * | | | Merge pull request #2898 from matrix-org/erikj/split_push_rules_storeErik Johnston2018-02-232-28/+57
| | |\ \ \ \
| | | * | | | Update copyrightErik Johnston2018-02-232-0/+2
| | | * | | | Split PushRulesStoreErik Johnston2018-02-212-28/+55
| | | |/ / /
| | * | | | Update copyrightErik Johnston2018-02-232-0/+2
| | * | | | Use absolute importsErik Johnston2018-02-232-3/+3
| | * | | | Split AccountDataStore and TagStoreErik Johnston2018-02-213-33/+65
| | |/ / /
| * | | | Update copyrightErik Johnston2018-02-232-0/+2
| * | | | Split out EventPushActionWorkerStoreErik Johnston2018-02-211-71/+73
| |/ / /
| * | | Raise exception in abstract methodErik Johnston2018-02-201-1/+1
| * | | Fix commentErik Johnston2018-02-201-1/+1
| * | | Use abstract base class to access stream IDsErik Johnston2018-02-201-15/+27
| * | | Split ReceiptsStoreErik Johnston2018-02-202-48/+64
| |/ /
* | | Actually use new paramErik Johnston2018-02-211-1/+3
* | | Ensure all push actions are deleted from stagingErik Johnston2018-02-202-2/+19
* | | Refactor _set_push_actions_for_event_and_users_txn to use events_and_contextsErik Johnston2018-02-202-33/+41
|/ /
* | (Really) fix tablescan of event_push_actions on purgeRichard van der Hoff2018-02-161-1/+0
* | Fix typo of double is_highlightErik Johnston2018-02-161-1/+1
* | CommentsErik Johnston2018-02-162-1/+6
* | Ensure that we delete staging push actions on errorsErik Johnston2018-02-151-0/+16
* | Remove context.push_actionsErik Johnston2018-02-151-4/+3
* | Update event_push_actions table from staging tableErik Johnston2018-02-152-22/+39
* | Store push actions in staging areaErik Johnston2018-02-152-0/+51
* | Don't serialize current state over replicationErik Johnston2018-02-151-0/+14
* | Fix state group storage bug in workersErik Johnston2018-02-151-41/+41
* | Merge pull request #2867 from matrix-org/rav/rework_purgeRichard van der Hoff2018-02-151-35/+83
|\ \
| * | purge_history: fix sqlite syntax errorRichard van der Hoff2018-02-141-1/+4
| * | purge_history: handle sqlite asshatteryRichard van der Hoff2018-02-141-19/+27
| * | purge_history: fix index useRichard van der Hoff2018-02-141-0/+14
| * | Rework event purge to use a temporary tableRichard van der Hoff2018-02-141-35/+58
* | | Merge pull request #2769 from matrix-org/matthew/hit_the_ginRichard van der Hoff2018-02-145-20/+110
|\ \ \
| * | | remove overzealous exception handlingRichard van der Hoff2018-02-141-18/+10
| * | | Merge branch 'matthew/gin_work_mem' into matthew/hit_the_ginRichard van der Hoff2018-02-1313-312/+605
| |\ \ \
| | * \ \ Merge branch 'develop' into matthew/gin_work_memRichard van der Hoff2018-02-138-223/+390
| | |\ \ \
| | * | | | Factor out common code for search insertRichard van der Hoff2018-02-041-33/+56
| | * | | | Clean up work_mem handlingRichard van der Hoff2018-02-031-11/+41
| | * | | | Move store_event_search_txn to SearchStoreRichard van der Hoff2018-02-032-37/+43
| | * | | | Merge branch 'develop' into matthew/gin_work_memRichard van der Hoff2018-02-037-39/+100
| | |\ \ \ \
| | * | | | | oopshera2018-01-092-2/+2
| | * | | | | oops, tweak work_mem when actually storingMatthew Hodgson2018-01-091-0/+2
| | * | | | | avoid 80s GIN inserts by tweaking work_memMatthew Hodgson2018-01-091-0/+4
| | | |_|_|/ | | |/| | |
| * | | | | move search reindex to schema 47Richard van der Hoff2018-02-132-1/+1
| * | | | | GIN reindex: Fix syntax errors, improve exception handlingRichard van der Hoff2018-02-131-13/+27
| * | | | | Reinstate event_search_postgres_gist handlerRichard van der Hoff2018-02-023-6/+31
| * | | | | fix GIST->GIN switchMatthew Hodgson2018-01-093-14/+37
| * | | | | switch back from GIST to GIN indexesMatthew Hodgson2018-01-091-8/+13
| |/ / / /
* | | | | Merge pull request #2854 from matrix-org/erikj/event_create_workerErik Johnston2018-02-131-0/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add replication http endpoint for event sendingErik Johnston2018-02-071-0/+13
* | | | | Fix log message in purge_historyRichard van der Hoff2018-02-131-2/+1
* | | | | Merge pull request #2864 from matrix-org/rav/persist_event_cachingRichard van der Hoff2018-02-131-56/+40
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | style nitRichard van der Hoff2018-02-131-1/+1
| * | | | Use StateResolutionHandler to resolve state in persist eventsRichard van der Hoff2018-02-051-48/+24
| * | | | Flatten _get_new_state_after_eventsRichard van der Hoff2018-02-051-44/+46
| * | | | Check that events being persisted have state_groupRichard van der Hoff2018-02-051-4/+9
| * | | | Add event_map param to resolve_state_groupsRichard van der Hoff2018-02-051-0/+1
* | | | | Merge pull request #2858 from matrix-org/rav/purge_updatesRichard van der Hoff2018-02-091-33/+61
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | purge: move room_depth update to endRichard van der Hoff2018-02-091-6/+12
| * | | | delete_local_events for purge_historyRichard van der Hoff2018-02-091-7/+28
| * | | | purge: Move cache invalidation to more appropriate placeRichard van der Hoff2018-02-091-4/+4
| * | | | bump purge logging to infoRichard van der Hoff2018-02-091-13/+14
| * | | | rename delete_old_state -> purge_historyRichard van der Hoff2018-02-091-7/+7
* | | | | Store state groups separately from events (#2784)Erik Johnston2018-02-066-103/+166
* | | | | Merge pull request #2849 from matrix-org/rav/clean_up_state_deltaRichard van der Hoff2018-02-051-10/+23
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove redundant return value from _calculate_state_deltaRichard van der Hoff2018-02-051-10/+23
* | | | | Factor out common code for search insertRichard van der Hoff2018-02-051-33/+62
* | | | | Move store_event_search_txn to SearchStoreRichard van der Hoff2018-02-052-35/+41
|/ / / /
* | | | Merge pull request #2841 from matrix-org/rav/refactor_calc_state_deltaRichard van der Hoff2018-02-021-18/+39
|\ \ \ \
| * | | | factor _get_new_state_after_events out of _calculate_state_deltaRichard van der Hoff2018-01-311-18/+39
* | | | | Merge branch 'develop' into travis/admin-list-mediaTravis Ralston2018-02-013-11/+11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #2837 from matrix-org/rav/fix_quarantine_mediaRichard van der Hoff2018-02-011-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix sql error in quarantine_mediaRichard van der Hoff2018-01-301-1/+1
| * | | | Improve exception handling in persist_eventRichard van der Hoff2018-01-291-3/+3
| |/ / /
| * / / Fix SQL for user searchRichard van der Hoff2018-01-271-7/+7
| |/ /
* | | pep8Travis Ralston2018-01-311-9/+12
* | | Documentation and namingTravis Ralston2018-01-311-7/+26
* | | Appease the linterTravis Ralston2018-01-201-5/+5
* | | Add an admin route to get all the media in a roomTravis Ralston2018-01-201-56/+75
|/ /
* | Merge pull request #2805 from matrix-org/rav/log_state_resRichard van der Hoff2018-01-171-0/+6
|\ \
| * | Log room when doing state resolutionRichard van der Hoff2018-01-171-0/+6
* | | Merge pull request #2783 from matrix-org/erikj/media_last_accessedErik Johnston2018-01-173-4/+37
|\ \ \
| * | | Remove lost commentErik Johnston2018-01-171-3/+0
| * | | Keep track of last access time for local mediaErik Johnston2018-01-173-4/+40
* | | | Merge pull request #2803 from matrix-org/matthew/fix-userdir-sqlMatthew Hodgson2018-01-171-2/+7
|\ \ \ \
| * | | | fix SQL when searching all usersMatthew Hodgson2018-01-171-2/+7
* | | | | Split resolve_events into two functionsRichard van der Hoff2018-01-171-2/+2
|/ / / /
* | | | Track DB scheduling delay per-requestRichard van der Hoff2018-01-161-1/+3
* | | | rework runInteraction in terms of runConnectionRichard van der Hoff2018-01-161-20/+31
|/ / /
* / / Fix a logcontext leak in persist_eventsRichard van der Hoff2018-01-161-1/+8
|/ /
* / Remove dead code related to default thumbnailsErik Johnston2018-01-091-3/+0
|/
* fix StoreError syntaxMatthew Hodgson2017-12-051-1/+1
* fix pep8 and testsMatthew Hodgson2017-12-041-4/+3
* switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-041-24/+16
* Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-307-55/+143
|\
| * Remove pushers when deleting access tokensRichard van der Hoff2017-11-291-5/+5
| * Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_errorRichard van der Hoff2017-11-275-14/+82
| |\
| | * fix sql failsRichard van der Hoff2017-11-221-1/+1
| | * Check database in has_completed_background_updatesRichard van der Hoff2017-11-222-11/+32
| | * Fix error on sqlite 3.7Richard van der Hoff2017-11-214-5/+52
| * | Avoid retrying forever on IntegrityErrorRichard van der Hoff2017-11-271-0/+7
| * | Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsertRichard van der Hoff2017-11-211-36/+49
| |\ \ | | |/ | |/|
| | * Avoid locking account_data tables for upsertsRichard van der Hoff2017-11-161-36/+49
* | | remove null constraint on user_dir.room_idMatthew Hodgson2017-11-301-0/+35
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-09 01:45:38 +0000