summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Renamve get_room_stateErik Johnston2019-09-022-4/+4
* Merge branch 'rei/rss_target' of github.com:matrix-org/synapse into rei/rss_inc8Erik Johnston2019-09-0277-446/+290
|\
| * Merge pull request #5941 from matrix-org/rei/rss_inc7reivilibre2019-08-301-3/+504
| |\
| | * Fix to use milliseconds github/rei/rss_inc7 rei/rss_inc7Olivier Wilkinson (reivilibre)2019-08-301-1/+1
| * | Merge branch 'develop' into rei/rss_targetOlivier Wilkinson (reivilibre)2019-08-3076-445/+289
| |\ \
| | * | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
| | * | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3074-280/+280
| | * | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
| | * | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-303-165/+9
* | | | LintingOlivier Wilkinson (reivilibre)2019-08-302-2/+0
* | | | Add stats testsOlivier Wilkinson (reivilibre)2019-08-301-0/+74
* | | | Various fixesOlivier Wilkinson (reivilibre)2019-08-302-8/+6
* | | | Fixes to counting and stats deltasOlivier Wilkinson (reivilibre)2019-08-301-3/+3
* | | | Whoopsies; these things come in order…Olivier Wilkinson (reivilibre)2019-08-301-1/+1
* | | | Fix incremental processor when there are no deltas.Olivier Wilkinson (reivilibre)2019-08-301-7/+8
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Adapt to use renamed `room_state`Olivier Wilkinson (reivilibre)2019-08-301-1/+1
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-1/+1
|\| | |
| * | | Ambiguous `room_id`Olivier Wilkinson (reivilibre)2019-08-301-1/+1
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-0/+1
|\| | |
| * | | Whoops, took out a line there...Olivier Wilkinson (reivilibre)2019-08-301-0/+1
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-5/+6
|\| | |
| * | | `users` table's ID field is actually called `name`.Olivier Wilkinson (reivilibre)2019-08-301-5/+6
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-1/+1
|\| | |
| * | | Fix that became apparent after unit testingOlivier Wilkinson (reivilibre)2019-08-301-1/+1
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-16/+25
|\| | |
| * | | Code formatting and typo pointed out by Erik.Olivier Wilkinson (reivilibre)2019-08-301-10/+15
| * | | Some fixes that have become necessary due to changes in other PRsOlivier Wilkinson (reivilibre)2019-08-301-8/+12
* | | | Merge branch 'rei/rss_inc7' into rei/rss_inc8Olivier Wilkinson (reivilibre)2019-08-301-3/+493
|\| | | | |/ / |/| |
| * | Code formattingOlivier Wilkinson (reivilibre)2019-08-301-18/+20
| * | Add stats regeneratorOlivier Wilkinson (reivilibre)2019-08-301-3/+491
* | | Convert `chain` to `list` as `chain` is only once iterable. github/rei/rss_inc6 rei/rss_inc6Olivier Wilkinson (reivilibre)2019-08-301-2/+2
* | | Merge branch 'rei/rss_target' into rei/rss_inc6Olivier Wilkinson (reivilibre)2019-08-303-6/+126
|\| |
| * | Merge branch 'rei/rss_target' into rei/rss_inc5 github/rei/rss_inc5 rei/rss_inc5Olivier Wilkinson (reivilibre)2019-08-2939-370/+1472
| |\ \
| * | | Count total_events and total_event_bytes within the loop.Olivier Wilkinson (reivilibre)2019-08-292-15/+20
| * | | Update total_events and total_event_bytes on new events.Olivier Wilkinson (reivilibre)2019-08-281-0/+6
| * | | Add incremental counting for rooms' total events and total event bytes.Olivier Wilkinson (reivilibre)2019-08-281-0/+106
| * | | Add `total_event_bytes` to room statistics schema.Olivier Wilkinson (reivilibre)2019-08-282-0/+3
* | | | Merge branch 'rei/rss_target' into rei/rss_inc6Olivier Wilkinson (reivilibre)2019-08-2939-370/+1472
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'develop' into rei/rss_targetOlivier Wilkinson (reivilibre)2019-08-2939-370/+1472
| |\ \ \ | | |/ / | |/| / | | |/
| | * Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-281-1/+2
| | * Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-283-2/+7
| | |\
| | | * Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | | * Exempt bot usersHalf-Shot2019-08-231-1/+1
| | | * Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-231-1/+2
| | | |\
| | | | * Add bot typeHalf-Shot2019-08-231-1/+2
| | | * | Ignore consent for support usersHalf-Shot2019-08-231-0/+1
| | | * | Return user_type in get_user_by_idHalf-Shot2019-08-231-1/+4
| | | |/
| | * | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-281-3/+4
| | * | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-283-9/+165
| | * | Config templating (#5900)Jorik Schellekens2019-08-284-37/+161
| | * | Implement a structured logging output system. (#5680)Amber Brown2019-08-2819-77/+763
| | * | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-281-8/+16
| | * | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-283-9/+42
| | |\ \
| | | * | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-273-9/+42
| | * | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-283-16/+95
| | |\ \ \
| | | * | | Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| | | * | | Add support for inbound MSC2197 requests on unstable Federation APIOlivier Wilkinson (reivilibre)2019-08-151-1/+59
| | | * | | Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-152-16/+59
| | * | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsErik Johnston2019-08-272-208/+217
| | |\ \ \ \
| | | * | | | Fix off by one error in SRV result shufflingErik Johnston2019-08-271-8/+13
| | | * | | | Fixup commentsErik Johnston2019-08-231-1/+9
| | | * | | | Fix logcontextsErik Johnston2019-08-231-4/+8
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l...Erik Johnston2019-08-2229-243/+742
| | | |\ \ \ \
| | | * | | | | Remove now unused pick_server_from_listErik Johnston2019-08-201-30/+0
| | | * | | | | Fixup _sort_server_list to be slightly more efficientErik Johnston2019-08-201-2/+11
| | | * | | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-152-189/+202
* | | | | | | | Code formatting (Black)Olivier Wilkinson (reivilibre)2019-08-291-12/+30
* | | | | | | | Upsert fixesOlivier Wilkinson (reivilibre)2019-08-281-8/+15
* | | | | | | | Hoist up None check to prevent trying to iterate over NoneType.keys()Olivier Wilkinson (reivilibre)2019-08-281-3/+4
* | | | | | | | Track new users in user statistics.Olivier Wilkinson (reivilibre)2019-08-281-0/+12
|/ / / / / / /
* | | | | | | Address code review comments github/rei/rss_inc3 rei/rss_inc3Olivier Wilkinson (reivilibre)2019-08-281-24/+30
* | | | | | | Merge branch 'rei/rss_target' into rei/rss_inc3Olivier Wilkinson (reivilibre)2019-08-283-89/+100
|\ \ \ \ \ \ \
| * | | | | | | Code formatting (Black) github/rei/rss_inc2 rei/rss_inc2Olivier Wilkinson (reivilibre)2019-08-281-1/+3
| * | | | | | | Update synapse/storage/stats.pyreivilibre2019-08-281-1/+1
| * | | | | | | Clean up code with improved naming and hoist around functions.Olivier Wilkinson (reivilibre)2019-08-271-79/+91
| * | | | | | | Fix logic error.Olivier Wilkinson (reivilibre)2019-08-271-1/+2
| * | | | | | | Update `_purge_room_txn` to take account of separated stats tablesOlivier Wilkinson (reivilibre)2019-08-271-1/+2
| * | | | | | | Rename `room_state` table to `room_stats_state`Olivier Wilkinson (reivilibre)2019-08-273-2/+5
| * | | | | | | Remove obsolete `OldCollectionRequired` as old collection is obsolete.Olivier Wilkinson (reivilibre)2019-08-271-6/+0
* | | | | | | | Use `DeferredLock` instead of `threading.Lock`Olivier Wilkinson (reivilibre)2019-08-272-4/+6
* | | | | | | | Fix logic error.Olivier Wilkinson (reivilibre)2019-08-271-1/+2
* | | | | | | | Invalidate `get_earliest_token_for_stats` cache as required.Olivier Wilkinson (reivilibre)2019-08-271-0/+1
* | | | | | | | For user stats, handle other membership transitions properly.Olivier Wilkinson (reivilibre)2019-08-272-7/+3
* | | | | | | | For user stats, handle other membership transitions properly.Olivier Wilkinson (reivilibre)2019-08-271-12/+16
* | | | | | | | No-op if no membership change and thus simplify verbose dict updates.Olivier Wilkinson (reivilibre)2019-08-271-28/+14
* | | | | | | | Adapt to stats now working in millisecondsOlivier Wilkinson (reivilibre)2019-08-271-1/+1
* | | | | | | | Merge branch 'rei/rss_inc2' into rei/rss_inc3Olivier Wilkinson (reivilibre)2019-08-2743-686/+1452
|\| | | | | | |
| * | | | | | | Switch to milliseconds in room/user stats for consistency.Olivier Wilkinson (reivilibre)2019-08-273-10/+8
| * | | | | | | Code formatting (Black)Olivier Wilkinson (reivilibre)2019-08-271-5/+5
| * | | | | | | Lock tables in upsert fall-backs.Olivier Wilkinson (reivilibre)2019-08-271-0/+2
| * | | | | | | Apply minor suggestions from reviewOlivier Wilkinson (reivilibre)2019-08-271-4/+3
| * | | | | | | Clarify `_update_stats_delta_txn` by adding code comments and kwargs.Olivier Wilkinson (reivilibre)2019-08-271-16/+18
| * | | | | | | Apply suggestions from code reviewreivilibre2019-08-271-2/+2
| * | | | | | | Merge branch 'rei/rss_target' into rei/rss_inc2Olivier Wilkinson (reivilibre)2019-08-2737-462/+1145
| |\ \ \ \ \ \ \
| | * | | | | | | Merge branch 'develop' into rei/rss_targetOlivier Wilkinson (reivilibre)2019-08-2737-464/+1163
| | |\| | | | | |
| | | * | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-271-5/+19
| | | |\ \ \ \ \ \
| | | | * | | | | | Code style (Black)Olivier Wilkinson (reivilibre)2019-08-271-3/+1
| | | | * | | | | | Allow schema deltas to be engine-specificOlivier Wilkinson (reivilibre)2019-08-271-5/+21
| | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-271-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Increase max display name limitNeil Johnson2019-08-241-1/+1
| | | | |/ / / / /
| | | * | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-273-26/+47
| | | |\ \ \ \ \ \
| | | | * | | | | | Don't implicitly include server signing keyErik Johnston2019-08-231-7/+6
| | | | * | | | | | Fixup review commentsErik Johnston2019-08-232-4/+4
| | | | * | | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-212-23/+16
| | | | * | | | | | Add config option for keys to use to sign keysErik Johnston2019-08-212-9/+38
| | | * | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-272-2/+2
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-262-2/+2
| | | | | |/ / / / | | | | |/| | | |
| | | * / | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-274-0/+111
| | | |/ / / / /
| | | * | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-227-92/+208
| | | * | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-221-53/+4
| | | |\ \ \ \ \
| | | | * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| | | * | | | | | Opentracing across workers (#5771)Jorik Schellekens2019-08-224-83/+122
| | | * | | | | | Revert "Do not send consent notices if "no-consent-required" is set"Brendan Abolivier2019-08-221-4/+0
| | | * | | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-223-18/+3
| | | * | | | | | Do not send consent notices if "no-consent-required" is setHalf-Shot2019-08-221-0/+4
| | | * | | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-223-3/+18
| | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-222-37/+115
| | | |\ \ \ \ \
| | | | * | | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-201-11/+12
| | | | * | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-161-4/+1
| | | | * | | | | Retry well known on fail.Erik Johnston2019-08-152-34/+114
| | | * | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-226-7/+141
| | | * | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-221-0/+17
| | | * | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-224-0/+213
| | | * | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-221-5/+7
| | | * | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-213-47/+22
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-201-45/+65
| | | |\ \ \ \ \
| | | | * | | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-201-45/+65
| | | | | |/ / / | | | | |/| | |
| | | * | | | | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-201-18/+25
| | | * | | | | Opentracing doc update (#5776)Jorik Schellekens2019-08-201-27/+40
| | | |/ / / /
| | | * | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-191-17/+5
| | | |\ \ \ \
| | | | * | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| | | | |/ / /
| * | | | | | Use engine-specific delta SQL files rather than delta written in Python.Olivier Wilkinson (reivilibre)2019-08-273-71/+51
| * | | | | | Allow schema deltas to be engine-specificOlivier Wilkinson (reivilibre)2019-08-271-5/+21
| * | | | | | Fix up historical stats support.Olivier Wilkinson (reivilibre)2019-08-221-11/+32
| * | | | | | Fix up SQL schema deltaOlivier Wilkinson (reivilibre)2019-08-221-1/+1
| * | | | | | Simplify table structureOlivier Wilkinson (reivilibre)2019-08-223-138/+175
| * | | | | | Remove needless defaults.Olivier Wilkinson (reivilibre)2019-08-201-8/+8
| * | | | | | Unify name of 'stats regenerator' in schema comments.Olivier Wilkinson (reivilibre)2019-08-201-6/+6
| * | | | | | Clarify `_update_stats_delta_txn`Olivier Wilkinson (reivilibre)2019-08-201-2/+15
| * | | | | | Sanitise accepted fields in `_update_stats_delta_txn`Olivier Wilkinson (reivilibre)2019-08-201-0/+12
| * | | | | | Update synapse/storage/stats.pyreivilibre2019-08-201-1/+1
| * | | | | | Update synapse/storage/stats.pyreivilibre2019-08-201-1/+1
| * | | | | | Ack, isort!Olivier Wilkinson (reivilibre)2019-08-201-1/+2
* | | | | | | Handle state deltas and turn them into stats deltasOlivier Wilkinson (reivilibre)2019-08-202-2/+439
|/ / / / / /
* | | | | | Add storage function for storing stats deltasOlivier Wilkinson (reivilibre)2019-08-201-2/+169
* | | | | | Add schema for Separated StatisticsOlivier Wilkinson (reivilibre)2019-08-202-0/+202
|/ / / / /
* / / / / Tear out current room & user statistics (#5880)reivilibre2019-08-203-688/+37
|/ / / /
* | | | Merge branch 'master' into developBrendan Abolivier2019-08-174-13/+39
|\ \ \ \
| * | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-171-1/+1
| * | | | Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-172-11/+37
| * | | | Fix issue with Synapse not starting up. Fixes #5866.Chris Moos2019-08-161-1/+1
* | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-162-1/+19
|\ \ \ \ \
| * | | | | update set_e2e_room_key to agree with fixed indexHubert Chathi2019-08-141-1/+1
| * | | | | add the version field to the index for e2e_room_keysHubert Chathi2019-08-141-0/+18
* | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-163-16/+24
* | | | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-152-10/+10
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' into developBrendan Abolivier2019-08-152-3/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-151-1/+1
| * | | | Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
| | |_|/ | |/| |
* | | | Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-151-1/+13
| |_|/ |/| |
* | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-142-25/+65
|\ \ \ | |/ / |/| |
| * | Retry well-known lookup before expiry.Erik Johnston2019-08-132-25/+65
* | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-131-1/+1
* | | fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
* | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-133-21/+54
|\ \ \ | |/ / |/| |
| * | Remove redundant returnErik Johnston2019-08-131-1/+0
| * | Clarify docstringErik Johnston2019-08-131-1/+1
| * | Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
* | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-136-91/+172
* | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-132-149/+200
|\ \ \
| * | | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| * | | Move well known lookup into a separate clasErik Johnston2019-08-072-153/+197
| * | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-061-0/+4
| | |/ | |/|
* | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-131-128/+142
|\ \ \
| * | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
* | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-121-101/+112
|\ \ \ \ | |_|/ / |/| | |
| * | | Handle loops in redaction eventsRichard van der Hoff2019-07-301-60/+36
| * | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| * | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| * | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
* | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-061-6/+37
|\ \ \ \
| * | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | |/ / | |/| |
* / | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
|/ / /
* | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-015-11/+71
|\ \ \
| * | | LintBrendan Abolivier2019-08-012-16/+9
| * | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
* | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-011-4/+3
|\ \ \ \
| * | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
* | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-011-21/+21
* | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-011-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-011-2/+9
|\ \ \ \
| * | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
* | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-011-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix spelling.Erik Johnston2019-08-011-1/+3
| |/ / /
| * | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
* | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-011-1/+3
|\ \ \ \
| * | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| |/ / /
* | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-012-32/+60
|\ \ \ \
| * | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| * | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
* | | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| |/ / / |/| | |
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-311-1/+2
* | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
* | | | Share SSL options for well-known requestsErik Johnston2019-07-312-11/+13
* | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| |/ / |/| |
* | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
* | | Unwrap errorErik Johnston2019-07-301-1/+2
* | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
* | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-303-30/+6
| |/ |/|
* | Room Complexity Client Implementation (#5783)Amber Brown2019-07-305-11/+206
|/
* Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-291-0/+6
|\
| * Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
* | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-292-35/+123
|\ \
| * | Expand commentErik Johnston2019-07-291-0/+5
| * | Remove lost commentErik Johnston2019-07-291-7/+0
| |/
| * Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| * Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| * Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
* | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-291-2/+2
|\ \
| * | Fix current_state bg update to work on old SQLiteErik Johnston2019-07-291-2/+2
* | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-302-2/+2
* | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-292-74/+136
|/ /
* | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
* | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
* | Merge branch 'master' into developRichard van der Hoff2019-07-262-1/+5
|\ \
| * | 1.2.1Richard van der Hoff2019-07-261-1/+1
| * | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-262-4/+37
| |\ \
| * | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| * | | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
* | | | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-262-4/+37
|\ \ \ \ | | |/ / | |/| |
| * | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-262-4/+37
* | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-251-0/+27
|\ \ \ \ | | |/ / | |/| |
| * | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-251-0/+27
* | | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-251-32/+42
* | | | Merge branch 'master' into developAndrew Morgan2019-07-251-1/+1
|\| | |
| * | | 1.2.0 v1.2.0 github/release-v1.2.0 release-v1.2.0Andrew Morgan2019-07-251-1/+1
| |/ /
* | | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-248-26/+75
|\| |
| * | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-241-1/+1
| * | Fix servlet metric names (#5734)Jorik Schellekens2019-07-247-25/+74
* | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-241-13/+22
|\ \ \
| * | | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
* | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-243-11/+22
* | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-242-2/+33
* | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-232-4/+29
* | | | Replace returnValue with return (#5736)Amber Brown2019-07-23162-1488/+1333
| |_|/ |/| |
* | | Opentracing Utils (#5722)Jorik Schellekens2019-07-232-101/+356
* | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-2313-11/+59
|\ \ \ | |/ / |/| |
| * | Call startup commands as system triggers.Erik Johnston2019-07-2211-11/+29
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-22 20:49:38 +0000