Commit Graph

1393 Commits

Author SHA1 Message Date
Kegan Dougal f3bb3943c9 Remove test_pyflakes. 2014-10-27 11:13:04 +00:00
Mark Haines 7bd604e3be Test pyflakes jenikns integration 2014-10-27 10:56:38 +00:00
Mark Haines d56e389a95 Fix pyflakes warnings 2014-10-27 10:33:17 +00:00
Mark Haines 15be181642 Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 doesn't seem to have ECC 2014-10-24 19:27:12 +01:00
Mark Haines db2e350e29 Wrap preparing the database in a transaction. Otherwise it will take many seconds to complete because sqlite will create a transaction per statement 2014-10-24 19:04:26 +01:00
Matthew Hodgson 1342bcedaf switch from the deprecated msg.content.prev to msg.prev_content.membership, and fix the bug where kicks of unjoined users aren't displayed sensibly in the history 2014-10-24 16:14:47 +01:00
Mark Haines be6d41ffe5 Merge branch 'master' into develop 2014-10-24 10:57:38 +01:00
Kegan Dougal 53f69bf089 Added pylint config file: ignore missing-docstring messages. 2014-10-24 10:22:09 +01:00
David Baker 51edfeb3d0 Coturn's timestamps are in seconds, not milliseconds 2014-10-21 18:57:13 +01:00
manuroe 9e57ed2b1f Added a param (--no-rate-limit) to demo/start.sh to disable the HS rate limit 2014-10-20 18:35:39 +01:00
Erik Johnston 4ae0844ee3 Merge branch 'master' of github.com:matrix-org/synapse into develop 2014-10-20 17:53:18 +01:00
Mark Haines 06a5a40e90 use a tagged version of syutil rather than master 2014-10-20 15:11:01 +01:00
Mark Haines f0382357ca Use https link to download syutil as not everyone has ssh access to github. 2014-10-20 14:43:37 +01:00
Mark Haines 4be99c2989 Add get_json method to 3pid http client. Better logging for errors in 3pid requests 2014-10-20 14:10:08 +01:00
Mark Haines 9c0826592c Fix auto generating signing_keys 2014-10-18 16:56:44 +01:00
Matthew Hodgson 8f0997d17d improve changelog slightly 2014-10-18 11:46:11 +01:00
Matthew Hodgson 58b1a891ce fix timestamps some more
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse
2014-10-17 23:54:21 +01:00
Matthew Hodgson e9abbe89f3 more timestamp fixes 2014-10-17 23:53:24 +01:00
Erik Johnston b3e6cd59a1 Bump the other version 2014-10-18 00:29:55 +02:00
Erik Johnston f22d023c4b Bump version 2014-10-18 00:29:15 +02:00
Erik Johnston 4c8111ef98 Bunp to change log. 2014-10-18 00:28:36 +02:00
Erik Johnston f05dce54a7 Merge pull request #9 from matrix-org/develop
Fix issue with timestamps in webclient
2014-10-18 00:25:57 +02:00
Matthew Hodgson 514e0fd4b6 fix webclient to know about right timestamps 2014-10-17 23:11:55 +01:00
Erik Johnston cb939ed450 I can't type apparently 2014-10-17 21:29:28 +01:00
Erik Johnston 7ea38a0c9d Update changelong and upgrade 2014-10-17 21:28:32 +01:00
Erik Johnston f1ddbfaae4 Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse into develop 2014-10-17 21:04:07 +01:00
Erik Johnston 449739e6a3 Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse 2014-10-17 21:02:16 +01:00
Erik Johnston ac9345b47a Check that we have auth headers and fail nicely 2014-10-17 21:00:58 +01:00
Erik Johnston cd198dfea8 More log lines. 2014-10-17 20:58:47 +01:00
Mark Haines 3187b5ba2d add log line for checking verifying signatures 2014-10-17 20:56:21 +01:00
Erik Johnston 5356044b77 Bump syutil dependency 2014-10-17 20:35:28 +01:00
Erik Johnston 71e6a94af7 Bump version and changelog 2014-10-17 20:26:26 +01:00
Erik Johnston 5662be894e Bump database version number. 2014-10-17 20:26:18 +01:00
Erik Johnston a065becea5 Merge branch 'docs-restructuring' of github.com:matrix-org/synapse into develop 2014-10-17 20:18:02 +01:00
Mark Haines 82c5820767 keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema 2014-10-17 17:31:48 +01:00
Mark Haines f5cf7ac25b SPEC-7: Rename 'ts' to 'origin_server_ts' 2014-10-17 17:12:25 +01:00
Mark Haines 456017e0ae SPEC-7: Don't stamp event contents with 'hsob_ts' 2014-10-17 16:55:55 +01:00
Matthew Hodgson be2a9a8d1a move gendoc into matrix-doc project 2014-10-17 02:09:07 +01:00
Kegan Dougal 79bd6e77b8 Remove warning since the end result is still $sanitize'd 2014-10-15 14:45:38 +01:00
Kegan Dougal da19fd0d1a Add unsanitizedLinky filter to fix links in formatted messages.
This filter is identical to ngSanitize's linky but instead of
sanitizing text which isn't linkified in the addText function,
it doesn't.
2014-10-15 14:42:14 +01:00
Kegan Dougal 07890b43ca Remove org.matrix.custom.text.html event type and replace it with 'format' and 'formatted_body' keys on m.text messages 2014-10-15 13:57:19 +01:00
Kegan Dougal f4667f86af Add support for org.matrix.custom.text.html
This format will remain undocumented as it is not yet suitable for
introduction into the specification.
2014-10-15 09:32:02 +01:00
Paul "LeoNerd" Evans 13b560971e Make sure to return an empty JSON object ({}) from presence PUT/POST requests rather than an empty string ("") because most deserialisers won't like the latter 2014-10-14 16:48:15 +01:00
Mark Haines 9aed791fc3 SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin from the transaction itself 2014-10-14 16:44:27 +01:00
Mark Haines f74e850b5c remove debugging logging for signing requests 2014-10-14 11:46:13 +01:00
Erik Johnston 4fe5dfa74c Note that this breaks federation 2014-10-14 10:30:50 +01:00
Mark Haines 636a0dbde7 Merge pull request #8 from matrix-org/server2server_signing
Server2server signing
2014-10-14 10:06:04 +01:00
Matthew Hodgson c18a6433d4 typoe 2014-10-13 23:24:14 +01:00
Mark Haines 34034af1c9 Better response message when signature is missing or unsupported 2014-10-13 16:47:23 +01:00
Mark Haines 07639c79d9 Respond with more helpful error messages for unsigned requests 2014-10-13 16:39:15 +01:00