Commit Graph

6942 Commits (18e044628ed9cd6e034967e283784cf0a284a17d)
 

Author SHA1 Message Date
Erik Johnston 18e044628e Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 8 years ago
Erik Johnston b557b682d9 Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name 8 years ago
David Baker 389c890f14 Don't include name of room for invites in push 8 years ago
Richard van der Hoff cd8738ab63 Merge pull request #960 from matrix-org/rav/support_r0.2 8 years ago
Richard van der Hoff f6f8f81a48 Add r0.1.0 to the "supported versions" list 8 years ago
David Baker ecd5e6bfa4 Typo 8 years ago
Richard van der Hoff fda078f995 Add r0.2.0 to the "supported versions" list 8 years ago
Richard van der Hoff 40e539683c Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload 8 years ago
Erik Johnston 5238960850 Bump CHANGES and version 8 years ago
Richard van der Hoff ccec25e2c6 key upload tweaks 8 years ago
Mark Haines c38b7c4104 Merge pull request #957 from matrix-org/markjh/verify 8 years ago
Mark Haines 29b25d59c6 Merge branch 'develop' into markjh/verify 8 years ago
Mark Haines 884b800899 Merge pull request #955 from matrix-org/markjh/only_from2 8 years ago
Mark Haines 09d31815b4 Merge pull request #954 from matrix-org/markjh/even_more_fixes 8 years ago
Mark Haines fe1b369946 Clean up verify_json_objects_for_server 8 years ago
Richard van der Hoff 26cb0efa88 SQL syntax fix 8 years ago
Richard van der Hoff d47115ff8b Delete e2e keys on device delete 8 years ago
Richard van der Hoff 2e3d90d67c Make the device id on e2e key upload optional 8 years ago
Mark Haines a4b06b619c Add a couple more checks to the keyring 8 years ago
Mark Haines c63b1697f4 Merge pull request #952 from matrix-org/markjh/more_fixes 8 years ago
Mark Haines 87ffd21b29 Fix a couple of bugs in the transaction and keyring code 8 years ago
Richard van der Hoff 2452611d0f Merge pull request #953 from matrix-org/rav/requester 8 years ago
Richard van der Hoff eb359eced4 Add `create_requester` function 8 years ago
Mark Haines c824b29e77 Check if the user is banned when handling 3pid invites 8 years ago
Richard van der Hoff 33d7776473 Fix typo 8 years ago
Richard van der Hoff 9ad8d9b17c Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device 8 years ago
Richard van der Hoff 5b1825ba5b Merge pull request #951 from matrix-org/rav/flake8 8 years ago
Mark Haines 9c4cf83259 Merge pull request #948 from matrix-org/markjh/auth_fixes 8 years ago
Richard van der Hoff 05e7e5e972 Fix flake8 violation 8 years ago
Richard van der Hoff db4f823d34 Fix flake8 configuration 8 years ago
Richard van der Hoff 8e02494166 Delete refresh tokens when deleting devices 8 years ago
Mark Haines a6f06ce3e2 Fix how push_actions are redacted. 8 years ago
David Baker d34e9f93b7 Merge pull request #949 from matrix-org/rav/update_devices 8 years ago
Mark Haines efeb6176c1 Don't add rejected events if we've seen them befrore. Add some comments to explain what the code is doing mechanically 8 years ago
Matthew Hodgson 1a54513cf1 federation doesn't work over ipv6 yet thanks to twisted 8 years ago
Matthew Hodgson 242c52d607 typo 8 years ago
Richard van der Hoff 012b4c1913 Implement updating devices 8 years ago
Richard van der Hoff 436bffd15f Implement deleting devices 8 years ago
Mark Haines 1b3c3e6d68 Only update the events and event_json tables for rejected events 8 years ago
Richard van der Hoff 33d08e8433 Log when adding listeners 8 years ago
Mark Haines 8f7f4cb92b Don't add the events to forward extremities if the event is rejected 8 years ago
Mark Haines 2623cec874 Don't add rejections to the state_group, persist all rejections 8 years ago
David Baker 4fcdf7b4b2 Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname 8 years ago
Mark Haines 955ef1f06c fix: defer.returnValue takes one argument 8 years ago
Richard van der Hoff 2ee4c9ee02 background updates: fix assert again 8 years ago
Richard van der Hoff 9dbd903f41 background updates: Fix assertion to do something 8 years ago
Richard van der Hoff bf3de7b90b Merge pull request #945 from matrix-org/rav/background_reindex 8 years ago
Richard van der Hoff e73ad8de3b Merge pull request #947 from matrix-org/rav/unittest_logging 8 years ago
Richard van der Hoff 42f4feb2b7 PEP8 8 years ago
Richard van der Hoff f16f0e169d Slightly saner logging for unittests 8 years ago