summary refs log tree commit diff
path: root/tests/storage (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-v1.15.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-241-118/+149
|\
| * Replace instances of reactor pumping with get_success. (#7619)Andrew Morgan2020-06-031-118/+149
* | Merge branch 'release-v1.14.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-1011-73/+279
|\|
| * Optimise some references to hs.config (#7546)Richard van der Hoff2020-05-222-58/+65
| * Add ability to wait for replication streams (#7542)Erik Johnston2020-05-222-3/+3
| * Merge tag 'v1.13.0rc2' into developRichard van der Hoff2020-05-141-1/+49
| |\
| * | Shuffle persist event data store functions. (#7440)Erik Johnston2020-05-131-1/+2
| * | Allow configuration of Synapse's cache without using synctl or environment va...Amber Brown2020-05-113-10/+11
| * | Add room details admin endpoint (#7317)Manuel Stahl2020-05-071-0/+11
| * | Add MultiWriterIdGenerator. (#7281)Erik Johnston2020-05-041-0/+184
* | | Merge branch 'release-v1.13.0' of github.com:matrix-org/synapse into dinsic-r...Andrew Morgan2020-06-105-55/+162
|\ \ \ | | |/ | |/|
| * | Stop `get_joined_users` corruption from custom statuses (#7376)Richard van der Hoff2020-05-141-1/+49
| |/
| * Return total number of users and profile attributes in admin users endpoint (...Manuel Stahl2020-04-281-0/+46
| * bg update to clear out duplicate outbound_device_list_pokes (#7193)Richard van der Hoff2020-04-071-0/+52
| * Make do_next_background_update return a boolRichard van der Hoff2020-03-311-3/+3
| * Make `has_completed_background_updates` asyncRichard van der Hoff2020-03-311-1/+3
| * Remove unused `start_background_update`Richard van der Hoff2020-03-311-5/+9
| * Change device list streams to have one row per ID (#7010)Erik Johnston2020-03-191-45/+0
| |\
| | * Remove handling of multiple rows per IDErik Johnston2020-02-281-45/+0
* | | Improve get auth chain difference algorithm. (#7095)Andrew Morgan2020-03-241-17/+140
|\| |
| * | Improve get auth chain difference algorithm. (#7095)Erik Johnston2020-03-181-17/+140
* | | Break down monthly active users by appservice_id (#7030)Andrew Morgan2020-03-241-0/+42
|\| |
| * | Break down monthly active users by appservice_id (#7030)Neil Johnson2020-03-061-0/+42
| |/
* | Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Andrew Morgan2020-03-245-46/+42
|\|
| * Clarify list/set/dict/tuple comprehensions and enforce via flake8 (#6957)Patrick Cloke2020-02-215-46/+42
* | Merge pull request #6872 from matrix-org/rav/dictpropertyAndrew Morgan2020-03-241-1/+1
|\|
| * Replace _event_dict_property with DictPropertyRichard van der Hoff2020-02-141-1/+1
* | Add typing to SyncHandler (#6821)Andrew Morgan2020-03-231-1/+4
|\|
| * Add typing to SyncHandler (#6821)Erik Johnston2020-02-031-1/+4
| * Type defintions for use in refactoring for redaction changes (#6803)Richard van der Hoff2020-01-301-4/+11
* | Add `rooms.room_version` column (#6729)Andrew Morgan2020-03-232-2/+10
|\|
| * Add `rooms.room_version` column (#6729)Erik Johnston2020-01-272-2/+10
* | Make 'event.redacts' never raise. (#6771)Andrew Morgan2020-03-231-0/+35
|\|
| * Make 'event.redacts' never raise. (#6771)Erik Johnston2020-01-231-0/+35
* | Add `local_current_membership` table (#6655)Andrew Morgan2020-03-231-1/+1
|\|
| * Add `local_current_membership` table (#6655)Erik Johnston2020-01-151-1/+1
* | Allow admin users to create or modify users without a shared secret (#6495)Andrew Morgan2020-03-231-0/+2
|\|
| * Allow admin users to create or modify users without a shared secret (#6495)Manuel Stahl2020-01-091-0/+2
* | port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Andrew Morgan2020-03-201-35/+37
|\|
| * port BackgroundUpdateTestCase to HomeserverTestCase (#6653)Richard van der Hoff2020-01-071-35/+37
* | Merge pull request #6629 from matrix-org/rav/kill_event_reference_hashesAndrew Morgan2020-03-201-11/+4
|\|
| * Remove unused get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-13/+6
| * rename get_prev_events_for_room to get_prev_events_and_hashes_for_roomRichard van der Hoff2020-01-061-2/+2
* | Split state groups into a separate data store (#6296)Andrew Morgan2020-03-201-1/+1
|\|
| * Split state groups into a separate data store (#6296)Erik Johnston2019-12-201-1/+1
* | Add database config class (#6513)Andrew Morgan2020-03-203-18/+34
|\|
| * Add database config class (#6513)Erik Johnston2019-12-183-18/+34
* | Fix race which caused deleted devices to reappear (#6514)Andrew Morgan2020-03-191-20/+29
|\|
| * Fix race which caused deleted devices to reappear (#6514)Richard van der Hoff2019-12-101-20/+29
* | Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Andrew Morgan2020-03-194-13/+14
|\|
| * Fixup testsErik Johnston2019-12-064-11/+11
| * Change DataStores to accept 'database' param.Erik Johnston2019-12-061-2/+3
* | Merge pull request #6469 from matrix-org/erikj/make_database_classAndrew Morgan2020-03-1910-66/+102
|\|
| * Move background update handling out of storeErik Johnston2019-12-054-25/+59
| * Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-0510-41/+43
* | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseAndrew Morgan2020-03-196-24/+24
|\|
| * Remove underscore from SQLBaseStore functionsErik Johnston2019-12-046-24/+24
* | Implementation of MSC2314 (#6176)Andrew Morgan2020-03-181-25/+1
|\|
| * Implementation of MSC2314 (#6176)Amber Brown2019-11-281-25/+1
* | add etag and count to key backup endpoints (#5858)Andrew Morgan2020-03-181-4/+4
|\|
| * add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-4/+4
* | Merge pull request #6295 from matrix-org/erikj/split_purge_historyAndrew Morgan2020-03-181-7/+8
|\|
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-041-7/+9
| |\
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-311-48/+102
| |\ \
| * | | Split purge API into events vs stateErik Johnston2019-10-301-7/+8
* | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Andrew Morgan2020-03-161-7/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-311-48/+102
| |\ \ \ | | | |/ | | |/|
| * | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-301-6/+6
| * | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-306-9/+88
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-244-3/+5
| |\ \ \
| * | | | fix unit testHubert Chathi2019-10-221-1/+3
* | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageAndrew Morgan2020-03-161-48/+102
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Port to use state storageErik Johnston2019-10-301-48/+102
| | |_|/ | |/| |
* | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeAndrew Morgan2020-03-164-8/+12
|\| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-302-1/+76
| |\ \ \
| * | | | Use new EventPersistenceStoreErik Johnston2019-10-234-8/+12
| | |_|/ | |/| |
* | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorAndrew Morgan2020-03-161-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-301-1/+1
* | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysAndrew Morgan2020-03-161-0/+75
|\| | |
| * | | remove unneeded importsHubert Chathi2019-10-251-3/+1
| * | | switch to using HomeserverTestCaseHubert Chathi2019-10-251-19/+25
| * | | remove some unnecessary linesHubert Chathi2019-10-241-5/+0
| * | | delete keys when deleting backupsHubert Chathi2019-10-241-0/+76
| |/ /
* | | Merge pull request #6231 from matrix-org/erikj/refactor_storesAndrew Morgan2020-03-164-3/+5
|\| |
| * | Move storage classes into a main "data store".Erik Johnston2019-10-214-3/+5
| |/
* | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageAndrew Morgan2020-02-261-6/+6
|\|
| * Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-111-6/+6
| |\
| | * make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-101-6/+6
* | | Fix MAU reaping where reserved users are specified. (#6168)Andrew Morgan2020-02-261-9/+49
|\| |
| * | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-111-9/+49
* | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesAndrew Morgan2020-02-261-1/+1
|\| |
| * | Fix postgres unit testsErik Johnston2019-10-101-1/+1
| |/
* | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsAndrew Morgan2020-02-261-0/+11
|\|
| * Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-021-0/+11
| |\
| | * Fix errors storing large retry intervals.Erik Johnston2019-10-021-0/+11
* | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsAndrew Morgan2020-02-261-0/+36
|\| |
| * | Fix fetching censored redactions from DBErik Johnston2019-10-021-0/+36
| |/
* | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-252-9/+178
|\|
| * Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-262-9/+178
* | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-251-0/+71
|\|
| * Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71
* | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsAndrew Morgan2020-02-251-1/+79
|\|
| * Test background updateErik Johnston2019-09-231-0/+79
| * Query devices table for last seen info.Erik Johnston2019-09-231-1/+0
* | Add 'failure_ts' column to 'destinations' table (#6016)Andrew Morgan2020-02-251-3/+5
|\|
| * Add 'failure_ts' column to 'destinations' table (#6016)Richard van der Hoff2019-09-171-3/+5
* | Merge pull request #5934 from matrix-org/erikj/censor_redactionsAndrew Morgan2020-02-251-1/+76
|\|
| * Merge pull request #5934 from matrix-org/erikj/censor_redactionsErik Johnston2019-09-091-1/+76
| |\
| | * Fix testErik Johnston2019-09-051-1/+3
| | * Make redaction retention period configurableErik Johnston2019-09-051-1/+3
| | * Censor redactions in DB after a monthErik Johnston2019-08-301-0/+71
* | | Servers-known-about statistic (#5981)Andrew Morgan2020-02-251-37/+89
|\| |
| * | Servers-known-about statistic (#5981)Amber Brown2019-09-071-37/+89
| |/
* | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentAndrew Morgan2020-02-241-0/+1
|\|
| * Fix registration testHalf-Shot2019-08-231-0/+1
* | Merge pull request #5788 from matrix-org/rav/metaredactionsAndrew Morgan2020-02-201-0/+70
|\|
| * Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-0/+70
| |\
| | * Handle loops in redaction eventsRichard van der Hoff2019-07-301-0/+70
* | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateAndrew Morgan2020-02-201-1/+36
|\| |
| * | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-301-1/+36
| |\ \ | | |/ | |/|
| | * Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
* | | Convert RedactionTestCase to modern test style (#5768)Andrew Morgan2020-02-191-36/+38
|\| |
| * | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-261-36/+38
* | | Replace returnValue with return (#5736)Andrew Morgan2020-02-194-6/+6
|\| |
| * | Replace returnValue with return (#5736)Amber Brown2019-07-234-6/+6
| |/
* | Support Prometheus_client 0.4.0+ (#5636)Andrew Morgan2020-02-191-3/+1
|\|
| * Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-181-3/+1
* | Implement access token expiry (#5660)Andrew Morgan2020-02-171-3/+5
|\|
| * Implement access token expiry (#5660)Richard van der Hoff2019-07-121-3/+5
* | Remove access-token support from RegistrationStore.register (#5642)Andrew Morgan2020-02-173-41/+17
|\|
| * Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-103-41/+17
* | Fix with isort==4.3.21 and black==19.3b0Andrew Morgan2020-02-141-1/+0
* | Fix signedjson deleted methodAndrew Morgan2020-02-141-4/+12
* | Run Black. (#5482)Andrew Morgan2020-02-133-5/+5
|\|
| * Run Black. (#5482)Amber Brown2019-06-2011-72/+74
* | Dinsic Blacking with black==18.6b2Andrew Morgan2020-02-119-73/+72
* | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsAndrew Morgan2020-02-101-1/+1
|\|
| * Run as background process and fix commentsErik Johnston2019-06-191-1/+1
* | Add experimental option to reduce extremities.Andrew Morgan2020-02-101-0/+41
|\|
| * Add experimental option to reduce extremities.Erik Johnston2019-06-181-0/+41
* | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveAndrew Morgan2020-02-101-10/+10
|\|
| * Prometheus histograms are cumalativeErik Johnston2019-06-141-10/+10
* | Merge pull request #5458 from matrix-org/hawkowl/fix-prometheusAndrew Morgan2020-02-101-38/+23
|\|
| * fix prometheus rendering errorAmber H. Brown2019-06-141-38/+23
* | Expose statistics on extrems to prometheus (#5384)Andrew Morgan2020-02-102-79/+146
|\|
| * Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-132-79/+146
* | Merge branch 'master' into dinsicBrendan Abolivier2019-06-123-19/+126
|\|
| * Prevent multiple device list updates from breaking a batch send (#5156)Andrew Morgan2019-06-061-0/+69
| * Set default room version to v4. (#5379)Neil Johnson2019-06-061-0/+6
| * Add testErik Johnston2019-05-291-0/+248
| * Store key validity time in the storage layerRichard van der Hoff2019-05-231-14/+30
| * Rewrite store_server_verify_key to store several keys at once (#5234)Richard van der Hoff2019-05-231-14/+30
* | Merge branch 'master' into dinsicBrendan Abolivier2019-06-111-0/+248
|\ \
| * | Add testErik Johnston2019-05-301-0/+248
| |/
* | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-171-1/+1
|\|
| * Expose DataStore._get_events as get_events_as_listErik Johnston2019-05-141-1/+1
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-1410-82/+50
|\|
| * Run Black on the tests again (#5170)Amber Brown2019-05-109-80/+44
| * Add admin api for sending server_notices (#5121)Richard van der Hoff2019-05-021-1/+4
| * Move admin api impl to its own packageRichard van der Hoff2019-05-011-2/+3
* | Merge branch 'develop' into dinsicAndrew Morgan2019-04-155-146/+74
|\|
| * Rewrite Datastore.get_server_verify_keysRichard van der Hoff2019-04-091-3/+50
| * Rewrite test_keys as a HomeserverTestCaseRichard van der Hoff2019-04-081-19/+15
| * Remove presence lists (#4989)Neil Johnson2019-04-031-118/+0
| * Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-013-8/+11
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-211-12/+5
|\|
| * Migrate the user directory initial population to a background task (#4864)Amber Brown2019-03-191-8/+3
| * fixupAmber Brown2019-03-121-2/+2
| * Rewrite userdir to be faster (#4537)Amber Brown2019-03-071-2/+0
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-1511-19/+270
|\|
| * UPSERT many functionality (#4644)Amber Brown2019-02-201-0/+88
| * Fix flake8 (#4519)Amber Brown2019-01-304-10/+1
| * Fix UPSERTs on SQLite 3.24+ (#4477)Amber Brown2019-01-282-4/+7
| * Fix testsErik Johnston2019-01-253-3/+8
| * Revert "Require event format version to parse or create events"Erik Johnston2019-01-253-8/+3
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_fo...Erik Johnston2019-01-241-0/+1
| |\
| | * Use native UPSERTs where possible (#4306)Amber Brown2019-01-241-0/+1
| * | Fix testsErik Johnston2019-01-243-3/+8
| |/
| * Fix adding new rows instead of updating them if one of the key values is a NU...Amber Brown2019-01-091-0/+71
| * create support user (#4141)Neil Johnson2018-12-142-2/+54
| * Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-1/+1
| * Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-151-0/+25
| * Add test to assert set_e2e_device_keys correctly returns False on no-opErik Johnston2018-11-081-0/+15
* | merge master into dinsic, again...Matthew Hodgson2018-11-0315-253/+730
|\|
| * Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-251-65/+110
| * fix style inconsistenciesNeil Johnson2018-10-241-2/+2
| * fix race condiftion in calling initialise_reserved_usersNeil Johnson2018-10-231-2/+8
| * Add testsErik Johnston2018-10-021-0/+45
| * Fix userconsent on Python 3 (#3938)Amber Brown2018-10-021-46/+2
| * docstrings and unittests for storage.state (#3958)Richard van der Hoff2018-09-271-0/+39
| * Fix client IPs being broken on Python 3 (#3908)Amber Brown2018-09-201-35/+167
| * improve namingNeil Johnson2018-09-121-3/+3
| * expose number of real reserved usersNeil Johnson2018-09-121-0/+31
| * Port tests/ to Python 3 (#3808)Amber Brown2018-09-071-64/+38
| * ensure guests never enter mau listNeil Johnson2018-09-062-4/+6
| * guest users should not be part of mau totalNeil Johnson2018-09-051-2/+42
| * Fix tests on postgresql (#3740)Amber Brown2018-09-047-138/+151
| * Port storage/ to Python 3 (#3725)Amber Brown2018-08-311-0/+106
| * Fix up testsRichard van der Hoff2018-08-281-2/+2
| * Implement trail usersErik Johnston2018-08-231-0/+1
| * Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-222-2/+6
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2020-648/+543
| | |\
| | * | Fix testsErik Johnston2018-08-092-2/+6
| * | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-11/+94
| | |/ | |/|
* | | fix conflict and reinstate 6372dff771413c2b9cd5648cbb6de01a679ef801Matthew Hodgson2018-10-221-4/+0
* | | merge in masterMatthew Hodgson2018-10-2220-501/+909
|\| |
| * | call reap on start up and fix under reaping bugNeil Johnson2018-08-161-0/+13
| * | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-151-1/+1
| * | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| * | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-142-12/+13
| |\ \
| | * | rename _user_last_seen_monthly_activeNeil Johnson2018-08-092-12/+13
| | |/
| * | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1318-21/+31
| * | Run black.black2018-08-1020-622/+493
| * | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-101-1/+1
| |/
| * Test fixes for Python 3 (#3647)Amber Brown2018-08-092-2/+2
| * implement reserved users for mau limitsNeil Johnson2018-08-071-1/+58
| * wip commit - tests failingNeil Johnson2018-08-032-13/+13
| * fix (lots of) py3 test failuresNeil Johnson2018-08-031-1/+0
| * fix py3 test failureNeil Johnson2018-08-031-0/+1
| * fix caching and testsNeil Johnson2018-08-031-13/+37
| * remove unused count_monthly_usersNeil Johnson2018-08-021-65/+0
| * fix test, update constructor callNeil Johnson2018-08-021-1/+1
| * insertion into monthly_active_usersNeil Johnson2018-08-021-3/+63
| * Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-021-3/+3
| * change monthly_active_users table to be a single columnNeil Johnson2018-08-011-3/+3
| * Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-011-0/+65
| |\
| | * fix isortNeil Johnson2018-08-011-1/+0
| | * fix known broken testNeil Johnson2018-08-011-25/+20
| | * coding styleNeil Johnson2018-07-311-1/+0
| | * fix user_ips countingNeil Johnson2018-07-311-9/+33
| | * monthly_active_testsNeil Johnson2018-07-301-0/+48
| * | api into monthly_active_users tableNeil Johnson2018-07-311-0/+42
| |/
| * flake8Matthew Hodgson2018-07-251-12/+12
| * add tests for _get_some_state_from_cacheMatthew Hodgson2018-07-251-0/+150
| * incorporate more reviewMatthew Hodgson2018-07-241-0/+9
| * make test workMatthew Hodgson2018-07-191-37/+46
| * first cut of a UT for testing state store (untested)Matthew Hodgson2018-07-191-0/+151
* | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-1915-36/+44
|\|
| * run isortAmber Brown2018-07-0915-36/+44
* | Merge tag 'v0.31.2' into dinsicMichael Kaye2018-06-222-6/+11
|\|
| * fix testsRichard van der Hoff2018-05-291-0/+1
| * Send users a server notice about consentRichard van der Hoff2018-05-221-3/+8
| * Use stream rather depth ordering for push actionsErik Johnston2018-05-111-2/+2
| * Fix a couple of logcontext leaks in unit testsRichard van der Hoff2018-05-021-1/+0
* | remove create_profile from testsMatthew Hodgson2018-05-041-8/+0
* | Merge branch 'master' into dinsicMatthew Hodgson2018-05-032-6/+74
|\|
| * Merge pull request #3103 from NotAFile/py3-baseexcepton-messageRichard van der Hoff2018-04-201-6/+6
| |\
| | * Use str(e) instead of e.messageAdrian Tschira2018-04-151-6/+6
| * | Avoid creating events with huge numbers of prev_eventsRichard van der Hoff2018-04-161-0/+68
| |/
* | PR feedbackDavid Baker2018-04-251-2/+2