summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
| * | | Add process hooks to tell systemd our state.Erik Johnston2019-07-222-0/+30
* | | | Speed up current state background update.Erik Johnston2019-07-231-18/+30
* | | | Fix logging in workers (#5729)Amber Brown2019-07-221-0/+1
* | | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-221-2/+21
|\ \ \ \
| * | | | Cache get_version_string.Erik Johnston2019-07-221-2/+21
| |/ / /
* | | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-221-3/+3
|\ \ \ \
| * | | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-221-3/+3
| |/ / /
* | | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-221-51/+41
|\ \ \ \
| * | | | Add a delay to key lookup lock release to fix stack overflowRichard van der Hoff2019-07-191-2/+8
| * | | | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-191-51/+35
* | | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-221-1/+1
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | 1.2.0rc1Andrew Morgan2019-07-221-1/+1
* | | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-222-12/+127
|\| | | | |_|/ |/| |
| * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-222-12/+127
* | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertErik Johnston2019-07-191-0/+20
|\ \ \
| * | | Use upsert when updating destination retry intervalErik Johnston2019-07-191-0/+20
| | |/ | |/|
* | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateErik Johnston2019-07-191-2/+6
|\ \ \
| * | | Delegate to cached version when using get_filtered_current_state_idsErik Johnston2019-07-181-2/+6
* | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateErik Johnston2019-07-197-41/+194
|\ \ \ \
| * | | | LoggingTransaction accepts None for callback lists.Erik Johnston2019-07-193-6/+16
| * | | | Update comment for new columnErik Johnston2019-07-191-0/+3
| * | | | Use the current_state_events.membership columnErik Johnston2019-07-181-17/+37
| * | | | Track if current_state_events.membership is up to dateErik Johnston2019-07-181-0/+45
| * | | | Add background update for current_state_events.membership columnErik Johnston2019-07-182-0/+54
| * | | | Add membership column to current_state_events table.Erik Johnston2019-07-185-20/+41
* | | | | Don't accept opentracing data from clients. (#5715)Jorik Schellekens2019-07-191-2/+1
* | | | | Add 'rel' attribute to default welcome page. (#5695)Neil Johnson2019-07-191-2/+2
| |_|/ / |/| | |
* | | | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-192-75/+12
| |_|/ |/| |
* | | enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
| |/ |/|
* | Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-183-48/+61
* | Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-1816-47/+288
* | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-183-36/+66
* | Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-181-242/+188
* | Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-173-24/+36
* | More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-171-27/+37
* | Fix redaction authentication (#5700)Richard van der Hoff2019-07-171-85/+129
* | Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-171-48/+74
|/
* Remove pointless descriptionErik Johnston2019-07-161-1/+0
* Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
* Fix typo in synapse/app/admin_cmd.pyErik Johnston2019-07-161-1/+1
* Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
* s/exfiltrate_user_data/export_user_data/Erik Johnston2019-07-151-1/+1
* Add FileExfiltrationWriterErik Johnston2019-07-151-1/+69
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15111-1621/+2238
|\
| * Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-152-0/+25
| * Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-153-6/+211
| |\
| | * Fixup docstringsErik Johnston2019-07-121-7/+5
| | * pep8Erik Johnston2019-07-051-4/+0
| | * Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-0584-1027/+1237
| | |\
| | * | Assume key existence. Update docstringsErik Johnston2019-07-052-9/+11
| | * | Fixup from review comments.Erik Johnston2019-07-041-17/+22
| | * | Apply comment fixups from code reviewErik Johnston2019-07-031-6/+6
| * | | Implement access token expiry (#5660)Richard van der Hoff2019-07-127-20/+105
| * | | fix typo: backgroud -> backgroundAndrew Morgan2019-07-122-5/+5
| * | | small typo fix (#5655)Andrew Morgan2019-07-111-1/+1
| * | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-114-93/+86
| * | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-1110-12/+615
| * | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-111-7/+3
| * | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-101-1/+1
| |\ \ \
| | * | | TypoBrendan Abolivier2019-07-101-1/+1
| | * | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-101-1/+1
| * | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-102-21/+5
| |/ / /
| * | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
| * | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-091-4/+18
| |\ \ \
| | * \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08105-1513/+1630
| | |\ \ \
| | * | | | LintBrendan Abolivier2019-07-081-1/+2
| | * | | | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
| * | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-091-4/+1
| * | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-092-4/+6
| * | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-091-0/+4
| |\ \ \ \ \
| | * | | | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | | |/ / / | | |/| | |
| * | | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-086-56/+15
| * | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-081-0/+7
| |/ / / /
| * | | | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-081-8/+56
| * | | | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
| * | | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-081-51/+0
| * | | | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-051-0/+13
| * | | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-051-1/+5
| * | | | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-056-196/+2
| | |_|/ | |/| |
| * | | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-053-69/+0
| * | | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-052-10/+10
| * | | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-051-11/+8
| * | | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-053-5/+61
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-041-1/+1
| |\ \ \
| | * | | 1.1.0Erik Johnston2019-07-041-1/+1
| * | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0471-141/+153
| * | | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-032-31/+43
| |/ / /
| * | | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-031-1/+1
| * | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-034-6/+34
| * | | Fix media repo breaking (#5593)Amber Brown2019-07-023-12/+24
| * | | prepare v1.1.0rc1Richard van der Hoff2019-07-021-1/+1
| * | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-025-44/+209
| |\ \ \
| | * \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0122-205/+303
| | |\ \ \
| | * | | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | * | | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | * | | | cleanupsRichard van der Hoff2019-06-273-11/+18
| | * | | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| | * | | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| | * | | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| | * | | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26304-9516/+9216
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-114-2/+7
| | |\ \ \ \ \
| | * | | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| | * | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1085-861/+4648
| | |\ \ \ \ \ \
| | * | | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
| * | | | | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
* | | | | | | | | Use set_defaults(func=) styleErik Johnston2019-07-151-11/+8
* | | | | | | | | Move creation of ArgumentParser to callerErik Johnston2019-07-152-11/+8
* | | | | | | | | Fix up commentsErik Johnston2019-07-152-3/+3
* | | | | | | | | Change add_arguments to be a static methodErik Johnston2019-07-155-5/+39
* | | | | | | | | Add basic admin cmd appErik Johnston2019-07-023-6/+257
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Add basic function to get all data for a user out of synapseErik Johnston2019-07-022-0/+267
|/ / / / / / /
* | | | | | | fix async/await consentresource (#5585)Amber Brown2019-07-011-1/+3
* | | | | | | Merge pull request #5507 from matrix-org/erikj/presence_sync_tighloopErik Johnston2019-07-011-2/+19
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fixup commentErik Johnston2019-07-011-6/+13
| * | | | | | Fix sync tightloop bug.Erik Johnston2019-06-211-2/+12
* | | | | | | Make the http server handle coroutine-making REST servlets (#5475)Amber Brown2019-06-299-156/+114
* | | | | | | Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimitBrendan Abolivier2019-06-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Only ratelimit when sending the emailBrendan Abolivier2019-06-281-1/+2
| * | | | | | | Don't update the ratelimiter before sending a 3PID inviteBrendan Abolivier2019-06-281-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Don't log GC 0s at INFO (#5557)Amber Brown2019-06-281-1/+4
* | | | | | | Update the TLS cipher string and provide configurability for TLS on outgoing ...Amber Brown2019-06-282-7/+64
* | | | | | | Added possibilty to disable local password authentication (#5092)Daniel Hoffend2019-06-273-1/+11
* | | | | | | Make it clearer that the template dir is relative to synapse's root dir (#5543)Andrew Morgan2019-06-271-1/+9
* | | | | | | Merge pull request #5559 from matrix-org/erikj/refactor_changed_devicesErik Johnston2019-06-273-37/+97
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Review commentsErik Johnston2019-06-272-7/+5
| * | | | | | Refactor and comment sync device list codeErik Johnston2019-06-261-17/+53
| * | | | | | Use batch_iter and correct docstringErik Johnston2019-06-261-15/+12
| * | | | | | Rename get_users_whose_devices_changedErik Johnston2019-06-263-5/+5
| * | | | | | Refactor get_user_ids_changed to pull less from DBErik Johnston2019-06-263-28/+57
| | |_|_|_|/ | |/| | | |
* / | | | | Fix JWT login (#5555)PauRE2019-06-272-1/+2
|/ / / / /
* | | | | Prevent multiple upgrades on the same room at once (#5051)Andrew Morgan2019-06-252-52/+90
* | | | | Merge pull request #5524 from matrix-org/rav/new_cmdline_optionsRichard van der Hoff2019-06-242-5/+41
|\ \ \ \ \
| * | | | | Add "--open-private-ports" cmdline optionRichard van der Hoff2019-06-242-5/+26
| * | | | | Add --data-directory commandline argumentRichard van der Hoff2019-06-241-0/+15
* | | | | | Merge pull request #5523 from matrix-org/rav/arg_defaultsRichard van der Hoff2019-06-2429-107/+87
|\| | | | |
| * | | | | Don't load the generated config as the default.Richard van der Hoff2019-06-2429-94/+60
| * | | | | Ensure that all config options have sensible defaultsRichard van der Hoff2019-06-244-13/+27
* | | | | | Merge pull request #5499 from matrix-org/rav/cleanup_metricsRichard van der Hoff2019-06-242-29/+52
|\ \ \ \ \ \
| * | | | | | blackRichard van der Hoff2019-06-241-6/+2
| * | | | | | Avoid raising exceptions in metricsRichard van der Hoff2019-06-241-8/+14
| * | | | | | Merge branch 'develop' into rav/cleanup_metricsRichard van der Hoff2019-06-24291-9106/+8018
| |\ \ \ \ \ \
| * | | | | | | Sanity-checking for metrics updatesRichard van der Hoff2019-06-191-7/+33
| * | | | | | | Simplify PerformanceCounters.update interfaceRichard van der Hoff2019-06-191-11/+12
| * | | | | | | Remove unused _get_event_countersRichard van der Hoff2019-06-191-7/+1
* | | | | | | | Merge pull request #5534 from matrix-org/babolivier/federation-publicroomsBrendan Abolivier2019-06-243-15/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-243-15/+39
* | | | | | | | | Merge pull request #5531 from matrix-org/erikj/workers_pagination_tokenErik Johnston2019-06-242-17/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix /messages on workers when no from param specified.Erik Johnston2019-06-242-17/+19
* | | | | | | | | Remove unused Config.config_dir_path attributeRichard van der Hoff2019-06-241-3/+0
* | | | | | | | | Allow configuration of the path used for ACME account keys.Richard van der Hoff2019-06-243-7/+52
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Pass config_dir_path and data_dir_path into Config.read_config. (#5522)Richard van der Hoff2019-06-2430-63/+99
* | | | | | | | Factor acme bits out to a separate file (#5521)Richard van der Hoff2019-06-242-53/+93
|/ / / / / / /
* | | | | | | Merge pull request #5498 from matrix-org/rav/fix_clock_reversalRichard van der Hoff2019-06-241-6/+14
|\ \ \ \ \ \ \
| * | | | | | | Use monotonic clock where possible for metricsRichard van der Hoff2019-06-191-6/+14
* | | | | | | | Drop support for cpu_affinity (#5525)Richard van der Hoff2019-06-224-51/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Improve help and cmdline option names for --generate-config options (#5512)Richard van der Hoff2019-06-211-22/+28
* | | | | | | Refactor Config parser and add some comments. (#5511)Richard van der Hoff2019-06-211-14/+35
* | | | | | | Improve logging when generating config files (#5510)Richard van der Hoff2019-06-213-1/+7
* | | | | | | Only import jinja2 when needed (#5514)Andrew Morgan2019-06-211-1/+2
* | | | | | | Fix "Unexpected entry in 'full_schemas'" log warning (#5509)Richard van der Hoff2019-06-211-1/+1
* | | | | | | Fix logging error when a tampered event is detected. (#5500)Richard van der Hoff2019-06-211-1/+0
* | | | | | | Fix /messages on worker when no token suppliedErik Johnston2019-06-211-0/+2
* | | | | | | Support pagination API in client_reader workerErik Johnston2019-06-211-0/+2
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #5476 from matrix-org/erikj/histogram_extremitiesErik Johnston2019-06-212-1/+36
|\ \ \ \ \ \
| * | | | | | BlackErik Johnston2019-06-201-2/+2
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/histogram_...Erik Johnston2019-06-20292-9079/+7986
| |\ \ \ \ \ \
| * | | | | | | Add descriptions and remove redundant set(..)Erik Johnston2019-06-192-4/+7
| * | | | | | | Only count non-cache state resolutionErik Johnston2019-06-181-3/+3
| * | | | | | | Use consistent bucketsErik Johnston2019-06-181-1/+1
| * | | | | | | Add metric fo number of state groups in resolutionErik Johnston2019-06-171-0/+10
| * | | | | | | Add metrics for len of new extremities persisted.Erik Johnston2019-06-171-1/+23
* | | | | | | | Improve email notification logging (#5502)Neil Johnson2019-06-201-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Run Black. (#5482)Amber Brown2019-06-20291-9076/+7753
* | | | | | | Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_errorErik Johnston2019-06-191-9/+19
|\ \ \ \ \ \ \
| * | | | | | | Fix loglineErik Johnston2019-06-181-1/+1
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_mi...Erik Johnston2019-06-18171-2326/+11195
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Handle the case of `get_missing_events` failingErik Johnston2019-04-101-9/+20
* | | | | | | | Merge pull request #5480 from matrix-org/erikj/extremities_dummy_eventsErik Johnston2019-06-195-1/+124
|\ \ \ \ \ \ \ \
| * | | | | | | | Run as background process and fix commentsErik Johnston2019-06-192-3/+6
| * | | | | | | | Add experimental option to reduce extremities.Erik Johnston2019-06-185-1/+121
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Fix typo in deactivation background jobBrendan Abolivier2019-06-191-1/+1
* | | | | | | | Add some logging to 3pid invite sig verification (#5015)David Baker2019-06-181-8/+38
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #5477 from matrix-org/babolivier/third_party_rules_3pidBrendan Abolivier2019-06-172-1/+42
|\ \ \ \ \ \ \
| * | | | | | | Make check_threepid_can_be_invited asyncBrendan Abolivier2019-06-171-0/+1
| * | | | | | | Add third party rules hook for 3PID invitesBrendan Abolivier2019-06-172-1/+41
* | | | | | | | Merge pull request #5479 from matrix-org/erikj/add_create_room_hook_developErik Johnston2019-06-172-4/+48
|\| | | | | | |
| * | | | | | | Add third party rules hook into create roomErik Johnston2019-06-172-4/+48
| |/ / / / / /
* / / / / / / Remove Postgres 9.4 support (#5448)Amber Brown2019-06-182-24/+6
|/ / / / / /
* | | | | | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptionsErik Johnston2019-06-174-19/+28
|\ \ \ \ \ \
| * | | | | | Handle failing to talk to master over replicationErik Johnston2019-06-071-1/+9
| * | | | | | Handle HttpResponseException when using federation client.Erik Johnston2019-06-073-18/+19
* | | | | | | Merge pull request #5388 from matrix-org/erikj/fix_email_pushErik Johnston2019-06-173-7/+53
|\ \ \ \ \ \ \
| * | | | | | | Add testErik Johnston2019-06-072-7/+42
| * | | | | | | Fix email notifications for large unnamed rooms.Erik Johnston2019-06-071-0/+11
| |/ / / / / /
* | | | | | | Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_masterErik Johnston2019-06-171-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Only start background group attestation renewals on masterErik Johnston2019-06-071-3/+4
* | | | | | | | Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_stateErik Johnston2019-06-171-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 3PID invite room state over federation.Erik Johnston2019-06-141-6/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #5440 from matrix-org/babolivier/third_party_event_rulesBrendan Abolivier2019-06-146-4/+191
|\ \ \ \ \ \ \ \
| * | | | | | | | Add plugin APIs for implementations of custom event rules.Brendan Abolivier2019-06-146-4/+191
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitiveErik Johnston2019-06-142-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Prometheus histograms are cumalativeErik Johnston2019-06-142-2/+2
* | | | | | | | | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_jobBrendan Abolivier2019-06-141-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix background job for deactivated flagBrendan Abolivier2019-06-141-2/+4
* | | | | | | | | | Merge pull request #5462 from matrix-org/babolivier/account_validity_deactiva...Brendan Abolivier2019-06-144-2/+25
|\| | | | | | | | |
| * | | | | | | | | Don't send renewal emails to deactivated usersBrendan Abolivier2019-06-144-2/+25
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_fileErik Johnston2019-06-142-6/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Don't log exception when failing to fetch remote content.Erik Johnston2019-06-072-6/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Track deactivated accounts in the database (#5378)Brendan Abolivier2019-06-143-0/+137
* | | | | | | | fix prometheus rendering errorAmber H. Brown2019-06-141-1/+1
* | | | | | | | Clean up code for sending federation EDUs. (#5381)Richard van der Hoff2019-06-131-14/+26
* | | | | | | | Expose statistics on extrems to prometheus (#5384)Amber Brown2019-06-132-33/+123
* | | | | | | | Remove Python 2.7 support. (#5425)Amber Brown2019-06-122-2/+9
* | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-116-9/+9
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 1.0.0 v1.0.0Erik Johnston2019-06-111-1/+1
| * | | | | | | Bump bleach version so that tests can run on old deps.Erik Johnston2019-06-111-1/+1
| * | | | | | | Change password reset links to /_matrix.Erik Johnston2019-06-114-7/+7
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-114-2/+7
|\| | | | | |
| * | | | | | 1.0.0rc3 v1.0.0rc3Erik Johnston2019-06-111-1/+1
| * | | | | | Fix defaults on checking threepidsErik Johnston2019-06-102-1/+2
| * | | | | | Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zeroErik Johnston2019-06-101-0/+4
| |\ \ \ \ \ \
| | * | | | | | Fix bug sending federation transactions with lots of EDUsErik Johnston2019-06-101-0/+4
* | | | | | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-112-10/+20
* | | | | | | | add monthly active users to phonehome stats (#5252)Neil Johnson2019-06-102-15/+30
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into developErik Johnston2019-06-105-87/+134
|\| | | | | |