Mark Haines
|
58c9f20692
|
Catch the exceptions thrown by twisted when you write to a closed connection
|
2016-02-12 13:46:59 +00:00 |
|
Erik Johnston
|
ec0f3836ff
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2016-02-12 11:19:37 +00:00 |
|
Daniel Wagner-Hall
|
ee4f332ec5
|
Merge pull request #572 from matrix-org/daniel/exclusivity
Enforce user_id exclusivity for AS registrations
|
2016-02-11 17:42:53 +00:00 |
|
Daniel Wagner-Hall
|
dc6da63e30
|
Enforce user_id exclusivity for AS registrations
This whole set of checks is kind of an ugly mess, which I may clean up
at some point, but for now let's be correct.
|
2016-02-11 17:37:38 +00:00 |
|
Erik Johnston
|
7e0a1683e6
|
Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse
|
2016-02-11 16:04:51 +00:00 |
|
Erik Johnston
|
2a24f906a9
|
Bump version and changelog
|
2016-02-11 16:04:15 +00:00 |
|
Erik Johnston
|
a79af259e9
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2016-02-11 16:02:17 +00:00 |
|
Erik Johnston
|
ce14c7a995
|
Fix SYN-627, events are in incorrect room in /sync
|
2016-02-11 15:02:56 +00:00 |
|
Erik Johnston
|
88a973cde5
|
Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse
|
2016-02-11 10:55:16 +00:00 |
|
Erik Johnston
|
1a830b751d
|
Bump version and changelog
|
2016-02-11 10:53:42 +00:00 |
|
Erik Johnston
|
abc1b22193
|
Merge pull request #570 from matrix-org/erikj/events_fixes
Return events in correct order for /events
|
2016-02-11 10:13:26 +00:00 |
|
Erik Johnston
|
0eff740523
|
Return events in correct order for /events
|
2016-02-11 10:07:27 +00:00 |
|
Erik Johnston
|
a1b7902944
|
Add some paranoia logging
|
2016-02-11 09:22:37 +00:00 |
|
Erik Johnston
|
7718303e71
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2016-02-10 17:06:53 +00:00 |
|
Matthew Hodgson
|
103b432c84
|
0.13.1
|
2016-02-10 16:35:17 +00:00 |
|
Matthew Hodgson
|
a45cc801d2
|
bump for 0.13.1
|
2016-02-10 16:34:46 +00:00 |
|
Matthew Hodgson
|
7634687057
|
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
|
2016-02-10 16:27:15 +00:00 |
|
Matthew Hodgson
|
b3ecb96e36
|
try to bump syweb to 0.6.8
|
2016-02-10 16:27:12 +00:00 |
|
Erik Johnston
|
907c1faf1e
|
Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse
|
2016-02-10 14:52:06 +00:00 |
|
Erik Johnston
|
6c3126d950
|
Update CHANGES
|
2016-02-10 14:49:48 +00:00 |
|
Erik Johnston
|
6e89e69d08
|
Bump version and changelog
|
2016-02-10 14:36:06 +00:00 |
|
Erik Johnston
|
e66d0bd03a
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
|
2016-02-10 14:12:48 +00:00 |
|
Erik Johnston
|
4a2ace1857
|
Merge pull request #569 from matrix-org/erikj/initial_sync
Improvements to initial /syncs
|
2016-02-10 13:43:15 +00:00 |
|
Erik Johnston
|
5189bfdef4
|
Batch fetch _get_state_groups_from_groups
|
2016-02-10 13:24:42 +00:00 |
|
Erik Johnston
|
24f00a6c33
|
Use _simple_select_many for _get_state_group_for_events
|
2016-02-10 12:57:50 +00:00 |
|
Erik Johnston
|
8e49892b21
|
Only calculate initial sync for 10 rooms at a time
This helps to ensure we don't completely starve other requests.
|
2016-02-10 11:42:07 +00:00 |
|
Erik Johnston
|
e557dc80b8
|
Merge pull request #566 from matrix-org/erikj/logcontext
Don't bother copying records on parent context
|
2016-02-10 11:41:45 +00:00 |
|
Erik Johnston
|
4eb8f9ca8a
|
Remove comment
|
2016-02-10 11:29:21 +00:00 |
|
Erik Johnston
|
f7ef5c1d57
|
Merge pull request #568 from matrix-org/erikj/unread_notif
Atomically persit push actions when we persist the event
|
2016-02-10 11:25:32 +00:00 |
|
Erik Johnston
|
00c9ad49df
|
s/parent_context/previous_context/
|
2016-02-10 11:25:19 +00:00 |
|
Erik Johnston
|
9777c5f49a
|
Set parent context on instansiation
|
2016-02-10 11:23:32 +00:00 |
|
Erik Johnston
|
0214745239
|
Rename functions
|
2016-02-10 11:09:56 +00:00 |
|
Erik Johnston
|
46a02ff15b
|
Merge pull request #532 from floviolleau/floviolleau/documentation
Update documentation
|
2016-02-10 10:40:28 +00:00 |
|
Erik Johnston
|
6ad9586c84
|
Merge pull request #565 from matrix-org/erikj/macaroon_config
Derive macaroon_secret_key from signing key.
|
2016-02-09 16:34:15 +00:00 |
|
Erik Johnston
|
78a5482267
|
Typo
|
2016-02-09 16:23:11 +00:00 |
|
Erik Johnston
|
7b0d846407
|
Atomically persit push actions when we persist the event
|
2016-02-09 16:19:15 +00:00 |
|
Erik Johnston
|
f28cc45183
|
Pass in current state to push action handler
|
2016-02-09 16:01:40 +00:00 |
|
Erik Johnston
|
e664e9737c
|
Fix test
|
2016-02-09 14:57:43 +00:00 |
|
Erik Johnston
|
13ba8d878c
|
Fix test
|
2016-02-09 14:55:21 +00:00 |
|
Erik Johnston
|
78d6c1b5be
|
Change a log from debug to info
|
2016-02-09 14:44:12 +00:00 |
|
Erik Johnston
|
feb294d552
|
Remove dead code
|
2016-02-09 14:32:17 +00:00 |
|
Erik Johnston
|
70a8608749
|
Invalidate get_last_receipt_event_id_for_user cache
|
2016-02-09 14:27:29 +00:00 |
|
Erik Johnston
|
7e3b586c1e
|
Merge pull request #567 from matrix-org/erikj/sync_ephemeral
Don't load all ephemeral state for a room on every sync
|
2016-02-09 14:11:47 +00:00 |
|
Erik Johnston
|
eff12e838c
|
Don't load all ephemeral state for a room on every sync
|
2016-02-09 13:55:59 +00:00 |
|
Erik Johnston
|
82631c5f94
|
Fix unit tests
|
2016-02-09 13:50:37 +00:00 |
|
Daniel Wagner-Hall
|
b58a8b1ee0
|
Merge pull request #560 from matrix-org/daniel/tox
Remove pyc files before running tests
|
2016-02-09 13:44:08 +00:00 |
|
Daniel Wagner-Hall
|
5b75b637b8
|
Remove pyc files before running tests
|
2016-02-09 13:44:04 +00:00 |
|
Erik Johnston
|
9ac9b75bc4
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
|
2016-02-09 12:58:10 +00:00 |
|
Daniel Wagner-Hall
|
ebaa999f92
|
Revert "Reject additional path segments"
This reverts commit 1d19a5ec0f .
iOS Console is apparently relying on these paths.
|
2016-02-09 12:46:52 +00:00 |
|
Erik Johnston
|
6c558ee8bc
|
Measure some /sync related things
|
2016-02-09 11:31:42 +00:00 |
|