summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-085-28/+195
|\
| * typosNeil Johnson2018-08-082-3/+3
| * Fix postgres compatibility bugNeil Johnson2018-08-061-4/+15
| * make use of _simple_select_one_onecol, improved commentsNeil Johnson2018-08-062-8/+15
| * bug fixesNeil Johnson2018-08-031-2/+1
| * wip commit - tests failingNeil Johnson2018-08-032-38/+49
| * fix caching and testsNeil Johnson2018-08-031-48/+43
| * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-033-8/+27
| |\
| * | typoNeil Johnson2018-08-021-1/+1
| * | wip attempt at cachingNeil Johnson2018-08-021-9/+47
| * | do mau checks based on monthly_active_users tableNeil Johnson2018-08-021-7/+8
| * | remove unused count_monthly_usersNeil Johnson2018-08-021-25/+0
| * | insertion into monthly_active_usersNeil Johnson2018-08-023-7/+35
| * | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-022-1/+3
| |\ \
| | * | self.db_conn unusedNeil Johnson2018-08-011-1/+0
| | * | normalise reaping queryNeil Johnson2018-08-011-3/+38
| * | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-022-4/+10
| |/ /
| * | change monthly_active_users table to be a single columnNeil Johnson2018-08-012-10/+4
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-017-11/+47
| |\ \
| * | | clean upNeil Johnson2018-08-011-15/+3
| * | | fix commentNeil Johnson2018-08-011-1/+1
| * | | api into monthly_active_users tableNeil Johnson2018-07-314-2/+114
* | | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| |_|/ |/| |
* | | Merge branch 'master' into developRichard van der Hoff2018-08-022-6/+15
|\ \ \
| * | | Avoid extra db lookupsRichard van der Hoff2018-08-022-35/+15
| * | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-021-0/+29
* | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-021-2/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | update docsErik Johnston2018-08-011-1/+1
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-3011-67/+225
| |\ \ \ | | | |/ | | |/|
| * | | Split out DB writes in federation handlerErik Johnston2018-07-251-2/+12
* | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-012-1/+27
|\ \ \ \
| * | | | improve clarityNeil Johnson2018-08-011-4/+5
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-016-6/+10
| |\ \ \ \
| * | | | | remove errant printNeil Johnson2018-08-011-1/+0
| * | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-011-13/+13
| * | | | | coding styleNeil Johnson2018-07-312-3/+2
| * | | | | actually close connNeil Johnson2018-07-301-4/+8
| * | | | | factor out metrics from __init__ to app/homeserverNeil Johnson2018-07-301-24/+13
| * | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-301-0/+34
| | |_|/ / | |/| | |
* | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-022-5/+11
| |/ / / |/| | |
* | | | Merge pull request #3612 from matrix-org/rav/store_heirarchyRichard van der Hoff2018-07-316-6/+10
|\ \ \ \ | |/ / / |/| | |
| * | | reinstate explicit include of EventsWorkerStoreRichard van der Hoff2018-07-311-1/+3
| * | | Make EventStore inherit from EventFederationStoreRichard van der Hoff2018-07-266-7/+9
* | | | make /context lazyload & filter aware (#3567)Matthew Hodgson2018-07-271-3/+11
* | | | Merge pull request #3614 from matrix-org/rav/stop_populating_event_contentRichard van der Hoff2018-07-263-2/+98
|\ \ \ \
| * | | | Create the column nullableRichard van der Hoff2018-07-262-9/+13
| * | | | Stop populating events.contentRichard van der Hoff2018-07-262-1/+93
* | | | | Merge pull request #3613 from matrix-org/rav/stop_using_event_edges_room_idRichard van der Hoff2018-07-262-8/+6
|\ \ \ \ \
| * | | | | Remove some redundant joins on event_edges.room_idRichard van der Hoff2018-07-262-8/+6
| |/ / / /
* | | | | Merge pull request #3610 from matrix-org/rav/fix_looping_callsRichard van der Hoff2018-07-265-6/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix some looping_call calls which were broken in #3604Richard van der Hoff2018-07-265-6/+8
| |/ / /
* / / / comment on event_edgesRichard van der Hoff2018-07-261-1/+2
|/ / /
* | | switch missing_types to be a boolMatthew Hodgson2018-07-251-4/+4
* | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-258-125/+187
|\| |
| * | Merge pull request #3603 from matrix-org/erikj/handle_outliersErik Johnston2018-07-251-6/+8
| |\ \
| | * | Actually fix it by adding continueErik Johnston2018-07-251-0/+1
| | * | Fix typo in conditionalErik Johnston2018-07-251-1/+1
| | * | Correctly handle outliers during persist eventsErik Johnston2018-07-251-6/+7
| * | | Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_moreRichard van der Hoff2018-07-252-5/+10
| |\ \ \
| | * | | Fix another logcontext leak in _persist_eventsRichard van der Hoff2018-07-252-5/+10
| | |/ /
| * | | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_errorRichard van der Hoff2018-07-251-1/+1
| |\ \ \
| | * | | Fix occasional 'tuple index out of range' errorRichard van der Hoff2018-07-251-1/+1
| | |/ /
| * / / Wrap a number of things that run in the backgroundRichard van der Hoff2018-07-254-10/+26
| |/ /
| * | Pull out did_forget to worker storeErik Johnston2018-07-241-25/+27
| * | Merge pull request #3595 from matrix-org/erikj/use_deltasErik Johnston2018-07-241-53/+118
| |\ \
| | * | Expand on docstring comment about return valueErik Johnston2018-07-241-0/+5
| | * | Remove unnecessary iteritemsErik Johnston2018-07-241-1/+1
| | * | Fixup comment (and indent)Erik Johnston2018-07-241-16/+20
| | * | Don't fetch state from the database unless neededErik Johnston2018-07-241-12/+18
| | * | Have _get_new_state_after_events return deltaErik Johnston2018-07-241-17/+48
| | * | Don't require to_delete to have event_idsErik Johnston2018-07-241-36/+55
| * | | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-242-28/+0
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-242-15/+31
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_roomRichard van der Hoff2018-07-235-26/+70
| | |\ \ \
| | * | | | Remove redundant checks on room forgottennessRichard van der Hoff2018-07-232-28/+0
* | | | | | incorporate more review.Matthew Hodgson2018-07-251-16/+14
* | | | | | handle the edge case for _get_some_state_from_cache where types is []Matthew Hodgson2018-07-241-1/+7
* | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-241-12/+4
|\| | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_c...Erik Johnston2018-07-242-13/+24
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Remove unnecessary ifErik Johnston2018-07-241-2/+1
| * | | | | Speed up _calculate_state_deltaErik Johnston2018-07-241-10/+3
* | | | | | consider non-filter_type types as wildcards, thus missing from the state-grou...Matthew Hodgson2018-07-241-1/+4
* | | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-242-14/+25
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'develop' into rav/logcontext_fixesRichard van der Hoff2018-07-241-11/+21
| |\ \ \ \ \
| | * | | | | fix idiocyRichard van der Hoff2018-07-241-2/+8
| | * | | | | Add some measure blocks to persist_eventsRichard van der Hoff2018-07-231-11/+15
| | |/ / / /
| * / / / / Logcontext fixesRichard van der Hoff2018-07-242-3/+4
| |/ / / /
* | | | | incorporate more reviewMatthew Hodgson2018-07-241-27/+9
* | | | | handle case where types is [] on postgres correctlyMatthew Hodgson2018-07-231-1/+1
* | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-235-26/+75
|\| | | |
| * | | | CommentsErik Johnston2018-07-231-0/+3
| * | | | Only get cached state from context in persist_eventErik Johnston2018-07-231-1/+3
| | |/ / | |/| |
| * | | Use new gettersErik Johnston2018-07-233-5/+11
| * | | Merge branch 'develop' into matthew/sync_deleted_devicesMatthew Hodgson2018-07-236-23/+49
| |\| |
| * | | add trailing commaMatthew Hodgson2018-07-231-1/+1
| * | | yes, we do need to invalidate the device_id_exists_cache when deleting a remo...Matthew Hodgson2018-07-191-1/+0
| * | | spell out that include_deleted_devices requires include_all_devicesMatthew Hodgson2018-07-191-1/+5
| * | | shift to using an explicit deleted flag on m.device_list_update EDUsMatthew Hodgson2018-07-122-20/+25
| * | | WIP to announce deleted devices over federationMatthew Hodgson2018-07-122-13/+43
* | | | incorporate reviewMatthew Hodgson2018-07-231-12/+8
* | | | fix thinkos; unbreak testsMatthew Hodgson2018-07-191-2/+2
* | | | incorporate reviewMatthew Hodgson2018-07-191-3/+4
* | | | add a filtered_types param to limit filtering to specific typesMatthew Hodgson2018-07-191-53/+60
* | | | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-1950-375/+550
|\ \ \ \ | | |/ / | |/| |
| * | | revert 00bc979Richard van der Hoff2018-07-191-4/+3
| * | | Merge remote-tracking branch 'origin/release-v0.33.0' into developRichard van der Hoff2018-07-191-3/+4
| |\ \ \ | | | |/ | | |/|
| | * | Disable logcontext warningRichard van der Hoff2018-07-191-3/+4
| * | | Run things as background processesRichard van der Hoff2018-07-184-16/+29
| |/ /
| * | Merge pull request #3505 from matrix-org/erikj/receipts_cahceErik Johnston2018-07-121-6/+19
| |\ \ | | |/ | |/|
| | * Update return value docstringErik Johnston2018-07-121-1/+1
| | * Use 'is not None' and add commentsErik Johnston2018-07-101-2/+6
| | * Use stream cache in get_linearized_receipts_for_roomErik Johnston2018-07-101-4/+13
| * | s/becuase/because/gMatthew Hodgson2018-07-101-2/+2
| |/
| * Attempt to include db threads in cpu usage stats (#3496)Richard van der Hoff2018-07-102-18/+17
| * Add CPU metrics for _fetch_event_listRichard van der Hoff2018-07-091-19/+32
| * run isortAmber Brown2018-07-0949-246/+244
| * Invalidate cache on correct threadErik Johnston2018-07-021-1/+2
| * Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-2819-28/+35
| * Fix error on deleting users pending deactivationDavid Baker2018-06-261-1/+3
| * Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili...Erik Johnston2018-06-253-0/+126
| * Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility"Richard van der Hoff2018-06-223-126/+0
| * Deleting from event_push_actions needs to use an indexMark Haines2018-06-221-1/+8
| * Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterableRichard van der Hoff2018-06-221-1/+1
| |\
| | * Make _get_joined_hosts_cache cache non-iterableErik Johnston2018-06-221-1/+1
| * | Merge pull request #3430 from matrix-org/rav/configurable_push_action_rotationRichard van der Hoff2018-06-221-3/+5
| |\ \ | | |/ | |/|
| | * Make push actions rotation configurableErik Johnston2018-06-221-3/+5
| * | Merge pull request #3431 from matrix-org/rav/erasure_visibilityErik Johnston2018-06-223-0/+126
| |\ \
| | * | UserErasureStoreRichard van der Hoff2018-06-123-0/+126
| * | | Merge pull request #3427 from matrix-org/erikj/remove_filtersErik Johnston2018-06-221-20/+1
| |\| | | | |/ | |/|
| | * remove dead filter_events_for_clientsRichard van der Hoff2018-06-121-20/+1
| * | Disable partial state group caching for wildcard lookupsRichard van der Hoff2018-06-221-13/+43
| * | Merge pull request #3382 from matrix-org/rav/optimise_state_groupsRichard van der Hoff2018-06-221-5/+1
| |\ \
| | * | Optimise state_group_cache updateRichard van der Hoff2018-06-111-5/+1
| * | | Merge pull request #3419 from matrix-org/rav/events_per_requestRichard van der Hoff2018-06-221-0/+4
| |\ \ \
| | * | | Indirect evt_count updates via method callRichard van der Hoff2018-06-221-1/+1
| | * | | Log number of events fetched from DBRichard van der Hoff2018-06-211-0/+4
| | | |/ | | |/|
| * / | Pass around the reactor explicitly (#3385)Amber Brown2018-06-224-9/+9
| |/ /
| * | Merge pull request #3276 from matrix-org/dbkr/unbindDavid Baker2018-06-111-9/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/develop' into dbkr/unbindDavid Baker2018-05-241-9/+6
| | |\ \
| | * | | Hit the 3pid unbind endpoint on deactivationDavid Baker2018-05-231-9/+0
* | | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-102-29/+3
|\| | | |
| * | | | Fix sql error in _get_state_groups_from_groupsRichard van der Hoff2018-06-061-1/+1
| * | | | Merge pull request #3324 from matrix-org/rav/remove_dead_methodRichard van der Hoff2018-06-041-26/+0
| |\ \ \ \
| | * | | | Remove was_forgotten_atRichard van der Hoff2018-06-011-26/+0
| | | |_|/ | | |/| |
| * / | | Add hacky cache factor override systemErik Johnston2018-06-041-2/+2
| |/ / /
* | | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-0412-92/+179
|\| | |
| * | | Merge pull request #3264 from matrix-org/neil/sign-up-statsNeil Johnson2018-06-013-1/+56
| |\ \ \
| | * | | remove unnecessary INSERTNeil Johnson2018-06-011-1/+0
| | * | | create users index on creation_tsNeil Johnson2018-05-291-0/+20
| | * | | create index in backgroundNeil Johnson2018-05-291-0/+7
| | * | | bump versionNeil Johnson2018-05-291-1/+1
| | * | | daily user type phone home statsNeil Johnson2018-05-221-0/+29
| | |/ /
| * | | Handle RRs which arrive before their eventsRichard van der Hoff2018-06-011-25/+19
| * | | Ignore depth when updating read-receiptsRichard van der Hoff2018-06-011-30/+37
| * | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-315-54/+59
| * | | Merge pull request #3303 from NotAFile/py3-memoryviewAmber Brown2018-05-303-6/+30
| |\ \ \
| | * | | add remaining memoryview changesAdrian Tschira2018-05-292-4/+12
| | * | | use memoryview in py3Adrian Tschira2018-05-292-2/+18
| * | | | Merge pull request #3281 from NotAFile/py3-six-isinstanceAmber Brown2018-05-301-2/+3
| |\ \ \ \
| | * | | | remaining isintance fixesAdrian Tschira2018-05-241-2/+3
| * | | | | Exempt AS-registered users from doing gdprRichard van der Hoff2018-05-291-0/+1
| | |/ / / | |/| | |
* | | | | add pydocMatthew Hodgson2018-05-291-22/+54
* | | | | merge developMatthew Hodgson2018-05-2940-519/+1165
|\| | | |
| * | | | update metrics to be in secondsAmber Brown2018-05-281-15/+15
| * | | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2810-43/+60
| |\ \ \ \
| | * \ \ \ Merge pull request #3279 from NotAFile/py3-more-iteritemsAmber Brown2018-05-241-4/+6
| | |\ \ \ \
| | | * | | | more iteritemsAdrian Tschira2018-05-241-4/+6
| | | |/ / /
| | * / / / Misc. py3 fixesAdrian Tschira2018-05-243-3/+3
| | |/ / /
| | * | | Merge pull request #3278 from NotAFile/py3-storage-baseAmber Brown2018-05-241-17/+22
| | |\ \ \
| | | * | | Py3 storage/_base.pyAdrian Tschira2018-05-241-17/+22
| | | | |/ | | | |/|
| | * | | Merge pull request #3244 from NotAFile/py3-six-4Amber Brown2018-05-244-9/+16
| | |\ \ \
| | | * | | replace some iteritems with sixAdrian Tschira2018-05-194-9/+16
| | * | | | Merge pull request #3247 from NotAFile/py3-miscAmber Brown2018-05-241-1/+7
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | use stand-in value if maxint is not availableAdrian Tschira2018-05-191-1/+7
| | | |/ /
| | * | | Remove unused string formatting paramErik Johnston2018-05-221-1/+0
| | * | | Don't support limitless paginationErik Johnston2018-05-221-8/+6
| | | |/ | | |/|
| * | | cleanupAmber Brown2018-05-221-3/+6
| * | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-2211-75/+286
| |\| |
| | * | Send users a server notice about consentRichard van der Hoff2018-05-222-7/+59
| | * | Tighter filtering for user_daily_visitsNeil Johnson2018-05-181-1/+5
| | |/
| | * fix psql compatability bugNeil Johnson2018-05-181-1/+1
| | * Merge pull request #3235 from matrix-org/rav/fix_receipts_deferredRichard van der Hoff2018-05-181-7/+11
| | |\
| | | * Fix error in handling receiptsRichard van der Hoff2018-05-181-7/+11
| | * | Merge pull request #3221 from matrix-org/erikj/purge_tokenErik Johnston2018-05-181-24/+53
| | |\ \ | | | |/ | | |/|
| | | * Clarify commentErik Johnston2018-05-161-1/+2
| | | * CommentsErik Johnston2018-05-161-0/+8
| | | * Move and rename variableErik Johnston2018-05-161-3/+3
| | | * Make purge_history operate on tokensErik Johnston2018-05-151-8/+9
| | | * Use events_to_purge table rather than tokenErik Johnston2018-05-151-15/+34
| | * | Merge pull request #3212 from matrix-org/erikj/epa_streamErik Johnston2018-05-172-38/+16
| | |\ \
| | | * | Use stream rather depth ordering for push actionsErik Johnston2018-05-112-38/+16
| | * | | Merge pull request #3163 from matrix-org/cohort_analyticsNeil Johnson2018-05-165-5/+113
| | |\ \ \
| | | * | | remove empty lineNeil Johnson2018-05-161-1/+0
| | | * | | style and further contraining queryNeil Johnson2018-05-161-8/+12
| | | * | | Limit query load of generate_user_daily_visitsNeil Johnson2018-05-151-13/+47
| | | * | | instead of inserting user daily visit data at the end of the day, instead ins...Neil Johnson2018-05-141-40/+14
| | | * | | Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_a...Neil Johnson2018-05-1410-290/+380
| | | |\| |
| | | * | | remove user agent from data model, will just join on user_ipsNeil Johnson2018-05-011-12/+11
| | | * | | add inidexes based on usageNeil Johnson2018-05-011-6/+2
| | | * | | pep8Neil Johnson2018-04-251-3/+4
| | | * | | Generate user daily statsNeil Johnson2018-04-255-5/+106
| | * | | | Merge pull request #3213 from matrix-org/rav/consent_handlerRichard van der Hoff2018-05-162-0/+36
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-152-0/+36
| | | | |/ | | | |/|
| * | / | rest of the changesAmber Brown2018-05-212-27/+18
| |/ / /
| * | | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivateDavid Baker2018-05-142-0/+64
| |\ \ \ | | |/ / | |/| |
| | * | Many docstringsDavid Baker2018-05-101-0/+12
| | * | Add the schema fileDavid Baker2018-05-091-0/+25
| | * | Part deactivated users in the backgroundDavid Baker2018-05-091-0/+27
| * | | Merge pull request #3199 from matrix-org/erikj/pagination_syncErik Johnston2018-05-091-39/+36
| |\ \ \
| | * | | Refactor sync APIs to reuse pagination APIErik Johnston2018-05-091-38/+35
| | * | | Don't unnecessarily require token to be stream tokenErik Johnston2018-05-091-1/+1
| * | | | Merge pull request #3198 from matrix-org/erikj/fixup_return_paginationErik Johnston2018-05-091-1/+15
| |\ \ \ \
| | * | | | Fix up commentErik Johnston2018-05-091-1/+1
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_retu...Erik Johnston2018-05-091-5/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Refactor get_recent_events_for_room return typeErik Johnston2018-05-091-1/+15
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_mem...Erik Johnston2018-05-091-5/+6
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Update commentsErik Johnston2018-05-091-5/+6
| | |/ / /
| * / / / Remove unused code path from member change DB funcErik Johnston2018-05-091-24/+10
| |/ / /
| * | | Refactor pagination DB API to return concrete typeErik Johnston2018-05-091-28/+48
| * | | Remove unused from_token paramErik Johnston2018-05-091-7/+4
| * | | Refactor recent events func to use pagination funcErik Johnston2018-05-091-48/+27
| * | | Fix up comments and make function privateErik Johnston2018-05-091-7/+7
| * | | Reuse existing pagination code for context APIErik Johnston2018-05-081-75/+15
| * | | Parse tokens before calling DB functionErik Johnston2018-05-081-14/+18
| * | | Only fetch required fields from databaseErik Johnston2018-05-081-1/+2
| * | | Split paginate_room_events storage functionErik Johnston2018-05-081-28/+72
| |/ /
| * | Merge pull request #3141 from matrix-org/erikj/fixup_stateErik Johnston2018-05-031-37/+67
| |\ \
| | * | Fix up grammarErik Johnston2018-05-031-3/+3
| | * | Refactor event storage to not require stateErik Johnston2018-04-271-37/+67
| * | | Merge pull request #3129 from matrix-org/matthew/fix_group_dupsMatthew Hodgson2018-04-301-0/+57
| |\ \ \
| | * | | fix missing importMatthew Hodgson2018-04-281-0/+1
| | * | | pep8Matthew Hodgson2018-04-281-3/+5
| | * | | make it work with sqliteMatthew Hodgson2018-04-282-34/+54
| | * | | 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