Erik Johnston
|
c372929ab6
|
Remove duplicate import
|
2014-10-27 16:31:39 +00:00 |
|
Erik Johnston
|
ad9226eeec
|
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
synapse/storage/__init__.py
|
2014-10-27 11:58:32 +00:00 |
|
Mark Haines
|
5e2236f9ff
|
fix pyflakes warnings
|
2014-10-27 11:19:15 +00:00 |
|
Mark Haines
|
acb2d171e8
|
Merge branch 'develop' into event_signing
|
2014-10-27 11:14:11 +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 |
|
Erik Johnston
|
bb4a20174c
|
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
synapse/federation/transport.py
synapse/handlers/message.py
|
2014-10-27 10:20:44 +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 |
|
Mark Haines
|
eea3a29699
|
Add script to hash exisitng history
|
2014-10-17 20:36:04 +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 |
|
Erik Johnston
|
bf8cdda2f5
|
It doesn't want a dict
|
2014-10-17 20:10:34 +01:00 |
|
Mark Haines
|
8afbece683
|
Remove signatures from pdu when computing hashes to use for prev pdus, make sure is_state is a boolean.
|
2014-10-17 19:41:32 +01:00 |
|
Erik Johnston
|
b3b1961496
|
Fix bug where people could join private rooms
|
2014-10-17 19:37:41 +01:00 |
|
Erik Johnston
|
5ffe5ab43f
|
Use state groups to get current state. Make join dance actually work.
|
2014-10-17 18:56:42 +01:00 |
|
Mark Haines
|
dc3c2823ac
|
Merge branch 'develop' into event_signing
Conflicts:
synapse/federation/replication.py
|
2014-10-17 17:33:58 +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 |
|
Mark Haines
|
c5cec1cc77
|
Rename 'meta' to 'unsigned'
|
2014-10-17 16:50:04 +01:00 |
|
Mark Haines
|
4d1a7624f4
|
move 'age' into 'meta' subdict so that it is clearer that it is not part of the signed data
|
2014-10-17 15:27:11 +01:00 |
|
Erik Johnston
|
f71627567b
|
Finish implementing the new join dance.
|
2014-10-17 15:04:17 +01:00 |
|