Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | Fix a couple of python bugs | Erik Johnston | 2016-08-05 | 1 | -6/+8 | |
| | | * | | Retry joining via other servers if first one failed | Erik Johnston | 2016-08-05 | 1 | -5/+16 | |
| | * | | | Merge pull request #990 from matrix-org/erikj/fed_vers | Erik Johnston | 2016-08-05 | 6 | -49/+80 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Add federation /version API | Erik Johnston | 2016-08-05 | 6 | -9/+25 | |
| | | * | | Change the way we specify if we require auth or not | Erik Johnston | 2016-08-05 | 1 | -40/+55 | |
| | * | | | Print newline after result in federation_client script | Erik Johnston | 2016-08-05 | 1 | -0/+1 | |
| | * | | | Merge pull request #989 from matrix-org/erikj/raise_404 | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| | |\ \ \ | ||||||
| | | * | | | Raise 404 when couldn't find event | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| | | |/ / | ||||||
| | * | | | Merge pull request #988 from matrix-org/erikj/ignore_comments_preview | Erik Johnston | 2016-08-05 | 1 | -1/+2 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | Don't include html comments in description | Erik Johnston | 2016-08-05 | 1 | -1/+2 | |
| | |/ / | ||||||
| * | | | Update changelog v0.17.0-rc4 | Erik Johnston | 2016-08-05 | 1 | -2/+2 | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-05 | 1 | -21/+50 | |
| |\| | | ||||||
| | * | | Merge pull request #987 from matrix-org/erikj/fix_backfill_auth | Erik Johnston | 2016-08-05 | 1 | -21/+50 | |
| | |\ \ | ||||||
| | | * | | Fix backfill auth events | Erik Johnston | 2016-08-05 | 1 | -21/+50 | |
| | |/ / | ||||||
| * | | | Bump version and changelog | Erik Johnston | 2016-08-05 | 2 | -1/+17 | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-05 | 25 | -369/+1070 | |
| |\| | | ||||||
| | * | | Merge pull request #986 from matrix-org/erikj/state | Erik Johnston | 2016-08-05 | 1 | -2/+16 | |
| | |\ \ | ||||||
| | | * | | Fix typo | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| | | * | | Check if we already have the events returned by /state/ | Erik Johnston | 2016-08-05 | 1 | -2/+16 | |
| | * | | | Merge pull request #985 from matrix-org/erikj/fix_integrity_retry | Erik Johnston | 2016-08-05 | 2 | -1/+9 | |
| | |\| | | ||||||
| | | * | | Delete more tables | Erik Johnston | 2016-08-05 | 1 | -0/+5 | |
| | | * | | Fallback to /state/ on both 400 and 404 | Erik Johnston | 2016-08-05 | 1 | -1/+1 | |
| | | * | | Tweak integrity error recovery to work as intended | Benjamin Saunders | 2016-08-04 | 2 | -1/+4 | |
| | |/ / | ||||||
| | * | | Merge pull request #973 from matrix-org/erikj/xpath_fix | Erik Johnston | 2016-08-04 | 2 | -14/+211 | |
| | |\ \ | ||||||
| | | * | | Typo | Erik Johnston | 2016-08-04 | 1 | -1/+1 | |
| | | * | | Test summarization | Erik Johnston | 2016-08-04 | 2 | -52/+193 | |
| | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix | Erik Johnston | 2016-08-04 | 23 | -349/+769 | |
| | | |\ \ | ||||||
| | | * | | | Don't infer paragrahs from newlines | Erik Johnston | 2016-08-02 | 1 | -2/+1 | |
| | | * | | | Comment on why we clone | Erik Johnston | 2016-08-02 | 1 | -0/+1 | |
| | | * | | | Spelling. | Erik Johnston | 2016-08-02 | 1 | -3/+3 | |
| | | * | | | Make it actually compile | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
| | | * | | | Change the way we summarize URLs | Erik Johnston | 2016-08-02 | 1 | -11/+67 | |
| | * | | | | Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error | Erik Johnston | 2016-08-04 | 1 | -4/+66 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | | * | | | Fix typo | Erik Johnston | 2016-08-04 | 1 | -3/+4 | |
| | | * | | | Retry event persistence on IntegrityError | Erik Johnston | 2016-08-04 | 1 | -4/+65 | |
| | * | | | | Merge pull request #979 from matrix-org/erikj/state_ids_api | Erik Johnston | 2016-08-04 | 4 | -1/+151 | |
| | |\ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | * | | | Fix typos. | Erik Johnston | 2016-08-04 | 1 | -3/+3 | |
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api | Erik Johnston | 2016-08-04 | 18 | -305/+572 | |
| | | |\ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | Merge pull request #982 from matrix-org/erikj/fix_port_script | Erik Johnston | 2016-08-04 | 1 | -43/+132 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Allow upgrading from old port_from_sqlite3 format | Erik Johnston | 2016-08-04 | 1 | -0/+21 | |
| | | * | | | | Handle the fact that some tables have negative rowid rows | Erik Johnston | 2016-08-04 | 1 | -43/+111 | |
| | * | | | | | Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_null | Richard van der Hoff | 2016-08-04 | 1 | -3/+4 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | keys/query: Omit device displayname if null | Richard van der Hoff | 2016-08-04 | 1 | -3/+4 | |
| | * | | | | | | Factor out more common code from the jenkins scripts (#980) | Mark Haines | 2016-08-04 | 4 | -138/+44 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devices | Richard van der Hoff | 2016-08-03 | 3 | -20/+141 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | PEP8 | Richard van der Hoff | 2016-08-03 | 2 | -12/+10 | |
| | | * | | | | | Include device name in /keys/query response | Richard van der Hoff | 2016-08-03 | 3 | -20/+143 | |
| | * | | | | | | Merge pull request #977 from matrix-org/rav/return_all_devices | Richard van der Hoff | 2016-08-03 | 2 | -3/+52 | |
| | |\| | | | | | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | keys/query: return all users which were asked for | Richard van der Hoff | 2016-08-03 | 2 | -3/+52 | |
| | |/ / / / | ||||||
| | * | | | | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 4 | -5/+23 | |
| | |\ \ \ \ | ||||||
| | | * | | | | PEP8 | Richard van der Hoff | 2016-08-03 | 1 | -1/+1 | |
| | | * | | | | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 4 | -5/+23 | |
| | * | | | | | Merge branch 'rav/refactor_device_query' into develop | Richard van der Hoff | 2016-08-03 | 6 | -82/+167 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | E2eKeysHandler: minor tweaks | Richard van der Hoff | 2016-08-03 | 1 | -5/+3 | |
| | | * | | | | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 22 | -139/+507 | |
| | | |\| | | | | ||||||
| | | * | | | | | E2E keys: Make federation query share code with client query | Richard van der Hoff | 2016-08-02 | 3 | -47/+92 | |
| | | * | | | | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 4 | -60/+102 | |
| | * | | | | | | Merge pull request #975 from matrix-org/erikj/multi_event_persist | Erik Johnston | 2016-08-03 | 1 | -20/+18 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Remove other bit of deduplication | Erik Johnston | 2016-08-03 | 1 | -19/+0 | |
| | | * | | | | | | Ensure we only persist an event once at a time | Erik Johnston | 2016-08-03 | 1 | -1/+18 | |
| | | | |_|_|/ / | | | |/| | | | | ||||||
| | | | | | * | | Tidy up get_events | Erik Johnston | 2016-08-04 | 1 | -12/+10 | |
| | | | | | * | | Rename fields to _ids | Erik Johnston | 2016-08-03 | 2 | -4/+4 | |
| | | | | | * | | Fix copy + paste fails | Erik Johnston | 2016-08-03 | 2 | -6/+11 | |
| | | | | | * | | Actually call get_room_state | Erik Johnston | 2016-08-03 | 1 | -0/+4 | |
| | | | | | * | | Fix syntax error | Erik Johnston | 2016-08-03 | 1 | -1/+8 | |
| | | | | | * | | Comment | Erik Johnston | 2016-08-03 | 1 | -0/+14 | |
| | | | | | * | | Add /state_ids federation API | Erik Johnston | 2016-08-03 | 4 | -3/+125 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| | * | | | | | Print status code in federation_client.py | Erik Johnston | 2016-08-03 | 1 | -0/+1 | |
| | | |_|/ / | | |/| | | | ||||||
| | * | | | | Factor out some of the code shared between the sytest scripts (#974) | Mark Haines | 2016-08-02 | 6 | -69/+71 | |
| | |/ / / | ||||||
| * | | | | Bump version and changelog v0.17.0-rc3 | Erik Johnston | 2016-08-02 | 2 | -2/+8 | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-08-02 | 27 | -122/+745 | |
| |\| | | | ||||||
| | * | | | Merge pull request #971 from matrix-org/erikj/fed_state | Erik Johnston | 2016-08-02 | 1 | -3/+3 | |
| | |\ \ \ | ||||||
| | | * | | | Don't double wrap 200 | Erik Johnston | 2016-08-02 | 1 | -2/+2 | |
| | | * | | | Fix response cache | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #940 from matrix-org/erikj/fed_state_cache | Erik Johnston | 2016-08-02 | 5 | -32/+60 | |
| | |\ \ \ | ||||||
| | | * | | | Cache federation state responses | Erik Johnston | 2016-07-21 | 5 | -32/+60 | |
| | * | | | | Print authorization header for federation_client.py | Erik Johnston | 2016-08-02 | 1 | -5/+6 | |
| | * | | | | Merge pull request #967 from matrix-org/erikj/fed_reader | Erik Johnston | 2016-08-02 | 10 | -24/+350 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Change default jenkins port base and count | Erik Johnston | 2016-08-02 | 3 | -6/+7 | |
| | | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-08-02 | 4 | -4/+24 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Make jenkins dendron test federation read apis | Erik Johnston | 2016-07-29 | 1 | -0/+1 | |
| | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 1 | -4/+31 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader | Erik Johnston | 2016-07-29 | 54 | -345/+1250 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | Add destination retry to slave store | Erik Johnston | 2016-07-28 | 2 | -0/+32 | |
| | | * | | | | | | | Add slace storage functions for public room list | Erik Johnston | 2016-07-28 | 3 | -0/+48 | |
| | | * | | | | | | | Add get_auth_chain to slave store | Erik Johnston | 2016-07-28 | 1 | -0/+4 | |
| | | * | | | | | | | Add more key storage funcs into slave store | Erik Johnston | 2016-07-28 | 2 | -24/+26 | |
| | | * | | | | | | | Split out a FederationReader process | Erik Johnston | 2016-07-21 | 4 | -0/+238 | |
| | * | | | | | | | | Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_register | David Baker | 2016-08-02 | 1 | -9/+7 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | Merge branch 'develop' into dbkr/fix_add_email_on_register | Mark Haines | 2016-08-02 | 4 | -4/+24 | |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #970 from matrix-org/erikj/clock | Erik Johnston | 2016-08-02 | 2 | -3/+16 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | ||||||
| | | * | | | | | | | Ignore AlreadyCalled errors on timer cancel | Erik Johnston | 2016-07-31 | 2 | -3/+16 | |
| | * | | | | | | | | missing --upgrade | Matthew Hodgson | 2016-08-01 | 1 | -1/+1 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Merge pull request #958 from matrix-org/paul/SYN-738 | Paul Evans | 2016-07-29 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | ||||||
| | | * | | | | | | Forbid non-ASes from registering users whose names begin with '_' (SYN-738) | Paul "LeoNerd" Evans | 2016-07-27 | 1 | -0/+7 | |
| | | | * | | | | | Fix adding emails on registration | David Baker | 2016-07-29 | 1 | -9/+7 | |
| | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #964 from matrix-org/erikj/fed_join_fix | Erik Johnston | 2016-07-29 | 1 | -4/+31 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | | * | | | | | Mention that func will fetch auth events | Erik Johnston | 2016-07-29 | 1 | -0/+2 | |
| | | * | | | | | Update docstring | Erik Johnston | 2016-07-29 | 1 | -0/+6 | |
| | | * | | | | | Handle the case of missing auth events when joining a room | Erik Johnston | 2016-07-28 | 1 | -4/+23 | |
| | * | | | | | | Merge pull request #966 from matrix-org/markjh/fix_push | Mark Haines | 2016-07-29 | 5 | -52/+205 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Fix SQL to supply arguments in the same order | Mark Haines | 2016-07-29 | 1 | -1/+1 | |
| | | * | | | | | | Create separate methods for getting messages to push | Mark Haines | 2016-07-28 | 5 | -51/+204 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #965 from matrix-org/kegan/comment-push-actions-fn | Kegsay | 2016-07-28 | 1 | -2/+26 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Comment get_unread_push_actions_for_user_in_range function | Kegan Dougal | 2016-07-28 | 1 | -2/+26 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #963 from matrix-org/erikj/admin_docs | Erik Johnston | 2016-07-28 | 3 | -0/+46 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Use correct path | Erik Johnston | 2016-07-28 | 1 | -1/+1 | |
| | | * | | | | | | Add some basic admin API docs | Erik Johnston | 2016-07-28 | 3 | -0/+46 | |
| | | |/ / / / / | ||||||
| | * | | | | | | Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-07-28 | 2 | -1/+65 | |
| | |\| | | | | | ||||||
| | * | | | | | | Merge pull request #962 from matrix-org/markjh/retry | Mark Haines | 2016-07-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Fix retry utils to check if the exception is a subclass of CME | Mark Haines | 2016-07-28 | 1 | -1/+1 | |
| | * | | | | | | | Merge pull request #941 from matrix-org/erikj/key_client_fix | Erik Johnston | 2016-07-28 | 1 | -3/+9 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Typo v0.17.0-rc2 | Erik Johnston | 2016-08-02 | 1 | -1/+1 | |
| * | | | | | | | | Change wording | Erik Johnston | 2016-08-02 | 1 | -2/+2 | |
| * | | | | | | | | Bump changeog and version | Erik Johnston | 2016-08-02 | 2 | -1/+18 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | Add authors to changelog v0.17.0-rc1 | Erik Johnston | 2016-07-28 | 1 | -4/+5 | |
| * | | | | | | | Update changelog | Erik Johnston | 2016-07-28 | 1 | -0/+4 | |
| * | | | | | | | Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into rel... | Erik Johnston | 2016-07-28 | 1 | -3/+9 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | Cache getPeer | Erik Johnston | 2016-07-21 | 1 | -2/+5 | |
| | * | | | | | | Set host not path | Erik Johnston | 2016-07-21 | 1 | -1/+1 | |
| | * | | | | | | Send the correct host header when fetching keys | Erik Johnston | 2016-07-21 | 1 | -3/+6 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Bump version and changelog | Erik Johnston | 2016-07-28 | 2 | -3/+6 | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 | Erik Johnston | 2016-07-28 | 7 | -14/+85 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name | Erik Johnston | 2016-07-28 | 1 | -1/+4 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Don't include name of room for invites in push | David Baker | 2016-07-28 | 1 | -1/+4 | |
| | * | | | | | | Merge pull request #960 from matrix-org/rav/support_r0.2 | Richard van der Hoff | 2016-07-28 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | Add r0.1.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -0/+1 | |
| | | * | | | | | Add r0.2.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -1/+4 | |
| | * | | | | | | Typo | David Baker | 2016-07-28 | 1 | -1/+1 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload | Richard van der Hoff | 2016-07-27 | 4 | -11/+75 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | | * | | | | key upload tweaks | Richard van der Hoff | 2016-07-27 | 1 | -7/+5 | |
| | | * | | | | SQL syntax fix | Richard van der Hoff | 2016-07-27 | 1 | -1/+1 | |
| | | * | | | | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 3 | -4/+28 | |
| | | * | | | | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 2 | -12/+54 | |
| * | | | | | | Bump CHANGES and version | Erik Johnston | 2016-07-27 | 2 | -1/+57 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #957 from matrix-org/markjh/verify | Mark Haines | 2016-07-27 | 1 | -74/+80 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'develop' into markjh/verify | Mark Haines | 2016-07-27 | 2 | -3/+11 | |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #955 from matrix-org/markjh/only_from2 | Mark Haines | 2016-07-27 | 1 | -2/+9 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add a couple more checks to the keyring | Mark Haines | 2016-07-26 | 1 | -2/+9 | |
| * | | | | | | | Merge pull request #954 from matrix-org/markjh/even_more_fixes | Mark Haines | 2016-07-27 | 2 | -9/+11 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Fix a couple of bugs in the transaction and keyring code | Mark Haines | 2016-07-26 | 2 | -9/+11 | |
| | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | Clean up verify_json_objects_for_server | Mark Haines | 2016-07-27 | 1 | -68/+75 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #952 from matrix-org/markjh/more_fixes | Mark Haines | 2016-07-26 | 1 | -0/+4 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Check if the user is banned when handling 3pid invites | Mark Haines | 2016-07-26 | 1 | -0/+4 | |
| * | | | | | Merge pull request #953 from matrix-org/rav/requester | Richard van der Hoff | 2016-07-26 | 11 | -75/+101 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 11 | -75/+101 | |
| |/ / / / | ||||||
| * | | | | Fix typo | Richard van der Hoff | 2016-07-26 | 1 | -1/+1 | |
| * | | | | Merge branch 'develop' into rav/delete_refreshtoken_on_delete_device | Richard van der Hoff | 2016-07-26 | 3 | -59/+115 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #951 from matrix-org/rav/flake8 | Richard van der Hoff | 2016-07-26 | 2 | -9/+5 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Fix flake8 violation | Richard van der Hoff | 2016-07-26 | 1 | -5/+3 | |
| | | * | | | | Fix flake8 configuration | Richard van der Hoff | 2016-07-26 | 1 | -4/+2 | |
| | * | | | | | Merge pull request #948 from matrix-org/markjh/auth_fixes | Mark Haines | 2016-07-26 | 1 | -50/+110 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | Fix how push_actions are redacted. | Mark Haines | 2016-07-26 | 1 | -8/+10 | |
| | | * | | | | Don't add rejected events if we've seen them befrore. Add some comments to ex... | Mark Haines | 2016-07-26 | 1 | -5/+48 | |
| | | * | | | | Only update the events and event_json tables for rejected events | Mark Haines | 2016-07-25 | 2 | -52/+63 | |
| | | * | | | | Don't add the events to forward extremities if the event is rejected | Mark Haines | 2016-07-25 | 1 | -3/+6 | |
| | | * | | | | Don't add rejections to the state_group, persist all rejections | Mark Haines | 2016-07-25 | 2 | -5/+6 | |
| * | | | | | | Delete refresh tokens when deleting devices | Richard van der Hoff | 2016-07-26 | 3 | -15/+83 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #949 from matrix-org/rav/update_devices | David Baker | 2016-07-26 | 13 | -28/+295 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Implement updating devices | Richard van der Hoff | 2016-07-26 | 5 | -8/+119 | |
| | * | | | | | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 11 | -21/+176 | |
| | * | | | | | Log when adding listeners | Richard van der Hoff | 2016-07-25 | 1 | -0/+1 | |
| * | | | | | | federation doesn't work over ipv6 yet thanks to twisted | Matthew Hodgson | 2016-07-26 | 1 | -1/+1 | |
| * | | | | | | typo | Matthew Hodgson | 2016-07-26 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #946 from matrix-org/dbkr/log_recaptcha_hostname | David Baker | 2016-07-25 | 1 | -2/+11 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Use get to avoid KeyErrors | David Baker | 2016-07-22 | 1 | -1/+1 | |
| | * | | | | Log the hostname the reCAPTCHA was completed on | David Baker | 2016-07-22 | 1 | -2/+11 | |
| * | | | | | fix: defer.returnValue takes one argument | Mark Haines | 2016-07-25 | 1 | -1/+1 | |
| * | | | | | background updates: fix assert again | Richard van der Hoff | 2016-07-25 | 1 | -1/+1 | |
| * | | | | | background updates: Fix assertion to do something | Richard van der Hoff | 2016-07-25 | 1 | -2/+2 | |
| * | | | | | Merge pull request #945 from matrix-org/rav/background_reindex | Richard van der Hoff | 2016-07-25 | 4 | -23/+113 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | PEP8 | Richard van der Hoff | 2016-07-25 | 1 | -1/+1 | |
| | * | | | | | Fix background_update tests | Richard van der Hoff | 2016-07-25 | 2 | -13/+36 | |
| | * | | | | | PEP8 | Richard van der Hoff | 2016-07-22 | 1 | -1/+0 | |
| | * | | | | | Create index on user_ips in the background | Richard van der Hoff | 2016-07-22 | 3 | -12/+80 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #947 from matrix-org/rav/unittest_logging | Richard van der Hoff | 2016-07-25 | 1 | -4/+7 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Slightly saner logging for unittests | Richard van der Hoff | 2016-07-25 | 1 | -4/+7 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #944 from matrix-org/rav/devices_returns_list | David Baker | 2016-07-21 | 2 | -9/+12 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | make /devices return a list | Richard van der Hoff | 2016-07-21 | 2 | -9/+12 | |
| |/ / / | ||||||
| * | | | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 3 | -19/+90 | |
| |\ \ \ | ||||||
| | * | | | Fix PEP8 errors | Richard van der Hoff | 2016-07-21 | 2 | -1/+2 | |
| | * | | | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 3 | -19/+89 | |
| * | | | | Merge pull request #942 from matrix-org/rav/fix_register_deviceid | David Baker | 2016-07-21 | 1 | -11/+10 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Preserve device_id from first call to /register | Richard van der Hoff | 2016-07-21 | 1 | -11/+10 | |
| | |/ / | ||||||
| * | | | Merge branch 'rav/get_devices_api' into develop | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 | |
| |\ \ \ | ||||||
| | * | | | storage/client_ips: remove some dead code | Richard van der Hoff | 2016-07-21 | 1 | -3/+0 | |
| * | | | | Merge pull request #939 from matrix-org/rav/get_devices_api | David Baker | 2016-07-21 | 10 | -17/+395 | |
| |\| | | | | |/ / | |/| | | ||||||
| | * | | Fix PEP8 errors | Richard van der Hoff | 2016-07-20 | 2 | -3/+1 | |
| | * | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 6 | -26/+86 | |
| | |\ \ | | |/ / | |/| | | ||||||
| * | | | Merge pull request #938 from matrix-org/rav/add_device_id_to_client_ips | Richard van der Hoff | 2016-07-20 | 3 | -8/+34 | |
| |\ \ \ | ||||||
| | * | | | Record device_id in client_ips | Richard van der Hoff | 2016-07-20 | 3 | -8/+34 | |
| * | | | | Don't explode if we have no snapshots yet | Erik Johnston | 2016-07-20 | 1 | -0/+3 | |
| * | | | | Merge pull request #937 from matrix-org/rav/register_device_on_register | David Baker | 2016-07-20 | 2 | -18/+49 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Register a device_id in the /v2/register flow. | Richard van der Hoff | 2016-07-20 | 2 | -18/+49 | |
| | | * | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 10 | -17/+397 | |
| | |/ / | |/| | | ||||||
| * | | | More doc-comments | Richard van der Hoff | 2016-07-20 | 2 | -10/+14 | |
| |/ / | ||||||
| * | | Merge pull request #936 from matrix-org/erikj/log_rss | Erik Johnston | 2016-07-20 | 5 | -1/+54 | |
| |\ \ | ||||||
| | * | | Make jenkins install deps on unit tests | Erik Johnston | 2016-07-20 | 1 | -0/+4 | |
| | * | | Add metrics for psutil derived memory usage | Erik Johnston | 2016-07-20 | 4 | -1/+50 | |
| * | | | Merge pull request #935 from matrix-org/erikj/backfill_notifs | Erik Johnston | 2016-07-20 | 1 | -5/+6 | |
| |\ \ \ | ||||||
| | * | | | Don't notify pusher pool for backfilled events | Erik Johnston | 2016-07-20 | 1 | -5/+6 | |
| | |/ / | ||||||
| * | | | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 7 | -0/+47 | |
| |\ \ \ | ||||||
| | * | | | MANIFEST.in: Add *.pyi | Richard van der Hoff | 2016-07-19 | 1 | -0/+1 | |
| | * | | | Type annotations | Richard van der Hoff | 2016-07-19 | 6 | -0/+46 | |
| * | | | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 5 | -22/+57 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 5 | -22/+57 | |
| | |/ / | ||||||
| * | | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 8 | -15/+246 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Comment | Erik Johnston | 2016-07-20 | 1 | -0/+4 | |
| | * | | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 4 | -11/+29 | |
| | * | | Add support for filters in paginate_room_events | Erik Johnston | 2016-07-14 | 1 | -1/+51 | |
| | * | | Add 'contains_url' to filter | Erik Johnston | 2016-07-14 | 1 | -3/+20 | |
| | * | | Add sender and contains_url field to events table | Erik Johnston | 2016-07-14 | 2 | -0/+142 | |
| * | | | Merge pull request #931 from matrix-org/rav/refactor_register | David Baker | 2016-07-19 | 2 | -79/+104 | |
| |\ \ \ | ||||||
| | * | | | Don't bind email unless threepid contains expected fields | Richard van der Hoff | 2016-07-19 | 1 | -28/+25 | |
| | * | | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | Richard van der Hoff | 2016-07-19 | 2 | -76/+104 | |
| * | | | | Merge pull request #929 from matrix-org/rav/support_deviceid_in_login | Richard van der Hoff | 2016-07-19 | 12 | -31/+354 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | schema fix | Richard van der Hoff | 2016-07-19 | 1 | -1/+1 | |
| | * | | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 12 | -31/+354 | |
| * | | | | Merge pull request #930 from matrix-org/markjh/handlers | Mark Haines | 2016-07-19 | 1 | -3/+14 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Summary line | Mark Haines | 2016-07-19 | 1 | -2/+1 | |
| | * | | | Update docstring on Handlers. | Mark Haines | 2016-07-19 | 1 | -3/+15 | |
| |/ / / | ||||||
| * | | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 | |
| |\ \ \ | ||||||
| | * | | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 2 | -65/+82 | |
| * | | | | Merge pull request #924 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-18 | 1 | -19/+15 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix /purge_history bug | Erik Johnston | 2016-07-15 | 1 | -19/+15 | |
| * | | | | | Merge pull request #925 from matrix-org/markjh/auth_fix | Mark Haines | 2016-07-18 | 1 | -0/+5 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix 500 ISE when sending alias event without a state_key | Mark Haines | 2016-07-15 | 1 | -0/+5 | |
| * | | | | | | Merge pull request #927 from Half-Shot/develop | Erik Johnston | 2016-07-18 | 1 | -5/+6 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | Use body.get to check for 'user' | Will Hunt | 2016-07-16 | 1 | -2/+1 | |
| | * | | | | | Fall back to 'username' if 'user' is not given for appservice reg. | Will Hunt | 2016-07-16 | 1 | -3/+5 | |
| | |/ / / / | ||||||
| * / / / / | Fix a doc-comment | Richard van der Hoff | 2016-07-18 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #923 from matrix-org/erikj/purge_history | Erik Johnston | 2016-07-15 | 2 | -2/+13 | |
| |\| | | | ||||||
| | * | | | Pull out min stream_ordering from ex_outlier_stream | Erik Johnston | 2016-07-15 | 1 | -1/+2 | |
| | * | | | event_backwards_extremeties may not be empty | Erik Johnston | 2016-07-15 | 1 | -1/+11 | |
| * | | | | Merge pull request #919 from matrix-org/erikj/auth_fix | Erik Johnston | 2016-07-15 | 3 | -5/+35 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Comment | Erik Johnston | 2016-07-15 | 2 | -0/+6 | |
| | * | | | Check sender signed event | Erik Johnston | 2016-07-14 | 3 | -6/+12 | |
| | * | | | Check if alias event's state_key matches sender's domain | Erik Johnston | 2016-07-13 | 1 | -0/+11 | |
| | * | | | Check creation event's room_id domain matches sender's | Erik Johnston | 2016-07-13 | 1 | -0/+7 | |
| * | | | | Merge pull request #921 from matrix-org/erikj/account_deactivate | Erik Johnston | 2016-07-14 | 1 | -0/+44 | |
| |\ \ \ \ | ||||||
| | * | | | | Add hs object | Erik Johnston | 2016-07-14 | 1 | -0/+1 | |
| | * | | | | Only accept password auth | Erik Johnston | 2016-07-14 | 1 | -12/+0 | |
| | * | | | | Add an /account/deactivate endpoint | Erik Johnston | 2016-07-14 | 1 | -0/+55 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 6 | -9/+42 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 6 | -9/+42 | |
| | |/ / | ||||||
| * | | | Merge pull request #915 from matrix-org/dbkr/more_requesttokens | David Baker | 2016-07-13 | 3 | -30/+103 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | be more pythonic | David Baker | 2016-07-12 | 1 | -1/+1 | |
| | * | | on_OPTIONS isn't neccessary | David Baker | 2016-07-12 | 2 | -10/+1 | |
| | * | | Remove other debug logging | David Baker | 2016-07-12 | 1 | -2/+0 | |
| | * | | Separate out requestTokens to separate handlers | David Baker | 2016-07-11 | 2 | -65/+93 |