Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+1 |
|\ \ | |||||
| * | | 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 |
| * | | Fix auth handler #2678 | Jurek | 2017-11-17 | 1 | -1/+1 |
* | | | Merge pull request #2686 from matrix-org/luke/as-flair | Luke Barnard | 2017-11-17 | 3 | -1/+48 |
|\ \ \ | |||||
| * | | | Extract group_id from the dict for multiple use | Luke Barnard | 2017-11-16 | 1 | -4/+5 |
| * | | | 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 |
* | | | | Fix auth handler #2678 | Jurek | 2017-11-16 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | 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 |
* | | | Declare support for r0.3.0 | Richard van der Hoff | 2017-11-15 | 1 | -0/+1 |
* | | | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs | Richard van der Hoff | 2017-11-15 | 9 | -92/+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 | 9 | -62/+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 #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 |
| | |/ / | |/| | | |||||
* | | | | Bump version and changelog v0.25.0-rc1 | Erik Johnston | 2017-11-14 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #2658 from matrix-org/rav/store_heirarchy_init | Richard van der Hoff | 2017-11-14 | 17 | -33/+33 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 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 |
| |/ / | |||||
| * | | 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 |
|/ / | |||||
* | | 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 |
* | | 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 |
* | | | 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 | 1 | -5/+1 |
|\ \ \ | |||||
| * | | | Remove useless assignment in notify_interested_services | Ilya Zhuravlev | 2017-11-07 | 1 | -1/+0 |
| * | | | 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 |
|\ \ \ | |||||
| * | | | s/items/iteritems/ | Richard van der Hoff | 2017-11-08 | 1 | -2/+2 |
| * | | | Update deltas when doing auth resolution | Richard van der Hoff | 2017-11-07 | 1 | -3/+7 |
| * | | | factor out _update_context_for_auth_events | Richard van der Hoff | 2017-11-07 | 1 | -20/+42 |
| * | | | move _state_group_cache to statestore | Richard van der Hoff | 2017-11-07 | 2 | -13/+12 |
| | |/ | |/| | |||||
* | | | Merge pull request #2643 from matrix-org/matthew/user_dir_typos | Matthew Hodgson | 2017-11-07 | 5 | -14/+38 |
|\ \ \ | |/ / |/| | | |||||
| * | | create new indexes before dropping old ones to keep safetynet in place | Matthew Hodgson | 2017-11-07 | 1 | -2/+4 |
| * | | s/users_in_pubic_room/users_in_public_rooms/g | Matthew Hodgson | 2017-11-04 | 1 | -2/+2 |
| * | | s/users_in_pubic_room/users_in_public_rooms/g | Matthew Hodgson | 2017-11-04 | 2 | -10/+32 |
| * | | fix copyright.... | Matthew Hodgson | 2017-11-04 | 1 | -1/+1 |
| * | | s/popualte/populate/ | Matthew Hodgson | 2017-11-04 | 1 | -1/+1 |
| * | | s/intial/initial/ | Matthew Hodgson | 2017-11-04 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #2636 from farialima/me-master | Erik Johnston | 2017-11-07 | 1 | -13/+8 |
|\ \ | |||||
| * | | removed unused import flagged by flake8a | Francois Granade | 2017-11-03 | 1 | -1/+0 |
| * | | Fix for issue 2635: correctly update rooms avatar/display name when modified ... | Francois Granade | 2017-11-03 | 1 | -12/+8 |
* | | | Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop" | Erik Johnston | 2017-11-07 | 1 | -1/+10 |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-11-07 | 1 | -10/+1 |
|\| | | |||||
| * | | Revert "Add jitter to validity period of attestations" | Erik Johnston | 2017-10-27 | 1 | -12/+1 |
* | | | Remember to pick is_admin out of the db | Luke Barnard | 2017-11-07 | 1 | -1/+1 |
* | | | Return whether a user is an admin within a group | Luke Barnard | 2017-11-07 | 1 | -2/+3 |
* | | | Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-preview | Matthew Hodgson | 2017-11-07 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | Ignore noscript tags when generating URL previews | Maxime Vaillancourt | 2017-10-25 | 1 | -1/+8 |
* | | | | Logging and logcontext fixes for Limiter | Richard van der Hoff | 2017-11-07 | 1 | -7/+17 |
| |_|/ |/| | | |||||
* | | | Merge pull request #2630 from matrix-org/luke/fix-rooms-in-group | David Baker | 2017-11-02 | 1 | -3/+1 |
|\ \ \ | |||||
| * | | | Make the get_rooms_in_group API more sane | Luke Barnard | 2017-11-02 | 1 | -3/+1 |
* | | | | Merge pull request #2629 from matrix-org/rav/register_inhibit_login | David Baker | 2017-11-02 | 1 | -12/+16 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | support inhibit_login in /register | Richard van der Hoff | 2017-11-02 | 1 | -12/+16 |
* | | | | Merge remote-tracking branch 'origin/develop' into rav/module_api_hooks | David Baker | 2017-11-02 | 3 | -45/+137 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #2627 from matrix-org/rav/custom_rest_endpoints | David Baker | 2017-11-02 | 3 | -0/+74 |
| |\ \ \ \ | |||||
| | * | | | | Add a hook for custom rest endpoints | Richard van der Hoff | 2017-11-02 | 3 | -0/+74 |
| | |/ / / | |||||
| * | | | | Merge pull request #2626 from matrix-org/rav/refactor_module_api | David Baker | 2017-11-02 | 2 | -69/+82 |
| |\ \ \ \ | |||||
| * | | | | | Factor out _configure_named_resource | Richard van der Hoff | 2017-11-02 | 1 | -46/+64 |
| | |/ / / | |/| | | | |||||
* | | | | | Add more hooks to ModuleApi | Richard van der Hoff | 2017-11-02 | 1 | -0/+34 |
| |/ / / |/| | | | |||||
* | | | | Factor _AccountHandler proxy out to ModuleApi | Richard van der Hoff | 2017-11-02 | 2 | -69/+82 |
|/ / / | |||||
* | | | Merge pull request #2624 from matrix-org/rav/password_provider_notify_logout | David Baker | 2017-11-02 | 2 | -7/+32 |
|\ \ \ | |||||
| * | | | Notify auth providers on logout | Richard van der Hoff | 2017-11-01 | 2 | -7/+32 |
* | | | | Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providers | David Baker | 2017-11-02 | 2 | -7/+15 |
|\ \ \ \ | |||||
| * | | | | Fix user-interactive password auth | Richard van der Hoff | 2017-11-01 | 1 | -1/+3 |
| * | | | | Allow password_auth_providers to return a callback | Richard van der Hoff | 2017-11-01 | 2 | -6/+12 |
| |/ / / | |||||
* | | | | Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providers | David Baker | 2017-11-02 | 1 | -0/+16 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Let auth providers get to the database | Richard van der Hoff | 2017-10-31 | 1 | -0/+16 |
* | | | | Merge pull request #2620 from matrix-org/rav/auth_non_password | Richard van der Hoff | 2017-11-01 | 1 | -22/+96 |
|\ \ \ \ | |||||
| * | | | | Let password auth providers handle arbitrary login types | Richard van der Hoff | 2017-11-01 | 1 | -22/+96 |
| |/ / / | |||||
* | | | | Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_delete | David Baker | 2017-11-01 | 6 | -27/+62 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_d... | David Baker | 2017-11-01 | 14 | -95/+62 |
| |\ \ \ \ | |||||
| * | | | | | Move access token deletion into auth handler | Richard van der Hoff | 2017-11-01 | 6 | -27/+62 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2617 from matrix-org/matthew/auto-displayname | Matthew Hodgson | 2017-11-01 | 1 | -2/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | switch to setting default displayname in the storage layer | Matthew Hodgson | 2017-11-01 | 2 | -10/+5 |
| * | | | | automatically set default displayname on register | Matthew Hodgson | 2017-11-01 | 1 | -1/+8 |
* | | | | | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep | David Baker | 2017-11-01 | 3 | -13/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Break dependency of auth_handler on device_handler | Richard van der Hoff | 2017-11-01 | 3 | -13/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokens | David Baker | 2017-11-01 | 5 | -60/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Remove the last vestiges of refresh_tokens | Richard van der Hoff | 2017-10-31 | 5 | -60/+14 |
| |/ / / / | |||||
* | | | | | Apparently this is python | David Baker | 2017-11-01 | 1 | -1/+1 |
* | | | | | Log login requests | David Baker | 2017-11-01 | 1 | -0/+10 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #2612 from matrix-org/luke/groups-room-relationship-is-public | Luke Barnard | 2017-11-01 | 6 | -22/+32 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Leave `is_public` as required argument of update_room_group_association | Luke Barnard | 2017-11-01 | 1 | -1/+1 |
| * | | | Update docs for updating room group association | Luke Barnard | 2017-11-01 | 2 | -2/+2 |
| * | | | Flake8 | Luke Barnard | 2017-10-31 | 2 | -5/+9 |
| * | | | Modify group room association API to allow modification of is_public | Luke Barnard | 2017-10-31 | 6 | -19/+25 |
* | | | | DB schema interface for password auth providers | Richard van der Hoff | 2017-10-31 | 2 | -0/+77 |
|/ / / | |||||
* | | | Merge pull request #2609 from matrix-org/rav/refactor_login | David Baker | 2017-10-31 | 2 | -57/+78 |
|\ \ \ | |||||
| * | | | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 2 | -57/+78 |
* | | | | Clean up backwards-compat hacks for ldap | Richard van der Hoff | 2017-10-31 | 1 | -20/+19 |
|/ / / | |||||
* | | | Fix wording on group creation error | Luke Barnard | 2017-10-30 | 1 | -1/+1 |
* | | | fix typo | Matthew Hodgson | 2017-10-29 | 1 | -1/+1 |
* | | | Fix typo when checking if user is invited to group | Erik Johnston | 2017-10-27 | 1 | -1/+4 |
* | | | Fix bad merge | Erik Johnston | 2017-10-27 | 1 | -1/+3 |
* | | | Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into... | Erik Johnston | 2017-10-27 | 1 | -1/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add jitter to validity period of attestations | Erik Johnston | 2017-10-27 | 1 | -1/+12 |
* | | | Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse i... | Erik Johnston | 2017-10-27 | 3 | -9/+36 |
|\ \ \ | |||||
| * | | | Import logger | Erik Johnston | 2017-10-27 | 1 | -0/+5 |
| * | | | Fixup | Erik Johnston | 2017-10-27 | 2 | -5/+5 |
| * | | | Remove incorrect attestations | Erik Johnston | 2017-10-27 | 2 | -0/+19 |
| * | | | Log if we try to do attestations for our own user and group | Erik Johnston | 2017-10-27 | 1 | -2/+8 |
| * | | | Don't generate group attestations for local users | Erik Johnston | 2017-10-27 | 1 | -2/+3 |
| |/ / | |||||
* | | | Merge pull request #2595 from matrix-org/erikj/attestation_commnet | Erik Johnston | 2017-10-27 | 1 | -0/+22 |
|\ \ \ | |||||
| * | | | Add comment about attestations | Erik Johnston | 2017-10-27 | 1 | -0/+22 |
* | | | | Merge pull request #2591 from matrix-org/rav/device_delete_auth | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 |
|\ \ \ \ | |||||
| * | | | | Device deletion: check UI auth matches access token | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 |
* | | | | | Merge pull request #2589 from matrix-org/rav/as_deactivate_account | Richard van der Hoff | 2017-10-27 | 2 | -17/+33 |
|\ \ \ \ \ | |||||
| * | | | | | Allow ASes to deactivate their own users | Richard van der Hoff | 2017-10-27 | 2 | -17/+33 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2582 from matrix-org/luke/group-is-public | Luke Barnard | 2017-10-27 | 5 | -98/+189 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Request is_public from database | Luke Barnard | 2017-10-27 | 1 | -1/+3 |
| * | | | | group is dict | Luke Barnard | 2017-10-27 | 1 | -1/+1 |
| * | | | | Create groups with is_public = True | Luke Barnard | 2017-10-27 | 1 | -0/+1 |
| * | | | | Fix create_group to pass requester_user_id | Luke Barnard | 2017-10-27 | 1 | -1/+1 |
| * | | | | Correct logic for checking private group membership | Luke Barnard | 2017-10-27 | 1 | -1/+1 |
| * | | | | Make it work | Luke Barnard | 2017-10-26 | 1 | -1/+1 |
| * | | | | Recreate groups table instead of adding column | Luke Barnard | 2017-10-26 | 1 | -2/+16 |
| * | | | | Awful hack to get default true | Luke Barnard | 2017-10-26 | 1 | -1/+2 |
| * | | | | Bump schema version to 46 | Luke Barnard | 2017-10-26 | 1 | -1/+1 |
| * | | | | delint | Luke Barnard | 2017-10-26 | 2 | -15/+67 |
| * | | | | Add is_public to groups table to allow for private groups | Luke Barnard | 2017-10-26 | 3 | -95/+116 |
| |/ / / | |||||
* | | | | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header | Richard van der Hoff | 2017-10-27 | 2 | -28/+87 |
|\ \ \ \ | |||||
| * | | | | Docstring for post_urlencoded_get_json | Richard van der Hoff | 2017-10-27 | 1 | -0/+11 |
| * | | | | Front-end proxy: pass through auth header | Richard van der Hoff | 2017-10-26 | 1 | -0/+7 |
| * | | | | SimpleHTTPClient: add support for headers | Richard van der Hoff | 2017-10-26 | 1 | -28/+69 |
* | | | | | Merge pull request #2585 from matrix-org/rav/unstable_to_r0 | Richard van der Hoff | 2017-10-27 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Support /keys/upload on /r0 as well as /unstable | Richard van der Hoff | 2017-10-26 | 1 | -2/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #2584 from matrix-org/rav/fix_httpclient_logcontexts | Richard van der Hoff | 2017-10-27 | 1 | -10/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Fix logcontext leaks in httpclient | Richard van der Hoff | 2017-10-26 | 1 | -10/+9 |
| |/ / / / | |||||
* | | | | | Merge pull request #2574 from matrix-org/erikj/room_list_fixes | Erik Johnston | 2017-10-27 | 4 | -11/+22 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Update room_list.py | Erik Johnston | 2017-10-26 | 1 | -1/+1 |
| * | | | | Do logcontexts outside ResponseCache | Erik Johnston | 2017-10-25 | 5 | -13/+21 |
| * | | | | Add logging and fix log contexts for publicRooms | Erik Johnston | 2017-10-25 | 2 | -1/+4 |
* | | | | | Merge pull request #2581 from matrix-org/rav/fix_init_with_no_logfile | Richard van der Hoff | 2017-10-26 | 1 | -1/+5 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix error when running synapse with no logfile | Richard van der Hoff | 2017-10-26 | 1 | -1/+5 |
| | |/ / | |/| | | |||||
* | | | | add release endpoints for /thirdparty | Krombel | 2017-10-26 | 1 | -7/+4 |
* | | | | register some /unstable endpoints in /r0 as well | Krombel | 2017-10-26 | 4 | -20/+9 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-25 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bump version and changelog github/release-v0.24.1 release-v0.24.1 | Erik Johnston | 2017-10-24 | 1 | -1/+1 |
| |/ | |||||
* / | tip for generating tls_fingerprints | Matthew Hodgson | 2017-10-24 | 1 | -0/+6 |
|/ | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_... | Erik Johnston | 2017-10-24 | 54 | -129/+143 |
|\ | |||||
| * | fix vars named `l` | Richard van der Hoff | 2017-10-23 | 2 | -7/+4 |
| * | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 52 | -88/+88 |
| * | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 |
| |\ | |||||
| | * | Fix a logcontext leak in the media repo | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 |
| * | | Merge pull request #2561 from matrix-org/rav/id_checking | Richard van der Hoff | 2017-10-23 | 3 | -33/+47 |
| |\ \ | | |/ | |/| | |||||
| | * | Validate group ids when parsing | Richard van der Hoff | 2017-10-21 | 2 | -16/+22 |
| | * | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 3 | -5/+4 |
| | * | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 3 | -16/+25 |
* | | | Correctly wire in update group profile over federation | Erik Johnston | 2017-10-23 | 2 | -11/+31 |
|/ / | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump version and changelog github/release-v0.24.0 release-v0.24.0 | Erik Johnston | 2017-10-23 | 1 | -1/+1 |
| * | | Correctly bump version v0.24.0-rc1 | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
| * | | Bump version and changelog | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
| |/ | |||||
* / | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 6 | -12/+8 |
|/ | |||||
* | Flake8 | Erik Johnston | 2017-10-19 | 2 | -6/+4 |
* | Add missing file... | Erik Johnston | 2017-10-19 | 1 | -0/+36 |
* | Add config to enable group creation | Erik Johnston | 2017-10-19 | 2 | -3/+12 |
* | Enforce sensible group IDs | Erik Johnston | 2017-10-19 | 1 | -1/+19 |
* | Fix typo | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
* | Fix typo in group attestation handling | Erik Johnston | 2017-10-19 | 2 | -2/+3 |
* | Fix typo in thumbnail generation | Erik Johnston | 2017-10-19 | 1 | -2/+5 |
* | Fix typo | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
* | Merge pull request #2553 from matrix-org/rav/fix_500_on_event_send | Richard van der Hoff | 2017-10-18 | 1 | -1/+0 |
|\ | |||||
| * | Fix 500 error when we get an error handling a PDU | Richard van der Hoff | 2017-10-17 | 1 | -1/+0 |
* | | Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevels | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Fix 500 error when fields missing from power_levels event | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 |
* | | Doc some more dynamic Homeserver methods | Richard van der Hoff | 2017-10-17 | 1 | -0/+8 |
* | | Merge pull request #2550 from krombel/fix_thumbnail_2548 | Erik Johnston | 2017-10-17 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | fix thumbnailing (#2548) | Krombel | 2017-10-17 | 1 | -2/+2 |
* | | Improve error handling for missing files (#2551) | Richard van der Hoff | 2017-10-17 | 3 | -17/+33 |
* | | Merge pull request #2549 from matrix-org/rav/event_persist_logcontexts | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 |
|\ \ | |||||
| * | | Fix logcontext handling for persist_events | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 |
| |/ | |||||
* | | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 2 | -0/+41 |
|\ \ | |/ |/| | |||||
| * | pep8 | David Baker | 2017-10-17 | 1 | -1/+2 |
| * | Add config option to auto-join new users to rooms | David Baker | 2017-10-16 | 2 | -0/+40 |
* | | Delint | Luke Barnard | 2017-10-16 | 3 | -1/+3 |
* | | Make it work. Warn about lack of user profile | Luke Barnard | 2017-10-16 | 1 | -2/+2 |
* | | _create_rererouter for get_invited_users_in_group | Luke Barnard | 2017-10-16 | 1 | -17/+2 |
* | | Merge branch 'develop' into luke/groups-invited-users | Luke Barnard | 2017-10-16 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profile | Luke Barnard | 2017-10-16 | 1 | -2/+5 |
| |\ \ | | |/ | |/| | |||||
| * | | Omit the *s for @room notifications | David Baker | 2017-10-16 | 1 | -1/+1 |
* | | | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 6 | -1/+115 |
| |/ |/| | |||||
* | | Log a warning when no profile for invited member | Luke Barnard | 2017-10-16 | 1 | -2/+5 |
|/ | |||||
* | Add try/finally block to close t_byte_source | Erik Johnston | 2017-10-13 | 1 | -24/+41 |
* | Remove old comment | Erik Johnston | 2017-10-13 | 1 | -1/+0 |
* | Don't reuse source but instead copy from primary media store to backup | Erik Johnston | 2017-10-13 | 2 | -22/+9 |
* | PEP8 | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
* | Move type into key | Erik Johnston | 2017-10-13 | 1 | -3/+3 |
* | Comment | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
* | Remove spurious addition | Erik Johnston | 2017-10-13 | 1 | -4/+0 |
* | Don't needlessly rename variable | Erik Johnston | 2017-10-13 | 1 | -13/+13 |
* | Add paths back in... | Erik Johnston | 2017-10-13 | 1 | -4/+4 |
* | Remove unnecessary diff | Erik Johnston | 2017-10-13 | 1 | -3/+1 |
* | Make things be absolute paths again | Erik Johnston | 2017-10-13 | 1 | -7/+7 |
* | s/write_to_file/write_to_file_and_backup/ | Erik Johnston | 2017-10-13 | 1 | -5/+5 |
* | Fix up | Erik Johnston | 2017-10-13 | 2 | -43/+32 |
* | Fix up thumbnailing function | Erik Johnston | 2017-10-13 | 3 | -75/+73 |
* | Fix typo | Erik Johnston | 2017-10-13 | 1 | -1/+1 |
* | Fix up comments | Erik Johnston | 2017-10-13 | 1 | -2/+26 |
* | Move makedirs to thread | Erik Johnston | 2017-10-13 | 1 | -2/+1 |
* | Use make_deferred_yieldable | Erik Johnston | 2017-10-13 | 1 | -7/+7 |
* | Fix comments | Erik Johnston | 2017-10-12 | 2 | -1/+4 |
* | Don't close prematurely.. | Erik Johnston | 2017-10-12 | 1 | -2/+5 |
* | getvalue closes buffer | Erik Johnston | 2017-10-12 | 1 | -11/+10 |
* | Get len before close | Erik Johnston | 2017-10-12 | 1 | -6/+11 |
* | Don't close file prematurely | Erik Johnston | 2017-10-12 | 2 | -8/+18 |
* | Copy everything to backup | Erik Johnston | 2017-10-12 | 5 | -77/+151 |
* | Typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 |
* | Remove dead code | Erik Johnston | 2017-10-12 | 1 | -3/+0 |