Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | also includes renamings to make things more consistent. | ||||
* | 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 | ||||
| * | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 2 | -57/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to need some more flexibility in handling login types in password auth providers, so as a first step, move some stuff from LoginRestServlet into AuthHandler. In particular, we pass everything other than SAML, JWT and token logins down to the AuthHandler, which now has responsibility for checking the login type and fishing the password out of the login dictionary, as well as qualifying the user_id if need be. Ideally SAML, JWT and token would go that way too, but there's no real need for it right now and I'm trying to minimise impact. This commit *should* be non-functional. | ||||
* | | Merge pull request #2607 from matrix-org/rav/cleanup_ldap_hacks | Richard van der Hoff | 2017-10-31 | 1 | -20/+19 |
|\ \ | | | | | | | Clean up backwards-compat hacks for ldap | ||||
| * | | Clean up backwards-compat hacks for ldap | Richard van der Hoff | 2017-10-31 | 1 | -20/+19 |
| |/ | | | | | | | | | | | | | try to make the backwards-compat flows follow the same code paths as the modern impl. This commit should be non-functional. | ||||
* | | Merge pull request #2608 from matrix-org/rav/password_provider_doc | David Baker | 2017-10-31 | 1 | -0/+39 |
|\ \ | |/ |/| | Start some documentation on password providers | ||||
| * | Start some documentation on password providers | Richard van der Hoff | 2017-10-31 | 1 | -0/+39 |
|/ | | | | Document the existing interface, before I start adding new stuff. | ||||
* | Merge pull request #2605 from matrix-org/luke/fix-group-creation-error-wording | Richard van der Hoff | 2017-10-30 | 1 | -1/+1 |
|\ | | | | | Fix wording on group creation error | ||||
| * | Fix wording on group creation error | Luke Barnard | 2017-10-30 | 1 | -1/+1 |
|/ | |||||
* | fix typo | Matthew Hodgson | 2017-10-29 | 1 | -1/+1 |
| | |||||
* | move url_previews to MD as RST does my head in | Matthew Hodgson | 2017-10-29 | 1 | -0/+2 |
| | |||||
* | Merge pull request #2599 from matrix-org/erikj/groups_invite | Erik Johnston | 2017-10-27 | 1 | -1/+4 |
|\ | | | | | Fix typo when checking if user is invited to group | ||||
| * | 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 ↵ | Erik Johnston | 2017-10-27 | 1 | -1/+11 |
|\ | | | | | | | into develop | ||||
| * | Add jitter to validity period of attestations | Erik Johnston | 2017-10-27 | 1 | -1/+12 |
| | | | | | | | | | | This helps ensure that the renewals of attestations are spread out more evenly. | ||||
* | | Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse ↵ | Erik Johnston | 2017-10-27 | 3 | -9/+36 |
|\ \ | | | | | | | | | | into develop | ||||
| * | | 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 | ||||
| * | | 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 | ||||
| * | | | Device deletion: check UI auth matches access token | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | (otherwise there's no point in the UI auth) | ||||
* | | | | 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 | ||||
| * | | | | 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 | 6 | -98/+190 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add is_public to groups table to allow for private groups | ||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Adding a column with non-constant default not possible in sqlite3 | ||||
| * | | | | Awful hack to get default true | Luke Barnard | 2017-10-26 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Add groups table to BOOLEAN_COLUMNS in synapse_port_db | Luke Barnard | 2017-10-26 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent group API access to non-members for private groups Also make all the group code paths consistent with `requester_user_id` always being the User ID of the requesting user. | ||||
* | | | | | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header | Richard van der Hoff | 2017-10-27 | 2 | -28/+87 |
|\ \ \ \ \ | | | | | | | | | | | | | Front-end proxy: pass through auth header | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | So that access-token-in-an-auth-header works. | ||||
| * | | | | | SimpleHTTPClient: add support for headers | Richard van der Hoff | 2017-10-26 | 1 | -28/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we need to pass headers into these methods | ||||
* | | | | | | 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 | ||||
| * | | | | | | Support /keys/upload on /r0 as well as /unstable | Richard van der Hoff | 2017-10-26 | 1 | -2/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | (So that we can stop riot relying on it in /unstable) | ||||
* | | | | | | 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 | ||||
| * | | | | | | Fix logcontext leaks in httpclient | Richard van der Hoff | 2017-10-26 | 1 | -10/+9 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | `preserve_context_over_fn` is borked | ||||
* | | | | | | Merge pull request #2574 from matrix-org/erikj/room_list_fixes | Erik Johnston | 2017-10-27 | 4 | -11/+22 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Add logging and fix log contexts for publicRooms | ||||
| * | | | | | 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 |
| | | | | | | |||||
* | | | | | | spell out need for libxml2 for lxml to work | Matthew Hodgson | 2017-10-27 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | 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 | ||||
| * | | | | | Fix error when running synapse with no logfile | Richard van der Hoff | 2017-10-26 | 1 | -1/+5 |
| | |_|/ / | |/| | | | | | | | | | | | | | Fixes 'UnboundLocalError: local variable 'sighup' referenced before assignment' | ||||
* | | | | | Merge pull request #2579 from krombel/move_unstable_to_r0 | Richard van der Hoff | 2017-10-26 | 5 | -27/+13 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | register some /unstable endpoints in /r0 as well | ||||
| * | | | | 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 pull request #2578 from matrix-org/rav/code_style_imports | Richard van der Hoff | 2017-10-26 | 1 | -46/+113 |
|\ \ \ \ | | | | | | | | | | | Code_style updates | ||||
| * | | | | Document import rules | Richard van der Hoff | 2017-10-26 | 1 | -0/+44 |
| | | | | | |||||
| * | | | | code_style: more formatting | Richard van der Hoff | 2017-10-26 | 1 | -34/+57 |
| | | | | | |||||
| * | | | | code_style.rst: a couple of tidyups | Richard van der Hoff | 2017-10-26 | 1 | -9/+9 |
| |/ / / | |||||
* | | | | Merge pull request #2577 from matrix-org/erikj/fix_port | Erik Johnston | 2017-10-26 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix port script | ||||
| * | | | Fix port script | Erik Johnston | 2017-10-26 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | | | | | | | | | | We changed _simple_update_one_txn to use _simple_update_txn but didn't yank it out in the port script. Fixes #2565 | ||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2017-10-25 | 2 | -1/+9 |
|\| | | |||||
| * | | Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1 | Erik Johnston | 2017-10-24 | 64 | -159/+219 |
| |\ \ | |||||
| | * | | Bump version and changelog github/release-v0.24.1 release-v0.24.1 | Erik Johnston | 2017-10-24 | 2 | -1/+9 |
| | |/ | |||||
* | / | tip for generating tls_fingerprints | Matthew Hodgson | 2017-10-24 | 1 | -0/+6 |
| |/ |/| | |||||
* | | Merge pull request #2567 from matrix-org/erikj/group_fed_update_profile | Erik Johnston | 2017-10-24 | 2 | -11/+31 |
|\ \ | | | | | | | Correctly wire in update group profile over federation | ||||
| * \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2017-10-24 | 57 | -135/+171 |
| |\ \ | |/ / |/| | | | | | erikj/group_fed_update_profile | ||||
* | | | Merge pull request #2568 from matrix-org/rav/pep8 | Richard van der Hoff | 2017-10-23 | 55 | -100/+97 |
|\ \ \ | | | | | | | | | PEP8 fixes | ||||
| * | | | fix vars named `l` | Richard van der Hoff | 2017-10-23 | 2 | -7/+4 |
| | | | | | | | | | | | | | | | | E741 says "do not use variables named ‘l’, ‘O’, or ‘I’". | ||||
| * | | | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 54 | -93/+93 |
|/ / / | | | | | | | | | | what could possibly go wrong | ||||
* | | | 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 | ||||
| * | | | 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 | 4 | -34/+70 |
|\ \ \ \ | |/ / / |/| | | | Updates to ID checking | ||||
| * | | | Validate group ids when parsing | Richard van der Hoff | 2017-10-21 | 3 | -17/+45 |
| | | | | | | | | | | | | | | | | | | | | May as well do it whenever we parse a Group ID. We check the sigil and basic structure here so it makes sense to check the grammar in the same place. | ||||
| * | | | Allow = in mxids and groupids | Richard van der Hoff | 2017-10-20 | 3 | -5/+4 |
| | | | | | | | | | | | | | | | | ... because the spec says we should. | ||||
| * | | | Disallow capital letters in userids | Richard van der Hoff | 2017-10-20 | 3 | -16/+25 |
| | | | | | | | | | | | | | | | | | | | | Factor out a common function for checking user ids and group ids, which forbids capitals. | ||||
| | * | | 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 | 3 | -1/+45 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0 | Erik Johnston | 2017-10-23 | 83 | -571/+6538 |
| |\ \ | |||||
| | * | | Bump version and changelog github/release-v0.24.0 release-v0.24.0 | Erik Johnston | 2017-10-23 | 2 | -1/+7 |
| | | | | |||||
| | * | | Correctly bump version v0.24.0-rc1 | Erik Johnston | 2017-10-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update changelog | Erik Johnston | 2017-10-19 | 1 | -0/+1 |
| | | | | |||||
| | * | | Bump version and changelog | Erik Johnston | 2017-10-19 | 2 | -1/+36 |
| | |/ | |||||
| * | | Merge pull request #2540 from 4nd3r/patch-1 | Richard van der Hoff | 2017-10-16 | 1 | -0/+2 |
| |\ \ | | | | | | | | | make it absolutely clear that purge doesn't remove everything | ||||
| | * | | make it absolutely clear that Purge History API does not remove all traces ↵ | Ander Punnar | 2017-10-14 | 1 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | of events and message contents because this topic pops up too often #890 #1621 #1730 #2260 #2315 and so on | ||||
* | | | Merge pull request #2560 from matrix-org/rav/kill_pointless_method | Richard van der Hoff | 2017-10-23 | 6 | -12/+8 |
|\ \ \ | |_|/ |/| | | Remove pointless create() method | ||||
| * | | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 6 | -12/+8 |
|/ / | | | | | | | | | It just calls the constructor, so we may as well kill it rather than having random codepaths. | ||||
* | | Merge pull request #2559 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 3 | -3/+46 |
|\ \ | | | | | | | Add config to enable group creation | ||||
| * | | 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 |
| | | | |||||
* | | | Merge pull request #2558 from matrix-org/erikj/group_id_validation | Erik Johnston | 2017-10-19 | 1 | -1/+19 |
|\| | | | | | | | | Enforce sensible group IDs | ||||
| * | | 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 |
| | | |||||
* | | Merge pull request #2557 from matrix-org/erikj/media_tumbnails | Erik Johnston | 2017-10-19 | 1 | -2/+5 |
|\ \ | | | | | | | Fix typo in thumbnail generation | ||||
| * | | 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 | ||||
| * | | Fix 500 error when we get an error handling a PDU | Richard van der Hoff | 2017-10-17 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FederationServer doesn't have a send_failure (and nor does its subclass, ReplicationLayer), so this was failing. I'm not really sure what the idea behind send_failure is, given (a) we don't do anything at the other end with it except log it, and (b) we also send back the failure via the transaction response. I suspect there's a whole lot of dead code around it, but for now I'm just removing the broken bit. | ||||
* | | | 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 | ||||
| * | | Fix 500 error when fields missing from power_levels event | Richard van der Hoff | 2017-10-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | If the users or events keys were missing from a power_levels event, then we would throw 500s when trying to auth them. | ||||
* | | | 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) | ||||
| * | | fix thumbnailing (#2548) | Krombel | 2017-10-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | in commit 0e28281a the code for thumbnailing got refactored and the renaming of this variables was not done correctly. Signed-Off-by: Matthias Kesler <krombel@krombel.de> | ||||
* | | | Improve error handling for missing files (#2551) | Richard van der Hoff | 2017-10-17 | 3 | -17/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `os.path.exists` doesn't allow us to distinguish between permissions errors and the path actually not existing, which repeatedly confuses people. It also means that we try to overwrite existing key files, which is super-confusing. (cf issues #2455, #2379). Use os.stat instead. Also, don't recomemnd the the use of --generate-config, which screws everything up if you're using debian (cf #2455). | ||||
* | | | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injector | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 |
|\ \ \ | | | | | | | | | Remove dead class | ||||
| * | | | Remove dead class | Richard van der Hoff | 2017-10-17 | 1 | -76/+0 |
| |/ / | | | | | | | | | | This isn't used anywhere. | ||||
* | | | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 |
|\ \ \ | | | | | | | | | Add some tests for make_deferred_yieldable | ||||
| * | | | Fix name of test_logcontext | Richard van der Hoff | 2017-10-17 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | The file under test is logcontext.py, not log_context.py | ||||
| * | | | Add some tests for make_deferred_yieldable | Richard van der Hoff | 2017-10-17 | 1 | -0/+38 |
| |/ / | |||||
* | | | 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 | ||||
| * | | | Fix logcontext handling for persist_events | Richard van der Hoff | 2017-10-17 | 2 | -7/+22 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | * don't use preserve_context_over_deferred, which is known broken. * remove a redundant preserve_fn. * add/improve some comments | ||||
* | | | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 3 | -0/+42 |
|\ \ \ | |/ / |/| | | Add config option to auto-join new users to rooms | ||||
| * | | Fix test | David Baker | 2017-10-17 | 1 | -0/+1 |
| | | | |||||
| * | | 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 |
| | | | | | | | | | | | | | | | New users who register on the server will be dumped into all rooms in auto_join_rooms in the config. | ||||
* | | | Merge pull request #2544 from matrix-org/luke/groups-invited-users | Luke Barnard | 2017-10-16 | 6 | -1/+102 |
|\ \ \ | | | | | | | | | Implement GET /groups/$groupId/invited_users | ||||
| * | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | Log a warning when no profile for invited member | ||||
* | | | | Merge pull request #2542 from matrix-org/dbkr/room_notif_no_glob | David Baker | 2017-10-16 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Omit the *s for @room notifications | ||||
| * | | | | Omit the *s for @room notifications | David Baker | 2017-10-16 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | They're just redundant | ||||
| | * / | 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 |
|/ / | | | | | | | And return empty profile | ||||
* | | Merge pull request #2538 from matrix-org/erikj/media_backup | Erik Johnston | 2017-10-13 | 6 | -200/+309 |
|\ \ | | | | | | | Basic implementation of backup media store | ||||
| * | | 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 |
| | | | |||||
| * | | Fix typos | Erik Johnston | 2017-10-12 | 1 | -20/+26 |
| | | | |||||
| * | | Fix typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Basic implementation of backup media store | Erik Johnston | 2017-10-12 | 4 | -126/+131 |
| | | | |||||
* | | | oops | Matthew Hodgson | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
* | | | fix copyright to companies which actually exist(ed) | Matthew Hodgson | 2017-10-13 | 1 | -1/+1 |
|/ / | |||||
* | | log when we get an exception handling replication updates | hera | 2017-10-12 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #2531 from matrix-org/dbkr/spamcheck_error_messages | David Baker | 2017-10-12 | 1 | -2/+6 |
|\ \ | | | | | | | Allow error strings from spam checker | ||||
| * | | fix isinstance | David Baker | 2017-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | Allow error strings from spam checker | David Baker | 2017-10-11 | 1 | -2/+6 |
| | | | |||||
* | | | Merge pull request #2532 from matrix-org/rav/fix_linearizer | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 |
|\ \ \ | | | | | | | | | Fix stackoverflow and logcontexts from linearizer | ||||
| * | | | Fix stackoverflow and logcontexts from linearizer | Richard van der Hoff | 2017-10-11 | 2 | -6/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. make it not blow out the stack when there are more than 50 things waiting for a lock. Fixes https://github.com/matrix-org/synapse/issues/2505. 2. Make it not mess up the log contexts. | ||||
* | | | | Merge pull request #2529 from matrix-org/rav/fix_transaction_failure_handling | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | log pdu_failures from incoming transactions | ||||
| * | | | | log pdu_failures from incoming transactions | Richard van der Hoff | 2017-10-11 | 1 | -2/+3 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | ... even if we have no EDUs. This appears to have been introduced in 476899295f5fd6cff64799bcbc84cd4bf9005e33. | ||||
* | | | | Merge pull request #2515 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+51 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | A logformatter which includes the stack when the exception was caught when logging exceptions. | ||||
| * | | | | logformatter: fix AttributeError | Richard van der Hoff | 2017-10-11 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | make sure we have the relevant fields before we try to log them. | ||||
| * | | | | Fancy logformatter to format exceptions better | Richard van der Hoff | 2017-10-09 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit of an experimental change at this point; the idea is to see if it helps us track down where our stack overflows are coming from by logging the stack when the exception was caught and turned into a Failure. (We'll also need https://github.com/richvdh/twisted/commit/edf27044200e74680ea67c525768e36dc9d9af2b). If we deploy this, we'll be able to enable it via the log config yaml. | ||||
* | | | | | Fix fetching remote summaries | Erik Johnston | 2017-10-11 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #2533 from matrix-org/erikj/fix_group_repl | Erik Johnston | 2017-10-11 | 1 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix group stream replication | ||||
| * | | | | | peeeeeeeeep8888888888888888888888888888 | Erik Johnston | 2017-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix group stream replication | Erik Johnston | 2017-10-11 | 1 | -7/+7 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | The stream update functions expect the storage function to return a list of tuples. | ||||
* | | | | | Merge pull request #2530 from matrix-org/rav/fix_receipt_logcontext | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | fix a logcontext leak in read receipt handling | ||||
| * | | | | | fix a logcontext leak in read receipt handling | Richard van der Hoff | 2017-10-11 | 1 | -0/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Fix typo in invite to group | Erik Johnston | 2017-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix typo | Erik Johnston | 2017-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix attestations to check correct server name | Erik Johnston | 2017-10-11 | 1 | -10/+20 |
| |_|/ / |/| | | | |||||
* | | | | Fix schema delta versions | Erik Johnston | 2017-10-11 | 3 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2466 from matrix-org/erikj/groups_merged | Erik Johnston | 2017-10-11 | 35 | -66/+4793 |
|\ \ \ \ | | | | | | | | | | | Initial Group Implementation | ||||
| * | | | | Validate room ids | Erik Johnston | 2017-10-11 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | Don't corrupt cache | Erik Johnston | 2017-10-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 31 | -299/+1177 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #2472 from matrix-org/erikj/groups_rooms | Erik Johnston | 2017-09-26 | 7 | -4/+73 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add remove room from group API | ||||
| | * | | | | | Add remove room API | Erik Johnston | 2017-09-26 | 6 | -1/+72 |
| | | | | | | | |||||
| | * | | | | | Add unique index to group_rooms table | Erik Johnston | 2017-09-26 | 2 | -3/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #2471 from matrix-org/erikj/group_summary_publicised | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add is_publicised to group summary | ||||
| | * | | | | | Add is_publicised to group summary | Erik Johnston | 2017-09-26 | 1 | -25/+31 |
| |/ / / / / | |||||
| * | | | | | Remove user from group summary when the leave the group | Erik Johnston | 2017-09-21 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | Revert: Keep room_id's in group summary | Erik Johnston | 2017-09-21 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Keep room_id's in group summary | Erik Johnston | 2017-09-21 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Correctly return next token | Erik Johnston | 2017-09-20 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Fix initial sync | Erik Johnston | 2017-09-20 | 1 | -1/+9 |
| | | | | | | |||||
| * | | | | | Merge pull request #2454 from matrix-org/erikj/groups_sync_creator | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Ensure that creator of group sees group down /sync | ||||
| | * | | | | | Ensure that creator of group sees group down /sync | Erik Johnston | 2017-09-19 | 2 | -4/+31 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 39 | -592/+1313 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache | Erik Johnston | 2017-08-25 | 3 | -2/+30 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add user profiles to summary from group server | ||||
| | * | | | | | | Add user profiles to summary from group server | Erik Johnston | 2017-08-25 | 3 | -2/+30 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2429 from matrix-org/erikj/groups_profile_cache | Erik Johnston | 2017-08-25 | 15 | -47/+292 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Add a remote user profile cache | ||||
| | * | | | | | | Fix typos and reinherit | Erik Johnston | 2017-08-25 | 1 | -12/+6 |
| | | | | | | | | |||||
| | * | | | | | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 11 | -29/+35 |
| | | | | | | | | |||||
| | * | | | | | | Add remote profile cache | Erik Johnston | 2017-08-25 | 5 | -5/+237 |
| | | | | | | | | |||||
| | * | | | | | | Add _simple_update | Erik Johnston | 2017-08-25 | 1 | -19/+32 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #2410 from matrix-org/erikj/groups_publicise | Erik Johnston | 2017-08-21 | 6 | -0/+197 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add ability to publicise group membership | ||||
| | * | | | | | | Use BOOLEAN rather than TEXT type | Erik Johnston | 2017-08-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixup | Erik Johnston | 2017-08-11 | 2 | -9/+14 |
| | | | | | | | | |||||
| | * | | | | | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 5 | -0/+142 |
| | | | | | | | | |||||
| | * | | | | | | Allow update group publicity | Erik Johnston | 2017-08-08 | 2 | -0/+43 |
| | | | | | | | | |||||
| | * | | | | | | Store whether the user wants to publicise their membership of a group | Erik Johnston | 2017-08-08 | 3 | -0/+7 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2426 from matrix-org/erikj/groups_fix_sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Groups: Fix mising json.load in initial sync | ||||
| | * | | | | | | Groups: Fix mising json.load in initial sync | Erik Johnston | 2017-08-21 | 1 | -1/+7 |
| |/ / / / / / | |||||
| * | | | | | | Remove stale TODO comments | Erik Johnston | 2017-08-04 | 1 | -10/+0 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2382 from matrix-org/erikj/group_privilege | Erik Johnston | 2017-07-24 | 2 | -1/+85 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Include users membership in group in summary API | ||||
| | * | | | | | | Update comment | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Use join rather than joined, etc. | Erik Johnston | 2017-07-24 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fix all the typos | Erik Johnston | 2017-07-24 | 1 | -8/+7 |
| | | | | | | | | |||||
| | * | | | | | | Include users membership in group in summary API | Erik Johnston | 2017-07-24 | 2 | -0/+60 |
| | | | | | | | | |||||
| | * | | | | | | Check users/rooms are in group before adding to summary | Erik Johnston | 2017-07-24 | 1 | -0/+25 |
| |/ / / / / / | |||||
| * | | | | | | Correctly add joins to correct segment | Erik Johnston | 2017-07-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 12 | -12/+283 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add groups to sync stream | ||||
| | * | | | | | | Add notifier | Erik Johnston | 2017-07-20 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix replication. And notify | Erik Johnston | 2017-07-20 | 5 | -4/+119 |
| | | | | | | | | |||||
| | * | | | | | | Remember to cast to bool | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix bug in generating current token | Erik Johnston | 2017-07-20 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 8 | -8/+161 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2377 from matrix-org/erikj/group_profile_update | Erik Johnston | 2017-07-20 | 5 | -0/+55 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Add update group profile API | ||||
| | * | | | | | | Remove spurious content param | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Check values are strings | Erik Johnston | 2017-07-20 | 1 | -1/+4 |
| | | | | | | | | |||||
| | * | | | | | | Fix a storage desc | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Add update group profile API | Erik Johnston | 2017-07-20 | 5 | -0/+52 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2374 from matrix-org/erikj/group_server_local | Erik Johnston | 2017-07-20 | 11 | -34/+1457 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add local group server support | ||||
| | * | | | | | | | Fix typo | Erik Johnston | 2017-07-20 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| | * | | | | | | Comments | Erik Johnston | 2017-07-18 | 4 | -13/+24 |
| | | | | | | | | |||||
| | * | | | | | | Comments | Erik Johnston | 2017-07-18 | 2 | -103/+88 |
| | | | | | | | | |||||
| | * | | | | | | Fix permissions | Erik Johnston | 2017-07-18 | 1 | -2/+6 |
| | | | | | | | | |||||
| | * | | | | | | Add DELETE | Erik Johnston | 2017-07-18 | 1 | -0/+46 |
| | | | | | | | | |||||
| | * | | | | | | Add 'args' param to post_json | Erik Johnston | 2017-07-18 | 1 | -9/+15 |
| | | | | | | | | |||||
| | * | | | | | | Fix typos | Erik Johnston | 2017-07-18 | 3 | -12/+22 |
| | | | | | | | | |||||
| | * | | | | | | Correctly parse query params | Erik Johnston | 2017-07-18 | 1 | -19/+19 |
| | | | | | | | | |||||
| | * | | | | | | Update federation client pokes | Erik Johnston | 2017-07-18 | 1 | -13/+22 |
| | | | | | | | | |||||
| | * | | | | | | Add client apis | Erik Johnston | 2017-07-18 | 2 | -10/+188 |
| | | | | | | | | |||||
| | * | | | | | | Comments | Erik Johnston | 2017-07-18 | 2 | -15/+22 |
| | | | | | | | |