657488113e
Merge pull request #1789 from matrix-org/erikj/decouple_presence
...
Don't block messages sending on bumping presence
2017-01-10 14:06:05 +00:00
3b4de17d2b
Comment
2017-01-10 14:05:53 +00:00
7d0981b312
Merge pull request #1787 from matrix-org/erikj/linearize_member
...
Linearize updates to membership via PUT /state/
2017-01-10 14:04:54 +00:00
07c3c08fad
Merge pull request #1786 from matrix-org/erikj/linearizer_name
...
Name linearizer's for better logs
2017-01-10 14:04:45 +00:00
586f474a44
Don't block messages sending on bumping presence
2017-01-10 12:46:00 +00:00
6823fe5241
Linearize updates to membership via PUT /state/
2017-01-09 18:25:13 +00:00
f7085ac84f
Name linearizer's for better logs
2017-01-09 17:17:10 +00:00
9898bbd9dc
Merge branch 'master' of github.com:matrix-org/synapse into develop
2017-01-09 14:51:17 +00:00
9a8ae6f1bf
Bump version and changelog
2017-01-09 14:47:56 +00:00
2f4b2f4783
gah, fix mangled merge of 0.18.7 into develop
2017-01-07 04:00:42 +00:00
6d363cea9d
Merge branch 'release-v0.18.7' into develop
2017-01-07 03:46:16 +00:00
f0e4bac64e
bump changelog & version
2017-01-07 03:45:38 +00:00
4304e7e593
do the discard check in the right place to avoid grabbing dependent events
2017-01-07 03:44:18 +00:00
6515b9c0d4
changelog
2017-01-07 02:52:37 +00:00
8c48971b51
Merge branch 'release-v0.18.7' into develop
2017-01-07 02:23:37 +00:00
e10c527930
Discard PDUs from invalid origins due to #1753 in 0.18.[56]
2017-01-07 02:13:14 +00:00
2f5be2d8dc
oops, this should have been rc1
2017-01-07 01:11:56 +00:00
4086026524
move logging to right place
2017-01-07 00:41:46 +00:00
9d914454c8
Merge branch 'release-v0.18.6' into develop
2017-01-07 00:40:30 +00:00
19e2fb4386
bump version
2017-01-06 23:38:22 +00:00
189fd15564
update changelog
2017-01-06 23:33:28 +00:00
8404f132c3
Revert "fix typo breaking the fix to #1753"
...
This reverts commit b2850e62db
2017-01-06 23:28:46 +00:00
b2850e62db
fix typo breaking the fix to #1753
2017-01-06 23:23:37 +00:00
06c00bd19b
Merge branch 'release-v0.18.6' into develop
2017-01-06 14:46:27 +00:00
b42a972b71
Bump version and changelog
2017-01-06 14:44:28 +00:00
2c8ac84a26
Merge pull request #1772 from matrix-org/markjh/fix_guest_access_check
...
handlers/room_member: fix guest access check when joining rooms
2017-01-06 14:41:52 +00:00
1ef6084b75
handlers/room_member: fix guest access check when joining rooms
...
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
2017-01-06 14:36:56 +00:00
bd85434cb3
Merge branch 'release-v0.18.6' into develop
2017-01-05 13:58:19 +00:00
c18f7fc410
Fix flake8 and update changelog
2017-01-05 13:50:22 +00:00
dafd50d178
Merge pull request #1767 from matrix-org/matthew/resolve_state_group_logging
...
log call paths for resolve_state_group
2017-01-05 13:47:42 +00:00
883ff92a7f
Fix case
2017-01-05 13:45:02 +00:00
d79d165761
add logging for all the places we call resolve_state_groups. my kingdom for a backtrace that actually works.
2017-01-05 13:40:39 +00:00
8cfc0165e9
fix annoying typos
2017-01-05 13:39:43 +00:00
62451800e7
Bump version and changelog to v0.18.6-rc3
2017-01-05 13:36:10 +00:00
b31ed22738
Merge branch 'release-v0.18.6' into develop
2017-01-05 13:03:02 +00:00
7738329672
Merge pull request #1766 from matrix-org/markjh/linear_logging
...
More logging for the linearizer and for get_events
2017-01-05 13:01:31 +00:00
dd3df11c55
More logging for the linearizer and for get_events
2017-01-05 12:32:47 +00:00
e1c5463efc
Merge pull request #1765 from matrix-org/markjh/timeout_get_missing_events
...
cherrypick #1744 : limit total timeout for get_missing_events to 10s
2017-01-05 12:02:23 +00:00
468749c9fc
fix comment
2017-01-05 12:00:11 +00:00
eedf400d05
limit total timeout for get_missing_events to 10s
2017-01-05 11:58:15 +00:00
5175094707
Merge pull request #1744 from matrix-org/matthew/timeout_get_missing_events
...
limit total timeout for get_missing_events to 10s
2017-01-05 11:53:15 +00:00
8e82611f37
fix comment
2017-01-05 11:44:44 +00:00
6028718b1a
Merge pull request #1764 from matrix-org/markjh/fix_send_pdu
...
Only send events that originate on this server.
2017-01-05 11:41:22 +00:00
f784980d2b
Only send events that originate on this server.
...
Or events that are sent via the federation "send_join" API.
This should match the behaviour from before v0.18.5 and #1635 landed.
2017-01-05 11:26:30 +00:00
0d766c8ccf
Merge pull request #1758 from matrix-org/markjh/fix_ban_propagation
...
Fix propagation of bans to remote servers.
2017-01-04 15:39:31 +00:00
e02bdaf08b
Get the destinations from the state from before the event
...
Rather than the state after then event.
2017-01-04 15:17:15 +00:00
b6b67715ed
Send ALL membership events to the server that was affected.
...
Send all membership changes to the server that was affected.
This ensures that if the last member of a room on a server
was kicked or banned they get told about it.
2017-01-04 13:56:20 +00:00
555d702e34
limit total timeout for get_missing_events to 10s
2016-12-31 15:21:37 +00:00
899a3a1268
Merge branch 'release-v0.18.6' into develop
2016-12-31 02:38:26 +00:00
f3de4f8cb7
Bump version and changelog
2016-12-30 20:21:04 +00:00
Erik Johnston