| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Missing staticmethod | Erik Johnston | 2018-01-18 | 1 | -0/+1 |
| | | |||||
| * | Fixup comments | Erik Johnston | 2018-01-18 | 2 | -3/+7 |
| | | |||||
| * | Make storage providers more configurable | Erik Johnston | 2018-01-18 | 3 | -31/+98 |
| | | |||||
| * | Merge pull request #2789 from matrix-org/erikj/fix_thumbnails | Erik Johnston | 2018-01-17 | 3 | -24/+68 |
| |\ | | | | | Fix thumbnailing remote files | ||||
| | * | Add docstring | Erik Johnston | 2018-01-17 | 1 | -1/+1 |
| | | | |||||
| | * | Use local vars | Erik Johnston | 2018-01-16 | 1 | -6/+2 |
| | | | |||||
| | * | Change _generate_thumbnails to take media_type | Erik Johnston | 2018-01-16 | 2 | -7/+10 |
| | | | |||||
| | * | Move setting of file_id up to caller | Erik Johnston | 2018-01-16 | 2 | -13/+14 |
| | | | |||||
| | * | Fix typo | Erik Johnston | 2018-01-16 | 1 | -7/+10 |
| | | | |||||
| | * | Fix up log lines | Erik Johnston | 2018-01-16 | 2 | -7/+10 |
| | | | |||||
| | * | Correctly use server_name/file_id when generating/fetching remote thumbnails | Erik Johnston | 2018-01-16 | 2 | -5/+8 |
| | | | |||||
| | * | Log when we respond with 404 | Erik Johnston | 2018-01-16 | 2 | -1/+8 |
| | | | |||||
| | * | Fix thumbnailing remote files | Erik Johnston | 2018-01-16 | 2 | -2/+30 |
| | | | |||||
| * | | fix typo | Matthew Hodgson | 2018-01-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2785 from matrix-org/rav/reorganise_metrics_again | Richard van der Hoff | 2018-01-16 | 5 | -47/+209 |
| |\ \ | | | | | | | Reorganise request and block metrics | ||||
| | * | | document metrics changes | Richard van der Hoff | 2018-01-16 | 2 | -8/+58 |
| | | | | |||||
| | * | | Reorganise request and block metrics | Richard van der Hoff | 2018-01-15 | 2 | -25/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to circumvent the number of duplicate foo:count metrics increasing without bounds, it's time for a rearrangement. The following are all deprecated, and replaced with synapse_util_metrics_block_count: synapse_util_metrics_block_timer:count synapse_util_metrics_block_ru_utime:count synapse_util_metrics_block_ru_stime:count synapse_util_metrics_block_db_txn_count:count synapse_util_metrics_block_db_txn_duration:count The following are all deprecated, and replaced with synapse_http_server_response_count: synapse_http_server_requests synapse_http_server_response_time:count synapse_http_server_response_ru_utime:count synapse_http_server_response_ru_stime:count synapse_http_server_response_db_txn_count:count synapse_http_server_response_db_txn_duration:count The following are renamed (the old metrics are kept for now, but deprecated): synapse_util_metrics_block_timer:total -> synapse_util_metrics_block_time_seconds synapse_util_metrics_block_ru_utime:total -> synapse_util_metrics_block_ru_utime_seconds synapse_util_metrics_block_ru_stime:total -> synapse_util_metrics_block_ru_stime_seconds synapse_util_metrics_block_db_txn_count:total -> synapse_util_metrics_block_db_txn_count synapse_util_metrics_block_db_txn_duration:total -> synapse_util_metrics_block_db_txn_duration_seconds synapse_http_server_response_time:total -> synapse_http_server_response_time_seconds synapse_http_server_response_ru_utime:total -> synapse_http_server_response_ru_utime_seconds synapse_http_server_response_ru_stime:total -> synapse_http_server_response_ru_stime_seconds synapse_http_server_response_db_txn_count:total -> synapse_http_server_response_db_txn_count synapse_http_server_response_db_txn_duration:total synapse_http_server_response_db_txn_duration_seconds | ||||
| | * | | mechanism to render metrics with alternative names | Richard van der Hoff | 2018-01-15 | 1 | -13/+40 |
| | | | | |||||
| | * | | Add some comments to metrics classes | Richard van der Hoff | 2018-01-15 | 1 | -1/+27 |
| | | | | |||||
| * | | | Merge pull request #2790 from matrix-org/rav/preserve_event_logcontext_leak | Richard van der Hoff | 2018-01-16 | 1 | -1/+8 |
| |\ \ \ | | | | | | | | | Fix a logcontext leak in persist_events | ||||
| | * | | | Fix a logcontext leak in persist_events | Richard van der Hoff | 2018-01-16 | 1 | -1/+8 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObserveableDeferred expects its callbacks to be called without any logcontexts, whereas it turns out we were calling them with the logcontext of the request which initiated the persistence loop. It seems wrong that we are attributing work done in the persistence loop to the request that happened to initiate it, so let's solve this by dropping the logcontext for it. (I'm not sure this actually causes any real problems other than messages in the debug log, but let's clean it up anyway) | ||||
| * | | | Merge pull request #2787 from matrix-org/rav/worker_event_counts | Richard van der Hoff | 2018-01-16 | 2 | -0/+11 |
| |\ \ \ | | | | | | | | | Metrics for events processed in appservice and fed sender | ||||
| | * | | | Metrics for events processed in appservice and fed sender | Richard van der Hoff | 2018-01-15 | 2 | -0/+11 |
| | |/ / | | | | | | | | | | More metrics I wished I'd had | ||||
| * | | | Merge pull request #2786 from matrix-org/rav/rdata_metrics | Richard van der Hoff | 2018-01-16 | 1 | -5/+14 |
| |\ \ \ | |_|/ |/| | | Metrics for number of RDATA commands received | ||||
| | * | | Metrics for number of RDATA commands received | Richard van der Hoff | 2018-01-15 | 1 | -5/+14 |
| | |/ | | | | | | | I found myself wishing we had this. | ||||
| * | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-01-16 | 7 | -346/+843 |
| |\ \ | |/ |/| | Refactor MediaRepository to separate out storage | ||||
| | * | Fix up comments | Erik Johnston | 2018-01-12 | 2 | -7/+16 |
| | | | |||||
| | * | Correctly reraise exception | Erik Johnston | 2018-01-12 | 1 | -2/+4 |
| | | | |||||
| | * | Make Responder a context manager | Erik Johnston | 2018-01-12 | 2 | -9/+10 |
| | | | |||||
| | * | Add missing class var | Erik Johnston | 2018-01-12 | 1 | -0/+3 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2018-01-12 | 9 | -28/+116 |
| | |\ | | | | | | | | | | erikj/media_storage_refactor | ||||
| | * | | Remove unnecessary condition | Erik Johnston | 2018-01-12 | 1 | -4/+1 |
| | | | | |||||
| | * | | Remove unused variables | Erik Johnston | 2018-01-12 | 1 | -3/+0 |
| | | | | |||||
| | * | | Make class var local | Erik Johnston | 2018-01-12 | 1 | -3/+3 |
| | | | | |||||
| | * | | Comments | Erik Johnston | 2018-01-12 | 3 | -15/+65 |
| | | | | |||||
| | * | | Add StorageProvider concept | Erik Johnston | 2018-01-09 | 3 | -9/+162 |
| | | | | |||||
| | * | | Make PreviewUrlResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -8/+14 |
| | | | | |||||
| | * | | Make ThumbnailResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -48/+68 |
| | | | | |||||
| | * | | Use MediaStorage for remote media | Erik Johnston | 2018-01-09 | 2 | -136/+156 |
| | | | | |||||
| | * | | Use MediaStorage for local files | Erik Johnston | 2018-01-09 | 2 | -119/+73 |
| | | | | |||||
| | * | | Add MediaStorage class | Erik Johnston | 2018-01-09 | 1 | -0/+198 |
| | | | | |||||
| | * | | Add some helper classes | Erik Johnston | 2018-01-09 | 1 | -0/+73 |
| | | | | |||||
| | * | | Split out add_file_headers | Erik Johnston | 2018-01-09 | 1 | -28/+42 |
| | | | | |||||
| * | | | Merge pull request #2778 from matrix-org/rav/counters_should_be_floats | Richard van der Hoff | 2018-01-15 | 1 | -3/+10 |
| |\ \ \ | | | | | | | | | Make Counter render floats | ||||
| | * | | | Make Counter render floats | Richard van der Hoff | 2018-01-12 | 1 | -3/+10 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | Prometheus handles all metrics as floats, and sometimes we store non-integer values in them (notably, durations in seconds), so let's render them as floats too. (Note that the standard client libraries also treat Counters as floats.) | ||||
| * | | | Merge pull request #2777 from matrix-org/rav/fix_remote_thumbnails | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 |
| |\ \ \ | | | | | | | | | Reinstate media download on thumbnail request | ||||
| | * | | | Reinstate media download on thumbnail request | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 |
| |/ / / | | | | | | | | | | | | | We need to actually download the remote media when we get a request for a thumbnail. | ||||
| * | | | Merge pull request #2774 from matrix-org/erikj/synctl | Erik Johnston | 2018-01-12 | 3 | -5/+38 |
| |\ \ \ | |_|/ |/| | | When using synctl with workers, don't start the main synapse automatically | ||||
| | * | | Actually make it work | Erik Johnston | 2018-01-12 | 2 | -2/+15 |
| | | | | |||||
| | * | | Refactor | Erik Johnston | 2018-01-12 | 1 | -9/+4 |
| | | | | |||||
| | * | | When using synctl with workers, don't start the main synapse automatically | Erik Johnston | 2018-01-11 | 2 | -8/+33 |
| | | | | |||||
| * | | | Merge pull request #2766 from matrix-org/rav/room_event | Richard van der Hoff | 2018-01-11 | 1 | -3/+26 |
| |\ \ \ | |/ / |/| | | Add /room/{id}/event/{id} to synapse | ||||
| | * | | Add /room/{id}/event/{id} to synapse | Richard van der Hoff | 2018-01-09 | 1 | -3/+26 |
| | | | | | | | | | | | | | | | | | | | Turns out that there is a valid usecase for retrieving event by id (notably having received a push), but event ids should be scoped to room, so /event/{id} is wrong. | ||||
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-01-11 | 3 | -1/+49 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0 | Erik Johnston | 2018-01-05 | 77 | -826/+1829 |
| | |\ \ \ | |||||
| | | * | | | Bump version and changelog github/release-v0.26.0 release-v0.26.0 | Erik Johnston | 2018-01-05 | 2 | -1/+7 |
| | | | | | | |||||
| | | * | | | Fix rc version number v0.26.0-rc1 | Erik Johnston | 2017-12-13 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Bump changelog and version | Erik Johnston | 2017-12-13 | 2 | -1/+38 |
| | | | | | | |||||
| | * | | | | Merge pull request #2737 from Valodim/master | Matthew Hodgson | 2017-12-17 | 1 | -0/+5 |
| | |\ \ \ \ | | | | | | | | | | | | | mention federation tester more prominently in the readme | ||||
| | | * | | | | mention federation tester more prominently in the readme | Vincent Breitmoser | 2017-12-16 | 1 | -0/+5 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #2773 from matrix-org/erikj/hash_bg | Erik Johnston | 2018-01-10 | 3 | -10/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | Do bcrypt hashing in a background thread | ||||
| | * | | | | | Do bcrypt hashing in a background thread | Erik Johnston | 2018-01-10 | 3 | -10/+18 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2772 from matrix-org/t3chguy/patch-1 | Erik Johnston | 2018-01-10 | 1 | -3/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix publicised groups GET API (singular) over federation | ||||
| | * | | | | | | fix order of operations derp and also use `.get` to default to {} | Michael Telatynski | 2018-01-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
| | * | | | | | | Fix publicised groups API (singular) over federation | Michael Telatynski | 2018-01-10 | 1 | -4/+4 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which was missing its fed client API, since there is no other API it might as well reuse the bulk one and unwrap it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> | ||||
| * | | | | | | Merge pull request #2770 from matrix-org/rav/fix_request_metrics | Richard van der Hoff | 2018-01-10 | 1 | -11/+19 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Update http request metrics before calling servlet | ||||
| | * | | | | | Update http request metrics before calling servlet | Richard van der Hoff | 2018-01-09 | 1 | -11/+19 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Make sure that we set the servlet name in the metrics object *before* calling the servlet, in case the servlet throws an exception. | ||||
| * | | | | | Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_code | Erik Johnston | 2018-01-09 | 2 | -78/+3 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Remove dead code related to default thumbnails | ||||
| | * | | | | Remove dead TODO | Erik Johnston | 2018-01-09 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Remove dead code related to default thumbnails | Erik Johnston | 2018-01-09 | 2 | -76/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #2765 from matrix-org/rav/fix_room_uts | Richard van der Hoff | 2018-01-09 | 3 | -4/+9 |
| |\ \ \ \ | | | | | | | | | | | Fix flaky test_rooms UTs | ||||
| | * | | | | enable twisted delayedcall debugging in UTs | Richard van der Hoff | 2018-01-09 | 1 | -1/+5 |
| | | | | | | |||||
| | * | | | | Remove dead code | Richard van der Hoff | 2018-01-09 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | pointless function is pointless | ||||
| | * | | | | Disable user_directory updates for UTs | Richard van der Hoff | 2018-01-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flakiness in the UTs caused by the user_directory being updated in the background | ||||
| * | | | | | Merge pull request #2763 from matrix-org/rav/fix_config_uts | Richard van der Hoff | 2018-01-09 | 2 | -3/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix broken config UTs | ||||
| | * | | | | | Fix broken config UTs | Richard van der Hoff | 2018-01-09 | 2 | -3/+18 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | https://github.com/matrix-org/synapse/pull/2755 broke log-config generation, which in turn broke the unit tests. | ||||
| * | | | | | Merge pull request #2762 from matrix-org/rav/fix_logconfig_indenting | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Make indentation of generated log config consistent | ||||
| | * | | | | Make indentation of generated log config consistent | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 |
| |/ / / / | | | | | | | | | | | | | (we had a mix of 2- and 4-space indents) | ||||
| * | | | | Merge pull request #2761 from turt2live/patch-1 | Erik Johnston | 2018-01-08 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix templating error with unban permission message | ||||
| | * | | | | Fix templating error with unban permission message | Travis Ralston | 2018-01-07 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2759 Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
| * | | | | Merge pull request #2755 from matrix-org/richvdh-patch-1 | Richard van der Hoff | 2018-01-05 | 1 | -8/+4 |
| |\ \ \ \ | | | | | | | | | | | Remove 'verbosity'/'log_file' from generated cfg | ||||
| | * | | | | Remove 'verbosity'/'log_file' from generated cfg | Richard van der Hoff | 2018-01-05 | 1 | -8/+4 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | ... because these only really exist to confuse people nowadays. Also bring log config more into line with the generated log config, by making `level_for_storage` apply to the `synapse.storage.SQL` logger rather than `synapse.storage`. | ||||
| * | | | | Merge pull request #2744 from matrix-org/rav/login_logging | Richard van der Hoff | 2018-01-05 | 1 | -4/+10 |
| |\ \ \ \ | | | | | | | | | | | Better logging when login can't find a 3pid | ||||
| | * | | | | Better logging when login can't find a 3pid | Richard van der Hoff | 2017-12-20 | 1 | -4/+10 |
| | | | | | | |||||
| * | | | | | Merge pull request #2745 from matrix-org/rav/assert_params | Richard van der Hoff | 2018-01-05 | 3 | -60/+68 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Check missing fields in event_from_pdu_json | ||||
| | * | | | | Check missing fields in event_from_pdu_json | Richard van der Hoff | 2017-12-30 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | Return a 400 rather than a 500 when somebody messes up their send_join | ||||
| | * | | | | Factor out `event_from_pdu_json` | Richard van der Hoff | 2017-12-30 | 3 | -37/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | turns out we have two copies of this, and neither needs to be an instance method | ||||
| | * | | | | federation_server: clean up imports | Richard van der Hoff | 2017-12-30 | 1 | -14/+11 |
| | | | | | | |||||
| | * | | | | federation_client: clean up imports | Richard van der Hoff | 2017-12-30 | 1 | -13/+10 |
| |/ / / / | |||||
| * | | | | Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo | Richard van der Hoff | 2017-12-18 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | synapse/config/password_auth_providers: Fixed bracket typo | ||||
| | * | | | | synapse/config/password_auth_providers: Fixed bracket typo | Richard von Seck | 2017-11-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard von Seck <richard.von-seck@gmx.net> | ||||
| * | | | | | Merge pull request #2435 from silkeh/listen-ipv6-default | Richard van der Hoff | 2017-12-18 | 12 | -231/+247 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Adapt the default config to bind on both IPv4 and IPv6 on all platforms | ||||
| | * | | | | Implement listen_tcp method in remaining workers | Silke | 2017-12-18 | 10 | -192/+155 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke <silke@slxh.eu> | ||||
| | * | | | | Remove logger argument and do not catch replication listener | Silke | 2017-12-18 | 2 | -24/+18 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Silke <silke@slxh.eu> | ||||
| | * | | | | Add methods for listening on multiple addresses | Silke Hofstra | 2017-12-17 | 2 | -51/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add listen_tcp and listen_ssl which implement Twisted's reactor.listenTCP and reactor.listenSSL for multiple addresses. Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
| | * | | | | Allow binds to both :: and 0.0.0.0 | Silke Hofstra | 2017-12-17 | 2 | -42/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed. This causes a warning explaining the behaviour. Configuration changed to match. See #2232 Signed-off-by: Silke Hofstra <silke@slxh.eu> | ||||
| | * | | | | Adapt the default config to bind on IPv6. | Willem Mulder | 2017-12-17 | 1 | -8/+9 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most deployments are on Linux (or Mac OS), so this would actually bind on both IPv4 and IPv6. Resolves #1886. Signed-off-by: Willem Mulder <willemmaster@hotmail.com> | ||||
| * | | | | Merge pull request #2717 from matrix-org/erikj/createroom_content | Erik Johnston | 2017-12-07 | 2 | -5/+9 |
| |\ \ \ \ | | | | | | | | | | | Fix wrong avatars when inviting multiple users when creating room | ||||
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-12-07 | 73 | -820/+1776 |
| | |\ \ \ \ | |/ / / / |/| | | | | | | | | | erikj/createroom_content | ||||
| * | | | | | Merge pull request #2723 from matrix-org/matthew/search-all-local-users | Matthew Hodgson | 2017-12-05 | 11 | -37/+234 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add all local users to the user_directory and optionally search them | ||||
| | * | | | | | fix StoreError syntax | Matthew Hodgson | 2017-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | speed up the rate of initial spam for users | Matthew Hodgson | 2017-12-04 | 1 | -11/+12 |
| | | | | | | | |||||
| | * | | | | | better doc | Matthew Hodgson | 2017-12-04 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | try make tests work a bit more... | Matthew Hodgson | 2017-12-04 | 1 | -0/+12 |
| | | | | | | | |||||
| | * | | | | | erik told me to | Matthew Hodgson | 2017-12-04 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix pep8 and tests | Matthew Hodgson | 2017-12-04 | 3 | -8/+6 |
| | | | | | | | |||||
| | * | | | | | switch to a simpler 'search_all_users' button as per review feedback | Matthew Hodgson | 2017-12-04 | 5 | -37/+30 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' into matthew/search-all-local-users | Matthew Hodgson | 2017-11-30 | 32 | -200/+633 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | | specify default user_directory_include_pattern | Matthew Hodgson | 2017-11-30 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | remove null constraint on user_dir.room_id | Matthew Hodgson | 2017-11-30 | 1 | -0/+35 |
| | | | | | | | |||||
| | * | | | | | fix alternation operator for FTS4 - how did this ever work!? | Matthew Hodgson | 2017-11-30 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix thinkos galore | Matthew Hodgson | 2017-11-30 | 3 | -20/+41 |
| | | | | | | | |||||
| | * | | | | | kick the user_directory index when new users register | Matthew Hodgson | 2017-11-29 | 1 | -0/+8 |
| | | | | | | | |||||
| | * | | | | | untested WIP but might actually work | Matthew Hodgson | 2017-11-29 | 6 | -20/+96 |
| | | | | | | | |||||
| | * | | | | | Add user_directory_include_pattern config param to expand search results to ↵ | Matthew Hodgson | 2017-11-29 | 5 | -9/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional users Initial commit; this doesn't work yet - the LIKE filtering seems too aggressive. It also needs _do_initial_spam to be aware of prepopulating the whole user_directory_search table with all users... ...and it needs a handle_user_signup() or something to be added so that new signups get incrementally added to the table too. Committing it here as a WIP | ||||
| * | | | | | | Fix error when deleting devices | Richard van der Hoff | 2017-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in d7ea8c4 / PR #2728 | ||||
| * | | | | | | Merge pull request #2729 from matrix-org/rav/custom_ui_auth | Richard van der Hoff | 2017-12-05 | 1 | -24/+57 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | support custom login types for validating users | ||||
| | * | | | | | | support custom login types for validating users | Richard van der Hoff | 2017-12-05 | 1 | -24/+57 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Wire the custom login type support from password providers into the UI-auth user-validation flows. | ||||
| * | | | | | | Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_auth | Richard van der Hoff | 2017-12-05 | 3 | -74/+102 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Factor out a validate_user_via_ui_auth method | ||||
| | * | | | | | | Factor out a validate_user_via_ui_auth method | Richard van der Hoff | 2017-12-05 | 3 | -74/+102 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Collect together all the places that validate a logged-in user via UI auth. | ||||
| * | | | | | | Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_return | Richard van der Hoff | 2017-12-05 | 7 | -48/+103 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor UI auth implementation | ||||
| | * | | | | | | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 7 | -48/+103 |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper. | ||||
| * | | | | | | Merge pull request #2716 from matrix-org/rav/federation_client_post | Richard van der Hoff | 2017-12-04 | 1 | -8/+34 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | federation_client script: Support for posting content | ||||
| | * | | | | | federation_client script: Support for posting content | Richard van der Hoff | 2017-11-28 | 1 | -8/+34 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve comments on get_user_by_access_token | ||||
| | * | | | | | | Improve comments on get_user_by_access_token | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | because I have to reverse-engineer this every time. | ||||
| * | | | | | | Merge pull request #2722 from matrix-org/rav/delete_device_on_logout | Richard van der Hoff | 2017-11-29 | 12 | -64/+226 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Delete devices and pushers on logouts etc | ||||
| | * | | | | | | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 5 | -5/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we delete devices whenever a user is logged out due to any of the following situations: * /logout * /logout_all * change password * deactivate account (by the user or by an admin) * invalidate access token from a dynamic module Fixes #2672. | ||||
| | * | | | | | | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 6 | -19/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-functional refactoring to move set_password. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop. | ||||
| | * | | | | | | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 6 | -22/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-functional refactoring to move deactivate_account. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop. | ||||
| | * | | | | | | Remove pushers when deleting access tokens | Richard van der Hoff | 2017-11-29 | 3 | -18/+32 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an access token is invalidated, we should remove the associated pushers. | ||||
| * | | | | | | Merge pull request #2718 from matrix-org/rav/notify_logcontexts | Richard van der Hoff | 2017-11-29 | 2 | -9/+18 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Clear logcontext before starting fed txn queue runner | ||||
| | * | | | | | | Clear logcontext before starting fed txn queue runner | Richard van der Hoff | 2017-11-28 | 2 | -9/+18 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | These processes take a long time compared to the request, so there is lots of "Entering|Restoring dead context" in the logs. Let's try to shut it up a bit. | ||||
| * | | | | | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashes | Richard van der Hoff | 2017-11-29 | 1 | -3/+10 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix 500 when joining matrix-dev | ||||
| | * | | | | | | Fix 500 when joining matrix-dev | Richard van der Hoff | 2017-11-29 | 1 | -3/+10 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-dev has an event (`$/6ANj/9QWQyd71N6DpRQPf+SDUu11+HVMeKSpMzBCwM:zemos.net`) which has no `hashes` member. Check for missing `hashes` element in events. | ||||
| * | | | | | | Merge pull request #2715 from matrix-org/luke/group-guest-access | Luke Barnard | 2017-11-28 | 1 | -11/+11 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Allow guest access to group APIs for reading | ||||
| | * | | | | | Allow guest access to group APIs for reading | Luke Barnard | 2017-11-28 | 1 | -11/+11 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error | Richard van der Hoff | 2017-11-27 | 6 | -17/+89 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix error on sqlite 3.7 | ||||
| | * | | | | | fix sql fails | Richard van der Hoff | 2017-11-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Check database in has_completed_background_updates | Richard van der Hoff | 2017-11-22 | 3 | -12/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | so that the right thing happens on workers. | ||||
| | * | | | | | Fix error on sqlite 3.7 | Richard van der Hoff | 2017-11-21 | 5 | -8/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the url_cache index on local_media_repository as a background update, so that we can detect whether we are on sqlite or not and create a partial or complete index accordingly. To avoid running the cleanup job before we have built the index, add a bailout which will defer the cleanup if the bg updates are still running. Fixes https://github.com/matrix-org/synapse/issues/2572. | ||||
| * | | | | | | Merge pull request #2713 from matrix-org/rav/no_upsert_forever | Richard van der Hoff | 2017-11-27 | 1 | -0/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Avoid retrying forever on IntegrityError | ||||
| | * | | | | | | Avoid retrying forever on IntegrityError | Richard van der Hoff | 2017-11-27 | 1 | -0/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2711 from matrix-org/rav/fix_dns_errhandler | Richard van der Hoff | 2017-11-27 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix error handling on dns lookup | ||||
| | * | | | | | | | Fix error handling on dns lookup | Richard van der Hoff | 2017-11-24 | 1 | -2/+4 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pass the right arguments to the errback handler Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)" | ||||
| * | | | | | | | Merge pull request #2710 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2017-11-27 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Tiny code cleanups | ||||
| | * | | | | | | | Add a comment which might save some confusion | Richard van der Hoff | 2017-11-24 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove dead sync_callback | Richard van der Hoff | 2017-11-24 | 1 | -2/+0 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | This is never used; let's remove it to stop confusing things. | ||||
| * | | | | | | | Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaks | Richard van der Hoff | 2017-11-27 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix some logcontext leaks in replication resource | ||||
| | * | | | | | | | Fix some logcontext leaks in replication resource | Richard van der Hoff | 2017-11-23 | 1 | -2/+4 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work. | ||||
| * | | | | | | | Merge pull request #2707 from matrix-org/rav/fix_urlpreview | Richard van der Hoff | 2017-11-27 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix OPTIONS on preview_url | ||||
| | * | | | | | | | Fix OPTIONS on preview_url | Richard van der Hoff | 2017-11-23 | 1 | -1/+5 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Fixes #2706 | ||||
| * | | | | | | | Merge pull request #2705 from matrix-org/rav/improve_tracebacks | Richard van der Hoff | 2017-11-27 | 1 | -3/+9 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Improve tracebacks on exceptions | ||||
| | * | | | | | | Improve tracebacks on exceptions | Richard van der Hoff | 2017-11-27 | 1 | -3/+9 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception. | ||||
| * | | | | | | Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all | Richard van der Hoff | 2017-11-22 | 6 | -13/+48 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Try to avoid having multiple PreviewUrlResource instances | ||||
| | * | | | | | | Add config option to disable media_repo on main synapse | Richard van der Hoff | 2017-11-22 | 4 | -9/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to stop us doing the cache cleanup jobs on the master. | ||||
| | * | | | | | | Build MediaRepositoryResource as a homeserver dependency | Richard van der Hoff | 2017-11-22 | 4 | -5/+19 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the scenario where we have four different PreviewUrlResources configured on a single app, each of which have their own caches and cache clearing jobs. | ||||
| * | | | | | | Merge pull request #2700 from matrix-org/rav/worker_docs | Richard van der Hoff | 2017-11-21 | 1 | -21/+133 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve documentation of workers Fixes https://github.com/matrix-org/synapse/issues/2554 | ||||
| | * | | | | | | Improve documentation of workers | Richard van der Hoff | 2017-11-21 | 1 | -21/+133 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2554 | ||||
| * | | | | | | Merge pull request #2698 from matrix-org/rav/remove_dead_dependencies | Richard van der Hoff | 2017-11-21 | 1 | -16/+15 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Clean up dependency list | ||||
| | * | | | | | | Clean up dependency list | Richard van der Hoff | 2017-11-21 | 1 | -16/+15 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | remove those that aren't used at all, and replace the ones that don't have builders with simple getters rather than dynamically-generated methods. | ||||
| * | | | | | | Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsert | Richard van der Hoff | 2017-11-21 | 1 | -36/+49 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Avoid locking account_data tables for upserts | ||||
| | * | | | | | Avoid locking account_data tables for upserts | Richard van der Hoff | 2017-11-16 | 1 | -36/+49 |
| | | | | | | | |||||
| * | | | | | | sanity checks | Matthew Hodgson | 2017-11-21 | 1 | -1/+4 |
| | |/ / / / |/| | | | | |||||
| * | | | | | don't double-invite in sync_room_to_group.pl | Matthew Hodgson | 2017-11-19 | 1 | -3/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #2688 from matrix-org/rav/unlock_more_upsert | Richard van der Hoff | 2017-11-17 | 2 | -5/+51 |
| |\ \ \ \ \ | | | | | | | | | | | | | Avoid locking for upsert on pushers tables | ||||
| | * | | | | | Avoid locking for upsert on pushers tables | Richard van der Hoff | 2017-11-16 | 2 | -5/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replace the upsert into deleted_pushers with an insert * no need to lock for upsert on pusher_throttle | ||||
| * | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2017-11-17 | 2 | -1/+9 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Merge pull request #2686 from matrix-org/luke/as-flair | Luke Barnard | 2017-11-17 | 4 | -1/+49 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add automagical AS Publicised Group(s) | ||||
| | * | | | | | | Add extra space before inline comment | Luke Barnard | 2017-11-16 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Extract group_id from the dict for multiple use | Luke Barnard | 2017-11-16 | 1 | -4/+5 |
| | | | | | | | | |||||
| | * | | | | | | Fix tests | Luke Barnard | 2017-11-16 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Remove unused GROUP_ID_REGEX | Luke Barnard | 2017-11-16 | 1 | -2/+0 |
| | | | | | | | | |||||
| | * | | | | | | Document get_groups_for_user | Luke Barnard | 2017-11-16 | 1 | -0/+6 |
| | | | | | | | | |||||
| | * | | | | | | Flake8 | Luke Barnard | 2017-11-16 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Use a generator instead of a list | Luke Barnard | 2017-11-16 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Make sure we check AS groups for lookup on bulk | Luke Barnard | 2017-11-16 | 1 | -0/+5 |
| | | | | | | | | |||||
| | * | | | | | | Check group_id belongs to this domain | Luke Barnard | 2017-11-16 | 2 | -3/+12 |
| | | | | | | | | |||||
| | * | | | | | | Add automagical AS Publicised Group(s) | Luke Barnard | 2017-11-16 | 2 | -0/+28 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via registration file "users" namespace: ```YAML ... namespaces: users: - exclusive: true regex: '.*luke.*' group_id: '+all_the_lukes:hsdomain' ... ``` This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API. | ||||
| * | | | | | | typo | Matthew Hodgson | 2017-11-17 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | quick and dirty room membership<->group membership sync script | Matthew Hodgson | 2017-11-17 | 1 | -0/+39 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | Fix auth handler #2678 | Jurek | 2017-11-16 | 1 | -1/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge pull request #2684 from matrix-org/rav/unlock_upsert | Richard van der Hoff | 2017-11-16 | 2 | -49/+74 |
| |\ \ \ \ | |/ / / |/| | | | Start work on avoiding table locks for upserts | ||||
| | * | | | Fix broken ref to IntegrityError | Richard van der Hoff | 2017-11-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Avoid locking `pushers` table on upsert | Richard van der Hoff | 2017-11-16 | 1 | -27/+28 |
| | | | | | | | | | | | | | | | | | | | | | Now that _simple_upsert will retry on IntegrityError, we don't need to lock the table. | ||||
| | * | | | _simple_upsert: retry on IntegrityError | Richard van der Hoff | 2017-11-16 | 1 | -6/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | wrap the call to _simple_upsert_txn in a loop so that we retry on an integrityerror: this means we can avoid locking the table provided there is an unique index. | ||||
| | * | | | Cleanup in _simple_upsert_txn | Richard van der Hoff | 2017-11-16 | 1 | -16/+17 |
| |/ / / | | | | | | | | | | Bail out early to reduce indentation | ||||
| * | | | Merge pull request #2661 from matrix-org/rav/statereadstore | Richard van der Hoff | 2017-11-15 | 3 | -249/+237 |
| |\ \ \ | | | | | | | | | Pull out bits of StateStore to a mixin | ||||
| | * | | | Pull out bits of StateStore to a mixin | Richard van der Hoff | 2017-11-14 | 2 | -237/+226 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so that we don't need to secretly gut-wrench it for use in the slaved stores. I haven't done the other stores yet, but we should. I'm tired of the workers breaking every time we tweak the stores because I forgot to gut-wrench the right method. fixes https://github.com/matrix-org/synapse/issues/2655. | ||||
| | * | | | Revert "Revert "move _state_group_cache to statestore"" | Richard van der Hoff | 2017-11-14 | 2 | -13/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to fix this properly on this branch, so that the _state_group_cache can end up in StateGroupReadStore. This reverts commit ab335edb023d66cd0be439e045b10ca104b73cb5. | ||||
| * | | | | Merge pull request #2677 from matrix-org/rav/spec_r0.3.0 | Richard van der Hoff | 2017-11-15 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Declare support for r0.3.0 | ||||
| | * | | | | Declare support for r0.3.0 | Richard van der Hoff | 2017-11-15 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-11-15 | 1 | -0/+8 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs | Richard van der Hoff | 2017-11-15 | 10 | -96/+23 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove preserve_context_over_{fn, deferred} | ||||
| | * | | | | | Remove __PreservingContextDeferred too | Richard van der Hoff | 2017-11-14 | 1 | -30/+0 |
| | | | | | | | |||||
| | * | | | | | Remove preserve_context_over_{fn, deferred} | Richard van der Hoff | 2017-11-14 | 10 | -66/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off. | ||||
| * | | | | | | Merge pull request #2650 from matrix-org/dbkr/push_include_content_option | David Baker | 2017-11-15 | 2 | -15/+32 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Rename redact_content option to include_content | ||||
| | * | | | | | | Print instead of logging | David Baker | 2017-11-13 | 1 | -11/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because we had to wait until the logger was set up | ||||
| | * | | | | | | Make the commented config have the default | David Baker | 2017-11-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | better comments | David Baker | 2017-11-08 | 1 | -2/+5 |
| | | | | | | | | |||||
| | * | | | | | | Log if any of the old config flags are set | David Baker | 2017-11-08 | 1 | -2/+24 |
| | | | | | | | | |||||
| | * | | | | | | Rename redact_content option to include_content | David Baker | 2017-11-08 | 2 | -16/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redact_content option never worked because it read the wrong config section. The PR introducing it (https://github.com/matrix-org/synapse/pull/2301) had feedback suggesting the name be changed to not re-use the term 'redact' but this wasn't incorporated. This reanmes the option to give it a less confusing name, and also means that people who've set the redact_content option won't suddenly see a behaviour change when upgrading synapse, but instead can set include_content if they want to. This PR also updates the wording of the config comment to clarify that this has no effect on event_id_only push. Includes https://github.com/matrix-org/synapse/pull/2422 | ||||
| * | | | | | | | Merge pull request #2648 from krombel/update_prometheus | Richard van der Hoff | 2017-11-14 | 3 | -1/+78 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | update prometheus-config to new format | ||||
| | * | | | | | | | Make clear that the config has changed since prometheus v2 | Krombel | 2017-11-14 | 3 | -2/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the config that is usable for prometheus pre v2.0.0 The new config only works for Prometheus v2+ | ||||
| | * | | | | | | | update prometheus-config to new format | Krombel | 2017-11-07 | 2 | -23/+67 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #2671 from matrix-org/rav/room_list_fixes | Richard van der Hoff | 2017-11-14 | 1 | -20/+30 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Reshuffle room list request code | ||||
| | * | | | | | | | | Reshuffle room list request code | Richard van der Hoff | 2017-11-14 | 1 | -27/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not entirely sure if this will actually help anything, but it simplifies the code and might give further clues about why room list search requests are blowing out the get_current_state_ids caches. | ||||
| | * | | | | | | | | Add a load of logging to the room_list handler | Richard van der Hoff | 2017-11-14 | 1 | -0/+13 |
| | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | So we can see what it gets up to. | ||||
| * | | | | | | | | Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups | Richard van der Hoff | 2017-11-14 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add new boolean columns to port script | ||||
| | | | | | | | | * | Copy dict in update_membership too | Erik Johnston | 2017-12-07 | 1 | -0/+4 |
| | | | | | | | | | | |||||
| | | | | | | | | * | PEP8 | Erik Johnston | 2017-11-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix wrong avatars when inviting multiple users when creating room | Erik Johnston | 2017-11-28 | 1 | -5/+5 |
| | | | | | | | |/ | | | | | | | | | | | | | | | | | We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user | ||||
| | | | | | | | * | Merge branch 'release-v0.25.1' | Richard van der Hoff | 2017-11-17 | 3 | -2/+10 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | Bump version in __init__.py v0.25.1 github/release-v0.25.1 release-v0.25.1 | Richard van der Hoff | 2017-11-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Prep changelog for v0.25.1 | Richard van der Hoff | 2017-11-17 | 1 | -0/+8 |
| | | | | | | | | | | |||||
| | | | | | | | | * | Fix auth handler #2678 | Jurek | 2017-11-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | | | | | | * | | Revert "Merge pull request #2679 from jkolo/fix_auth_handler" | Richard van der Hoff | 2017-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was against master, not develop :( This reverts commit 203058a027193b6a07a148319a9a728bf7f8420c, reversing changes made to 552f123bea1014680ab798b7e34cd1b23424a189. | ||||
| | | | | | | | * | | Merge pull request #2679 from jkolo/fix_auth_handler | Richard van der Hoff | 2017-11-16 | 1 | -1/+1 |
| | | | | | | |/| | | | | | | |/| | | | | | | | | | | | | Fix auth handler | ||||
| | | | | | | | * | | Fix auth handler #2678 | Jurek | 2017-11-15 | 1 | -1/+1 |
| | | | | | | |/ / | | | | | |/| | | |||||
| | | | | | * | | | Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse v0.25.0 | Erik Johnston | 2017-11-15 | 85 | -689/+1783 |
| | | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
| | | | | | | * | | Bump changelog github/release-v0.25.0 release-v0.25.0 | Erik Johnston | 2017-11-15 | 1 | -0/+8 |
| | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | | Less s's | Erik Johnston | 2017-11-14 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add new boolean columns to port script | Erik Johnston | 2017-11-14 | 1 | -0/+7 |
| |/ / / / / / | |||||
| * | | | | / | Bump version and changelog v0.25.0-rc1 | Erik Johnston | 2017-11-14 | 2 | -1/+51 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Merge pull request #2658 from matrix-org/rav/store_heirarchy_init | Richard van der Hoff | 2017-11-14 | 22 | -44/+44 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Make __init__ consistent across Store hierarchy | ||||
| | * | | | | Fix tests for Store.__init__ update | Richard van der Hoff | 2017-11-13 | 5 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | Fix the test to pass the right number of args to the Store constructors | ||||
| | * | | | | Make __init__ consitstent across Store heirarchy | Richard van der Hoff | 2017-11-13 | 17 | -33/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add db_conn parameters to the `__init__` methods of the *Store classes, so that they are all consistent, which makes the multiple inheritance work correctly (and so that we can later extract mixins which can be used in the slavedstores) | ||||
| * | | | | | Merge pull request #2668 from turt2live/travis/whoami | Richard van der Hoff | 2017-11-14 | 1 | -0/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add a route for determining who you are | ||||
| | * | | | | | Remove redundent call | Travis Ralston | 2017-11-13 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
| | * | | | | | Add a route for determining who you are | Travis Ralston | 2017-11-12 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for applications which may have an access token, but no idea as to who owns it. Signed-off-by: Travis Ralston <travpc@gmail.com> | ||||
| * | | | | | | Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failure | Richard van der Hoff | 2017-11-13 | 1 | -41/+47 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Cache failures in url_preview handler | ||||
| | * | | | | | | Bit more logging | Richard van der Hoff | 2017-11-10 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | Cache failures in url_preview handler | Richard van der Hoff | 2017-11-10 | 1 | -41/+45 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Reshuffle the caching logic in the url_preview handler so that failures are cached (and to generally simplify things and fix the logcontext leaks). | ||||
| * | | | | | | Merge pull request #2663 from matrix-org/rav/invalid_request_utf8 | Richard van der Hoff | 2017-11-13 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix 500 on invalid utf-8 in request | ||||
| | * | | | | | Merge branch 'develop' into rav/invalid_request_utf8 | Richard van der Hoff | 2017-11-13 | 6 | -18/+46 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | | Revert "move _state_group_cache to statestore" | Erik Johnston | 2017-11-13 | 2 | -12/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f5cf3638e9c6086e1c33ddad8eda9298cf53a58e. | ||||
| * | | | | | | Up cache size of get_global_account_data_by_type_for_user | Erik Johnston | 2017-11-13 | 1 | -1/+1 |
| | |/ / / / |/| | | | | |||||
| * | | | | | Merge pull request #2662 from matrix-org/rav/fix_mxids_again | Richard van der Hoff | 2017-11-10 | 3 | -5/+32 |
| |\ \ \ \ \ | | | | | | | | | | | | | Downcase userid on registration | ||||
| | * | | | | | Add some more comments appservice user registration | Richard van der Hoff | 2017-11-10 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Explain why we don't validate userids registered via app services | ||||
| | * | | | | | Downcase userids for shared-secret registration | Richard van der Hoff | 2017-11-10 | 2 | -3/+21 |
| | | | | | | | |||||
| | * | | | | | Downcase userid on registration | Richard van der Hoff | 2017-11-09 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force username to lowercase before attempting to register https://github.com/matrix-org/synapse/issues/2660 | ||||
| | * | | | | | Revert "Allow upper-case characters in mxids" | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | This reverts commit b70b64690330c25cbd04c1b2cacf8276b566efc8. | ||||
| | * / / / | Fix 500 on invalid utf-8 in request | Richard van der Hoff | 2017-11-10 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If somebody sends us a request where the the body is invalid utf-8, we should return a 400 rather than a 500. (json.loads throws a UnicodeError in this situation) We might as well catch all Exceptions here: it seems very unlikely that we would get a request that *isn't caused by invalid json. | ||||
| * | | | | Merge pull request #2659 from ↵ | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | matrix-org/rav/apparently_we_dont_follow_our_own_spec_now Allow upper-case characters in mxids | ||||
| | * | | | | Allow upper-case characters in mxids | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 |
| |/ / / / | | | | | | | | | | | | | Because we're never going to be able to fix this :'( | ||||
| * | | | | Fix typo | Erik Johnston | 2017-11-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Register group servlet | Erik Johnston | 2017-11-09 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #2657 from matrix-org/erikj/group_visibility_namespace | Luke Barnard | 2017-11-09 | 1 | -9/+19 |
| |\ \ \ \ | | | | | | | | | | | Namespace visibility options for groups | ||||
| | * | | | | Namespace visibility options for groups | Erik Johnston | 2017-11-09 | 1 | -9/+19 |
| |/ / / / | |||||
| * | | | | Merge pull request #2656 from matrix-org/rav/fix_deactivate | Richard van der Hoff | 2017-11-09 | 1 | -2/+1 |
| |\ \ \ \ | | | | | | | | | | | Fix 'NoneType' not iterable in /deactivate | ||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |