e1dec2f1a7
Remove user from group summary when the leave the group
2017-09-21 16:09:57 +01:00
bb746a9de1
Revert: Keep room_id's in group summary
2017-09-21 15:57:22 +01:00
ae8d4bb0f0
Keep room_id's in group summary
2017-09-21 15:55:18 +01:00
197d82dc07
Correctly return next token
2017-09-20 11:12:11 +01:00
069ae2df12
Fix initial sync
2017-09-20 10:52:12 +01:00
47d9848dc4
Merge pull request #2454 from matrix-org/erikj/groups_sync_creator
...
Ensure that creator of group sees group down /sync
2017-09-19 11:21:26 +01:00
93e504d04e
Ensure that creator of group sees group down /sync
2017-09-19 11:08:16 +01:00
b5feaa5a49
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
2017-09-19 11:07:45 +01:00
3f405b34e9
Fix overzealous kicking of guest users ( #2453 )
...
We should only kick guest users if the guest access event is authorised.
2017-09-19 08:52:52 +01:00
290777b3d9
Clean up and document handling of logcontexts in Keyring ( #2452 )
...
I'm still unclear on what the intended behaviour for
`verify_json_objects_for_server` is, but at least I now understand the
behaviour of most of the things it calls...
2017-09-18 18:31:01 +01:00
77c81ca6ea
Merge pull request #2451 from matrix-org/erikj/add_state_to_timeline
...
Don't filter out current state events from timeline
2017-09-18 17:22:33 +01:00
2d1b7955ae
Don't filter out current state events from timeline
2017-09-18 17:13:03 +01:00
862c8da560
Merge pull request #2450 from matrix-org/dbkr/push_event_id_only
...
Add support for event_id_only push format
2017-09-18 16:41:29 +01:00
2d9f341c3e
Merge pull request #2449 from matrix-org/erikj/rejoin_device_lists
...
Correctly handle leaving room in /key/changes
2017-09-18 15:59:13 +01:00
436ee0a2ea
Also include the room_id
...
as really it's part of the event ID
2017-09-18 15:58:38 +01:00
b393f5db51
Use .get - it's much shorter
2017-09-18 15:50:26 +01:00
a2562f9d74
Add support for event_id_only push format
...
Param in the data dict of a pusher that tells an HTTP pusher to
send just the event_id of the event it's notifying about and the
notification counts. For clients that want to go & fetch the body
of the event themselves anyway.
2017-09-18 15:39:39 +01:00
d6dadd95ac
Correctly handle leaving room in /key/changes
2017-09-18 15:38:22 +01:00
993d3f710b
Merge pull request #2443 from matrix-org/erikj/rejoin_device_lists
...
Send down device list change notif when member leaves/rejoins room
2017-09-18 13:17:53 +01:00
4a94eb3ea4
Fix typo
2017-09-15 09:56:54 +01:00
3a0cee28d6
Actually hook leave notifs up
2017-09-14 11:49:37 +01:00
4f845a0713
Handle joining/leaving rooms in /keys/changes
2017-09-13 16:28:08 +01:00
473700f016
Get left rooms
2017-09-13 15:13:41 +01:00
9ce866ed4f
In sync handle device lists for newly joined/left rooms
2017-09-12 16:44:26 +01:00
69ef4987a6
Add left section to /keys/changes
2017-09-08 14:44:36 +01:00
53cc8ad35a
Send down device list change notif when member leaves/rejoins room
2017-09-07 15:08:39 +01:00
e2fcba038c
Merge pull request #2439 from matrix-org/rav/tox_tweaks
...
do tox install with pip -e
2017-09-06 17:08:19 +01:00
5f59f20636
Merge remote-tracking branch 'origin/master' into develop
2017-09-05 21:58:19 +01:00
59de2c7afa
Exclude the github issue template from our sdist ( #2440 )
...
PR #2413 added an issue template, but just adding files to the project
directory upsets the packaging scripts: we need to explicitly include or
exclude them.
Move the template into a .github directory to make that easy, and to de-clutter
the root a bit.
2017-09-05 21:57:19 +01:00
4b616c8cf2
Merge branch 'master' into develop
2017-09-05 17:51:13 +01:00
4dd61df6f8
do tox install with pip -e
...
- this ensures we end up with a working virtualenv which we can use for other
things.
2017-09-05 16:35:23 +01:00
c0c31656ff
Merge pull request #2433 from ptman/patch-1
...
Document known to work postgres version
2017-09-01 15:28:42 +01:00
8b16b43b7f
Document known to work postgres version
2017-09-01 16:52:45 +03:00
dff396de0f
Set --python when running sytest
...
.. because I want to make the 'install_and_run' script useful for non-synapse
jobs, which do not accept --python. In any case we set up the path here, so
sytest shouldn't be guessing it.
2017-09-01 11:20:37 +01:00
f06ffdb6fa
fix python path in jenkins scripts
2017-09-01 10:31:45 +01:00
6e67aaa7f2
Set --python when running sytest
...
.. because I want to make the 'install_and_run' script useful for non-synapse
jobs, which do not accept --python. In any case we set up the path here, so
sytest shouldn't be guessing it.
2017-09-01 10:06:21 +01:00
7f0d0ba3bc
Merge pull request #2430 from matrix-org/erikj/groups_profile_cache
...
Add user profiles to summary from group server
2017-08-25 16:48:58 +01:00
4a9b1cf253
Add user profiles to summary from group server
2017-08-25 16:23:58 +01:00
6d8799af1a
Merge pull request #2429 from matrix-org/erikj/groups_profile_cache
...
Add a remote user profile cache
2017-08-25 15:52:42 +01:00
258409ef61
Fix typos and reinherit
2017-08-25 14:45:20 +01:00
bf81f3cf2c
Split out profile handler to fix tests
2017-08-25 14:34:56 +01:00
27ebc5c8f2
Add remote profile cache
2017-08-25 11:25:47 +01:00
97c544f91f
Add _simple_update
2017-08-25 11:11:37 +01:00
934ab76835
Merge pull request #2428 from matrix-org/rav/update_upgrade
...
Tweaks to the upgrade instructions
2017-08-24 11:42:02 +01:00
fc9878f6a4
Tweaks to the upgrade instructions
2017-08-23 15:27:02 +01:00
a4d3bfe3d6
Merge pull request #2417 from matrix-org/rav/federation_client
...
Improvements to the federation test client
2017-08-23 14:50:26 +01:00
a7effa8400
Merge pull request #2288 from kyrias/bcrypt
...
python_dependencies: Use bcrypt module instead of py-bcrypt
2017-08-23 14:14:56 +01:00
a04c6bbf8f
test federation client: Allow server-name and key-file as options
...
so that you don't necessarily need a config file.
2017-08-22 11:19:30 +01:00
77ea8cbdd7
Merge pull request #2416 from matrix-org/rav/prometheus_config
...
Add prometheus config
2017-08-22 10:34:40 +01:00
2800983f3e
Merge pull request #2410 from matrix-org/erikj/groups_publicise
...
Add ability to publicise group membership
2017-08-21 16:51:56 +01:00
Erik Johnston