Commit Graph

7190 Commits (dc76a3e909535d99f0b6b4a76279a14685324dc4)
 

Author SHA1 Message Date
Erik Johnston 835ceeee76 Merge pull request #983 from matrix-org/erikj/retry_on_integrity_error 8 years ago
Erik Johnston b3682df2ca Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix 8 years ago
Erik Johnston 8ad8490cff Fix typo 8 years ago
Erik Johnston 59fa91fe88 Retry event persistence on IntegrityError 8 years ago
Erik Johnston 1b5436ad78 Merge pull request #979 from matrix-org/erikj/state_ids_api 8 years ago
Erik Johnston 257c41cc2e Fix typos. 8 years ago
Erik Johnston b4e2290d89 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids_api 8 years ago
Erik Johnston e3ee63578f Tidy up get_events 8 years ago
Erik Johnston ea0b767114 Merge pull request #982 from matrix-org/erikj/fix_port_script 8 years ago
Richard van der Hoff ab03912e94 Merge pull request #981 from matrix-org/rav/omit_device_displayname_if_null 8 years ago
Mark Haines 1fc50712d6 Factor out more common code from the jenkins scripts (#980) 8 years ago
Erik Johnston 7c7786d4e1 Allow upgrading from old port_from_sqlite3 format 8 years ago
Erik Johnston b0a14bf53e Handle the fact that some tables have negative rowid rows 8 years ago
Richard van der Hoff f131cd9e53 keys/query: Omit device displayname if null 8 years ago
Erik Johnston edb33eb163 Rename fields to _ids 8 years ago
Erik Johnston bcc9cda8ca Fix copy + paste fails 8 years ago
Richard van der Hoff 05e3354047 Merge pull request #978 from matrix-org/rav/device_name_in_e2e_devices 8 years ago
Richard van der Hoff 3364d96c6b Merge pull request #977 from matrix-org/rav/return_all_devices 8 years ago
Richard van der Hoff 98385888b8 PEP8 8 years ago
Richard van der Hoff 68264d7404 Include device name in /keys/query response 8 years ago
Richard van der Hoff 91fa69e029 keys/query: return all users which were asked for 8 years ago
Erik Johnston 4c56bedee3 Actually call get_room_state 8 years ago
Erik Johnston 520ee9bd2c Fix syntax error 8 years ago
Erik Johnston a60a2eaa02 Comment 8 years ago
Erik Johnston e3a720217a Add /state_ids federation API 8 years ago
Richard van der Hoff 530bc862dc Merge branch 'rav/null_default_device_displayname' into develop 8 years ago
Richard van der Hoff a6f5cc65d9 PEP8 8 years ago
Richard van der Hoff e555bc6551 Merge branch 'rav/refactor_device_query' into develop 8 years ago
Richard van der Hoff a843868fe9 E2eKeysHandler: minor tweaks 8 years ago
Erik Johnston f5da3bacb2 Merge pull request #975 from matrix-org/erikj/multi_event_persist 8 years ago
Erik Johnston 97f072db74 Print status code in federation_client.py 8 years ago
Erik Johnston 80ad710217 Remove other bit of deduplication 8 years ago
Richard van der Hoff 4fec5e57be Default device_display_name to null 8 years ago
Erik Johnston a8a32d2714 Ensure we only persist an event once at a time 8 years ago
Mark Haines 921f17f938 Merge branch 'develop' into rav/refactor_device_query 8 years ago
Mark Haines 9a2f296fa2 Factor out some of the code shared between the sytest scripts (#974) 8 years ago
Erik Johnston 58c9653c6b Don't infer paragrahs from newlines 8 years ago
Erik Johnston 6b58ade2f0 Comment on why we clone 8 years ago
Erik Johnston 9e66c58ceb Spelling. 8 years ago
Erik Johnston f83f5fbce8 Make it actually compile 8 years ago
Erik Johnston aecaec3e10 Change the way we summarize URLs 8 years ago
Richard van der Hoff 1efee2f52b E2E keys: Make federation query share code with client query 8 years ago
Erik Johnston 49e047c55e Bump version and changelog 8 years ago
Erik Johnston 59a2c6d60e Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 8 years ago
Erik Johnston 06f812b95c Merge pull request #971 from matrix-org/erikj/fed_state 8 years ago
Erik Johnston c9154b970c Don't double wrap 200 8 years ago
Erik Johnston b3d5c4ad9d Fix response cache 8 years ago
Erik Johnston 456544b621 Typo 8 years ago
Erik Johnston d199f2248f Change wording 8 years ago
Erik Johnston 8f650bd338 Bump changeog and version 8 years ago