Erik Johnston
|
2ebf795c0a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 11:10:37 +00:00 |
|
Erik Johnston
|
c1c7b39827
|
Fix bug where we changes in outlier in metadata dict propogated to other events
|
2015-01-30 10:30:54 +00:00 |
|
Erik Johnston
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
b9c442c85c
|
Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
|
2015-01-29 02:46:00 +00:00 |
|
Mark Haines
|
1b4a164c02
|
Add support for formatting events in the way a v2 client expects
|
2015-01-29 02:34:35 +00:00 |
|
Mark Haines
|
a56008842b
|
Start implementing incremental initial sync
|
2015-01-27 16:24:22 +00:00 |
|
Mark Haines
|
436513068d
|
Start implementing the non-incremental sync portion of the v2 /sync API
|
2015-01-26 18:53:31 +00:00 |
|
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +00:00 |
|
Erik Johnston
|
38e3241eb7
|
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
|
2015-01-13 10:01:22 +00:00 |
|
Erik Johnston
|
39585bf556
|
Insert 'age' into top level when returning events to clients
|
2015-01-13 09:57:32 +00:00 |
|
Kegan Dougal
|
edb557b2ad
|
Return the raw federation event rather than adding extra keys for federation data.
|
2015-01-08 14:28:08 +00:00 |
|
Kegan Dougal
|
5720ab59e0
|
Add 'raw' query parameter to expose the event graph and signatures to savvy clients.
|
2015-01-08 13:57:40 +00:00 |
|
Mark Haines
|
adb04b1e57
|
Update copyright notices
|
2015-01-06 13:21:39 +00:00 |
|
Mark Haines
|
5dbe820e9a
|
Remove unneeded federation keys from events
|
2014-12-19 12:16:26 +00:00 |
|
Erik Johnston
|
c8dd3314d6
|
Fix bug where we ignored event_edge_hashes table
|
2014-12-15 13:55:22 +00:00 |
|
Erik Johnston
|
9191292b0f
|
Fix prev_content
|
2014-12-11 15:16:55 +00:00 |
|
Erik Johnston
|
8cdebce470
|
Fix redactions. Fix 'age' key
|
2014-12-11 13:25:19 +00:00 |
|
Erik Johnston
|
8c48450682
|
Add PEP8 newlines
|
2014-12-09 10:58:31 +00:00 |
|
Erik Johnston
|
d044121168
|
Various typos and bug fixes.
|
2014-12-08 09:08:26 +00:00 |
|
Erik Johnston
|
6630e1b579
|
Start making more things use EventContext rather than event.*
|
2014-12-05 16:20:48 +00:00 |
|
Erik Johnston
|
75b4329aaa
|
WIP for new way of managing events.
|
2014-12-03 16:07:21 +00:00 |