Erik Johnston
aa1336c00a
Merge pull request #1700 from matrix-org/erikj/backfill_filter
...
Fix /backfill returning events it shouldn't
2016-12-15 14:21:30 +00:00
Erik Johnston
4da3fc0ea0
Merge pull request #1701 from mbachry/fix-preview-crash
...
Fix crash in url preview
2016-12-15 10:01:28 +00:00
Marcin Bachry
24c16fc349
Fix crash in url preview when html tag has no text
...
Signed-off-by: Marcin Bachry <hegel666@gmail.com>
2016-12-14 22:38:18 +01:00
Erik Johnston
b8255eba26
Comment
2016-12-14 13:49:54 +00:00
Erik Johnston
b2999a7055
Fix /backfill returning events it shouldn't
2016-12-14 13:41:45 +00:00
Erik Johnston
c3208e45c9
Fixup membership query
2016-12-14 10:46:58 +00:00
Erik Johnston
9d95351cad
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_list
2016-12-13 17:57:08 +00:00
Erik Johnston
1de53a7a1a
Fix caching on public room list
2016-12-13 17:33:24 +00:00
Erik Johnston
bae1115e55
Update changelog
2016-12-13 11:23:08 +00:00
Erik Johnston
b3d398343e
Bump changelog and version
2016-12-13 11:07:27 +00:00
Johannes Löthberg
0648e76979
Remove spurious newline
...
Apparently I just removed the spaces instead...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-12 18:41:30 +01:00
Erik Johnston
8588d0eb3d
Merge pull request #1697 from matrix-org/erikj/fix_bg_member
...
Fix background update that prematurely stopped
2016-12-12 17:20:17 +00:00
Erik Johnston
1574b839e0
Merge pull request #1676 from matrix-org/erikj/room_list
...
Add new API appservice specific public room list
2016-12-12 17:00:10 +00:00
Erik Johnston
7ec2bf9b77
Fix background update that prematurely stopped
2016-12-12 16:54:58 +00:00
Richard van der Hoff
d431c0924c
Merge pull request #1694 from matrix-org/rav/no_get_e2e_keys
...
Remove unspecced GET endpoints for e2e keys
2016-12-12 16:06:03 +00:00
Erik Johnston
2bf5a47b3e
Rename network_id to instance_id on client side
2016-12-12 16:05:45 +00:00
Johannes Löthberg
d3bd94805f
Fixup for #1689 and #1690
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-12 16:32:47 +01:00
Erik Johnston
09cbcb78d3
Add cache to get_public_room_ids_at_stream_id
2016-12-12 14:41:51 +00:00
Erik Johnston
631376e2ac
Notify replication. Use correct network_id
2016-12-12 14:28:15 +00:00
Richard van der Hoff
abed247182
Remove unspecced GET endpoints for e2e keys
...
GET /keys/claim is a terrible idea, since it isn't idempotent; also it throws
500 errors if you call it without all the right params.
GET /keys/query is arguable, but it's unspecced, so let's get rid of it too to
stop people relying on unspecced APIs.
2016-12-12 12:31:40 +00:00
Richard van der Hoff
9240948346
Merge remote-tracking branch 'origin/master' into develop
2016-12-12 11:46:46 +00:00
Richard van der Hoff
62e6d40b39
Merge pull request #1685 from matrix-org/rav/update_readme_for_tests
...
Update the readme to use trial
2016-12-12 11:17:06 +00:00
Erik Johnston
d45c984653
Docstring
2016-12-12 11:00:27 +00:00
Erik Johnston
d53a80af25
Merge pull request #1620 from matrix-org/erikj/concurrent_room_access
...
Limit the number of events that can be created on a given room concurrently
2016-12-12 10:30:23 +00:00
Richard van der Hoff
85cd30b1fd
Merge pull request #1686 from matrix-org/rav/fix_federation_key_fails
...
E2E key query: handle federation fails
2016-12-12 09:33:39 +00:00
Richard van der Hoff
deca951241
Remove unused import
2016-12-12 09:24:35 +00:00
Glyph
9f07f4c559
IPv6 support for endpoint.py
...
Similar to https://github.com/matrix-org/synapse/pull/1689 , but for endpoint.py
2016-12-11 11:10:32 +01:00
Glyph
6e18805ac2
IPv6 support for client.py
...
This is an (untested) general sketch of how to use wrapClientTLS to implement TLS over IPv6, as well as faster connections over IPv4.
2016-12-11 11:10:32 +01:00
Richard van der Hoff
77692b52b5
Merge pull request #1684 from matrix-org/rav/no_run_tox_from_setup
...
Don't try to run tox from setup.py
2016-12-09 18:33:35 +00:00
Richard van der Hoff
efa4ccfaee
E2E key query: handle federation fails
...
Don't fail the whole request if we can't connect to a particular server.
2016-12-09 18:31:01 +00:00
Richard van der Hoff
e721a7f2c1
Implement a null 'test' command
2016-12-09 18:00:58 +00:00
Richard van der Hoff
1233d244ff
fix pythonpath
2016-12-09 17:52:51 +00:00
Erik Johnston
b541fac7c3
Merge pull request #1683 from matrix-org/erikj/notifier_sadness
...
Fix rare notifier bug where listeners dont timeout
2016-12-09 17:27:45 +00:00
Richard van der Hoff
af32d3b773
Don't try to run tox from setup.py
...
Using tox to run the tests is a bad idea, as per the comments.
2016-12-09 17:16:31 +00:00
Richard van der Hoff
2fda8134f1
Update the readme to use trial
2016-12-09 17:15:38 +00:00
Erik Johnston
8b34f71bea
Fix unit tests
2016-12-09 16:48:48 +00:00
Erik Johnston
fbaf868f62
Correctly handle timeout errors
2016-12-09 16:30:29 +00:00
Richard van der Hoff
4a9c38bfa3
Fix broken README merge
...
When 546ec1a
was merged into develop, I accidentally overwrote the change
introduced in debbea5
(pr #1657 ). Reintroduce it.
2016-12-09 16:05:12 +00:00
Erik Johnston
be14c24cea
Fix rare notifier bug where listeners dont timeout
...
There was a race condition that caused the notifier to 'miss' the
timeout notification, since there were no other checks for the timeout
this caused listeners to get stuck in a loop until something happened.
2016-12-09 15:43:18 +00:00
Erik Johnston
1697f6a323
Merge pull request #1680 from matrix-org/erikj/joined_rooms
...
Add new room membership APIs
2016-12-09 11:35:48 +00:00
Erik Johnston
52d12ca782
Add /room/<room_id>/joined_members API
...
This returns the currently joined members in the room with their display
names and avatar urls. This is more efficient than /members for large
rooms where you don't need the full events.
2016-12-08 13:32:07 +00:00
Erik Johnston
c45d8e9ba2
Add profile data to the room_membership table for joins
2016-12-08 13:08:41 +00:00
Richard van der Hoff
da13b4aa86
Merge pull request #1678 from matrix-org/rav/fix_receipt_notifications
...
Read-receipt fixes
2016-12-08 12:34:57 +00:00
Richard van der Hoff
b08f76bd23
Fix ignored read-receipts
...
Don't ignore read-receipts which arrive in the same EDU as a read-receipt for
an old event.
2016-12-08 12:13:01 +00:00
Richard van der Hoff
bd07a35c29
Fix result of insert_receipt
...
This should fix the absence of notifications when new receipts arrive.
2016-12-08 12:11:34 +00:00
Erik Johnston
de796f27e6
Add joined_rooms servlet
2016-12-08 11:39:03 +00:00
Erik Johnston
2687af82d4
Comments
2016-12-07 09:58:33 +00:00
Erik Johnston
3727d66a0e
Don't include appservice id
2016-12-06 17:04:26 +00:00
Erik Johnston
0d81e26769
Merge pull request #1672 from williamleuschner/develop
...
Add README instructions for OpenBSD installation
2016-12-06 16:39:15 +00:00
William Leuschner
59bc64328f
Fix incorrect numbering on OpenBSD instructions caused by my own incompetence
...
Signed-off-by: William Leuschner <wel2138@rit.edu>
2016-12-06 11:31:17 -05:00