58371fa263
Comment
2016-02-18 09:09:50 +00:00
c229c87398
Remove spurious comment
2016-02-17 15:48:29 +00:00
e5999bfb1a
Initial cut
2016-02-17 15:40:50 +00:00
9e7900da1e
Add wheeltimer impl
2016-02-17 14:29:28 +00:00
97d1b3a506
Merge pull request #581 from Rugvip/event_id
...
client/v1/room: include event_id in response to state event PUT
2016-02-17 11:06:14 +00:00
71d5d2c669
client/v1/room: include event_id in response to state event PUT, in accordance with the spec
...
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
2016-02-17 11:53:43 +01:00
458782bf67
Fix typo in request validation for adding push rules.
2016-02-16 18:00:30 +00:00
c2025c0425
Merge pull request #578 from matrix-org/markjh/idempotent_rules
...
Make adding push rules idempotent
Also remove the **kwargs from the add_push_rule method.
Fixes https://matrix.org/jira/browse/SYN-391
2016-02-16 15:53:41 +00:00
a9c9868957
Make adding push rules idempotent
...
Also remove the **kwargs from the add_push_rule method.
Fixes https://matrix.org/jira/browse/SYN-391
2016-02-16 15:53:38 +00:00
a182e5d721
Merge pull request #577 from matrix-org/daniel/createroom
...
Simplify room creation code
2016-02-16 11:21:06 +00:00
e560045cfd
Simplify room creation code
2016-02-15 18:18:39 +00:00
4de08a4672
Revert "Merge two of the room join codepaths"
...
This reverts commit cf81375b94
2016-02-12 16:17:24 +00:00
d7aa103f00
Merge pull request #575 from matrix-org/daniel/roomcleanup
...
Merge two of the room join codepaths
There's at least one more to merge in.
Side-effects:
* Stop reporting None as displayname and avatar_url in some cases
* Joining a room by alias populates guest-ness in join event
* Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
been called on matrix.org according to logs
* Stop recording access_token_id on /join/room_id - currently we don't
record it on /join/room_alias; I can try to thread it through at some
point.
2016-02-12 15:11:59 +00:00
cf81375b94
Merge two of the room join codepaths
...
There's at least one more to merge in.
Side-effects:
* Stop reporting None as displayname and avatar_url in some cases
* Joining a room by alias populates guest-ness in join event
* Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
been called on matrix.org according to logs
* Stop recording access_token_id on /join/room_id - currently we don't
record it on /join/room_alias; I can try to thread it through at some
point.
2016-02-12 15:11:49 +00:00
66f9a49ce9
Merge pull request #574 from matrix-org/markjh/connection_closed
...
Catch the exceptions thrown by twisted when you write to a closed con…
2016-02-12 14:29:36 +00:00
58c9f20692
Catch the exceptions thrown by twisted when you write to a closed connection
2016-02-12 13:46:59 +00:00
ec0f3836ff
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-02-12 11:19:37 +00:00
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
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
7e0a1683e6
Merge branch 'release-v0.13.3' of github.com:matrix-org/synapse
2016-02-11 16:04:51 +00:00
2a24f906a9
Bump version and changelog
2016-02-11 16:04:15 +00:00
a79af259e9
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-02-11 16:02:17 +00:00
ce14c7a995
Fix SYN-627, events are in incorrect room in /sync
2016-02-11 15:02:56 +00:00
88a973cde5
Merge branch 'release-v0.13.2' of github.com:matrix-org/synapse
2016-02-11 10:55:16 +00:00
1a830b751d
Bump version and changelog
2016-02-11 10:53:42 +00:00
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
0eff740523
Return events in correct order for /events
2016-02-11 10:07:27 +00:00
a1b7902944
Add some paranoia logging
2016-02-11 09:22:37 +00:00
7718303e71
Merge branch 'master' of github.com:matrix-org/synapse into develop
2016-02-10 17:06:53 +00:00
103b432c84
0.13.1
2016-02-10 16:35:17 +00:00
a45cc801d2
bump for 0.13.1
2016-02-10 16:34:46 +00:00
7634687057
Merge branch 'master' of git+ssh://github.com/matrix-org/synapse
2016-02-10 16:27:15 +00:00
b3ecb96e36
try to bump syweb to 0.6.8
2016-02-10 16:27:12 +00:00
907c1faf1e
Merge branch 'release-v0.13.0' of github.com:matrix-org/synapse
2016-02-10 14:52:06 +00:00
6c3126d950
Update CHANGES
2016-02-10 14:49:48 +00:00
6e89e69d08
Bump version and changelog
2016-02-10 14:36:06 +00:00
e66d0bd03a
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
2016-02-10 14:12:48 +00:00
4a2ace1857
Merge pull request #569 from matrix-org/erikj/initial_sync
...
Improvements to initial /syncs
2016-02-10 13:43:15 +00:00
5189bfdef4
Batch fetch _get_state_groups_from_groups
2016-02-10 13:24:42 +00:00
24f00a6c33
Use _simple_select_many for _get_state_group_for_events
2016-02-10 12:57:50 +00:00
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
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
4eb8f9ca8a
Remove comment
2016-02-10 11:29:21 +00:00
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
00c9ad49df
s/parent_context/previous_context/
2016-02-10 11:25:19 +00:00
9777c5f49a
Set parent context on instansiation
2016-02-10 11:23:32 +00:00
0214745239
Rename functions
2016-02-10 11:09:56 +00:00
46a02ff15b
Merge pull request #532 from floviolleau/floviolleau/documentation
...
Update documentation
2016-02-10 10:40:28 +00:00
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
78a5482267
Typo
2016-02-09 16:23:11 +00:00
Erik Johnston