Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Optimise LoggingContext creation and copying | Richard van der Hoff | 2018-01-16 | 3 | -22/+33 | |
| |/ / / / / |/| | | | | | ||||||
| | * | | | | rework runInteraction in terms of runConnection | Richard van der Hoff | 2018-01-16 | 1 | -20/+31 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #2785 from matrix-org/rav/reorganise_metrics_again | Richard van der Hoff | 2018-01-16 | 5 | -47/+209 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
| * | | | | | 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 | Richard van der Hoff | 2018-01-16 | 1 | -1/+8 | |
| |/ / / / / | ||||||
* | | | | | | 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 | Richard van der Hoff | 2018-01-15 | 2 | -0/+11 | |
| |/ / / / / | ||||||
* | | | | | | 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 | Richard van der Hoff | 2018-01-15 | 1 | -5/+14 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-01-16 | 7 | -346/+843 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | 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 erikj/media_stor... | Erik Johnston | 2018-01-12 | 9 | -28/+116 | |
| |\ \ \ \ | ||||||
| * | | | | | 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 | Richard van der Hoff | 2018-01-12 | 1 | -3/+10 | |
|/ / / / / | ||||||
* | | | | | 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 | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2774 from matrix-org/erikj/synctl | Erik Johnston | 2018-01-12 | 3 | -5/+38 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | 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 | Richard van der Hoff | 2018-01-09 | 1 | -3/+26 | |
* | | | | | 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 | 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 | 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 order of operations derp and also use `.get` to default to {} | Michael Telatynski | 2018-01-10 | 1 | -2/+3 | |
| * | | | | | | | | Fix publicised groups API (singular) over federation | Michael Telatynski | 2018-01-10 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | 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 | Richard van der Hoff | 2018-01-09 | 1 | -11/+19 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2764 from matrix-org/erikj/remove_dead_thumbnail_code | Erik Johnston | 2018-01-09 | 2 | -78/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
| * | | | | | | Disable user_directory updates for UTs | Richard van der Hoff | 2018-01-09 | 1 | -0/+4 | |
* | | | | | | | 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 | Richard van der Hoff | 2018-01-09 | 2 | -3/+18 | |
| |/ / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2761 from turt2live/patch-1 | Erik Johnston | 2018-01-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix templating error with unban permission message | Travis Ralston | 2018-01-07 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | 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 | Richard van der Hoff | 2018-01-05 | 1 | -8/+4 | |
|/ / / / / / | ||||||
* | | | | | | 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 | 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 | Richard van der Hoff | 2017-12-30 | 1 | -0/+7 | |
| * | | | | | Factor out `event_from_pdu_json` | Richard van der Hoff | 2017-12-30 | 3 | -37/+44 | |
| * | | | | | 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 | Richard von Seck | 2017-11-16 | 1 | -2/+2 | |
* | | | | | | Merge pull request #2435 from silkeh/listen-ipv6-default | Richard van der Hoff | 2017-12-18 | 12 | -231/+247 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Implement listen_tcp method in remaining workers | Silke | 2017-12-18 | 10 | -192/+155 | |
| * | | | | | Remove logger argument and do not catch replication listener | Silke | 2017-12-18 | 2 | -24/+18 | |
| * | | | | | Add methods for listening on multiple addresses | Silke Hofstra | 2017-12-17 | 2 | -51/+90 | |
| * | | | | | Allow binds to both :: and 0.0.0.0 | Silke Hofstra | 2017-12-17 | 2 | -42/+61 | |
| * | | | | | Adapt the default config to bind on IPv6. | Willem Mulder | 2017-12-17 | 1 | -8/+9 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2717 from matrix-org/erikj/createroom_content | Erik Johnston | 2017-12-07 | 2 | -5/+9 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom... | Erik Johnston | 2017-12-07 | 73 | -820/+1776 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #2723 from matrix-org/matthew/search-all-local-users | Matthew Hodgson | 2017-12-05 | 11 | -37/+234 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 a... | Matthew Hodgson | 2017-11-29 | 5 | -9/+58 | |
* | | | | | | | Fix error when deleting devices | Richard van der Hoff | 2017-12-05 | 1 | -1/+1 | |
* | | | | | | | 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 | Richard van der Hoff | 2017-12-05 | 1 | -24/+57 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2017-12-05 | 3 | -74/+102 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2017-12-05 | 7 | -48/+103 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | 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 | 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 | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2722 from matrix-org/rav/delete_device_on_logout | Richard van der Hoff | 2017-11-29 | 12 | -64/+226 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 5 | -5/+75 | |
| * | | | | | | | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 6 | -19/+58 | |
| * | | | | | | | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 6 | -22/+61 | |
| * | | | | | | | Remove pushers when deleting access tokens | Richard van der Hoff | 2017-11-29 | 3 | -18/+32 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2017-11-28 | 2 | -9/+18 | |
| |/ / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2017-11-29 | 1 | -3/+10 | |
| |/ / / / / / | ||||||
* | | | | | | | 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 | 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 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 | |
| * | | | | | | Fix error on sqlite 3.7 | Richard van der Hoff | 2017-11-21 | 5 | -8/+59 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | 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 | 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 | Richard van der Hoff | 2017-11-24 | 1 | -2/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2710 from matrix-org/rav/remove_dead_code | Richard van der Hoff | 2017-11-27 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
| |/ / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2017-11-23 | 1 | -2/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | 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 | Richard van der Hoff | 2017-11-23 | 1 | -1/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2705 from matrix-org/rav/improve_tracebacks | Richard van der Hoff | 2017-11-27 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Improve tracebacks on exceptions | Richard van der Hoff | 2017-11-27 | 1 | -3/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_all | Richard van der Hoff | 2017-11-22 | 6 | -13/+48 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add config option to disable media_repo on main synapse | Richard van der Hoff | 2017-11-22 | 4 | -9/+30 | |
| * | | | | | | Build MediaRepositoryResource as a homeserver dependency | Richard van der Hoff | 2017-11-22 | 4 | -5/+19 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2700 from matrix-org/rav/worker_docs | Richard van der Hoff | 2017-11-21 | 1 | -21/+133 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Improve documentation of workers | Richard van der Hoff | 2017-11-21 | 1 | -21/+133 | |
| |/ / / / / | ||||||
* | | | | | | 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 | Richard van der Hoff | 2017-11-21 | 1 | -16/+15 | |
| |/ / / / / | ||||||
* | | | | | | 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 | 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 | Richard van der Hoff | 2017-11-16 | 2 | -5/+51 | |
* | | | | | | 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 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 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | 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 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | |
| * | | | _simple_upsert: retry on IntegrityError | Richard van der Hoff | 2017-11-16 | 1 | -6/+29 | |
| * | | | Cleanup in _simple_upsert_txn | Richard van der Hoff | 2017-11-16 | 1 | -16/+17 | |
|/ / / | ||||||
* | | | 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 | Richard van der Hoff | 2017-11-14 | 2 | -237/+226 | |
| * | | | Revert "Revert "move _state_group_cache to statestore"" | Richard van der Hoff | 2017-11-14 | 2 | -13/+12 | |
* | | | | 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 | 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 __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 | |
* | | | | | | Merge pull request #2650 from matrix-org/dbkr/push_include_content_option | David Baker | 2017-11-15 | 2 | -15/+32 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Print instead of logging | David Baker | 2017-11-13 | 1 | -11/+4 | |
| * | | | | | | 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 | |
* | | | | | | | Merge pull request #2648 from krombel/update_prometheus | Richard van der Hoff | 2017-11-14 | 3 | -1/+78 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Make clear that the config has changed since prometheus v2 | Krombel | 2017-11-14 | 3 | -2/+35 | |
| * | | | | | | | 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 | Richard van der Hoff | 2017-11-14 | 1 | -27/+24 | |
| * | | | | | | | | Add a load of logging to the room_list handler | Richard van der Hoff | 2017-11-14 | 1 | -0/+13 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2673 from matrix-org/erikj/fix_port_script_groups | Richard van der Hoff | 2017-11-14 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | 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 | |
| | | | | | | |/ | ||||||
| | | | | | | * | 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 | |
| | | | | | | * | | Merge pull request #2679 from jkolo/fix_auth_handler | Richard van der Hoff | 2017-11-16 | 1 | -1/+1 | |
| | | | | | |/| | | | | | | |/| | | | ||||||
| | | | | | | * | | 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix tests for Store.__init__ update | Richard van der Hoff | 2017-11-13 | 5 | -11/+11 | |
| * | | | | Make __init__ consitstent across Store heirarchy | Richard van der Hoff | 2017-11-13 | 17 | -33/+33 | |
* | | | | | Merge pull request #2668 from turt2live/travis/whoami | Richard van der Hoff | 2017-11-14 | 1 | -0/+15 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove redundent call | Travis Ralston | 2017-11-13 | 1 | -2/+0 | |
| * | | | | | Add a route for determining who you are | Travis Ralston | 2017-11-12 | 1 | -0/+17 | |
* | | | | | | Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failure | Richard van der Hoff | 2017-11-13 | 1 | -41/+47 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2663 from matrix-org/rav/invalid_request_utf8 | Richard van der Hoff | 2017-11-13 | 1 | -1/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | 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 | |
* | | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add some more comments appservice user registration | Richard van der Hoff | 2017-11-10 | 1 | -1/+4 | |
| * | | | | | 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 | |
| * | | | | | Revert "Allow upper-case characters in mxids" | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 | |
|/ / / / / | ||||||
| * / / / | Fix 500 on invalid utf-8 in request | Richard van der Hoff | 2017-11-10 | 1 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #2659 from matrix-org/rav/apparently_we_dont_follow_our_ow... | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Allow upper-case characters in mxids | Richard van der Hoff | 2017-11-09 | 1 | -3/+3 | |
|/ / / / | ||||||
* | | | | 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 | 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 | Richard van der Hoff | 2017-11-09 | 1 | -2/+1 | |
* | | | | | Merge pull request #2651 from matrix-org/erikj/update_group_room_settings | Erik Johnston | 2017-11-09 | 6 | -29/+120 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add brackets | Erik Johnston | 2017-11-09 | 1 | -2/+4 | |
| * | | | | | Have an explicit API to update room config | Erik Johnston | 2017-11-08 | 6 | -1/+100 | |
| * | | | | | Revert "Modify group room association API to allow modification of is_public" | Erik Johnston | 2017-11-08 | 6 | -32/+22 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2631 from xyzz/fix_appservice_event_backlog | Erik Johnston | 2017-11-08 | 2 | -8/+13 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove useless assignment in notify_interested_services | Ilya Zhuravlev | 2017-11-07 | 1 | -1/+0 | |
| * | | | | | Fix appservice tests to account for new behavior of notify_interested_services | Ilya Zhuravlev | 2017-11-02 | 1 | -3/+12 | |
| * | | | | | Fix appservices being backlogged and not receiving new events due to a bug in... | Ilya Zhuravlev | 2017-11-02 | 1 | -4/+1 | |
* | | | | | | Merge pull request #2637 from spantaleev/avoid-noop-media-deletes | Erik Johnston | 2017-11-08 | 1 | -0/+6 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Avoid no-op media deletes | Slavi Pantaleev | 2017-11-04 | 1 | -0/+6 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_res | Richard van der Hoff | 2017-11-08 | 3 | -33/+58 | |
|\ \ \ \ \ |