bae1115e55
Update changelog
2016-12-13 11:23:08 +00:00
b3d398343e
Bump changelog and version
2016-12-13 11:07:27 +00:00
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
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
7ec2bf9b77
Fix background update that prematurely stopped
2016-12-12 16:54:58 +00:00
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
2bf5a47b3e
Rename network_id to instance_id on client side
2016-12-12 16:05:45 +00:00
09cbcb78d3
Add cache to get_public_room_ids_at_stream_id
2016-12-12 14:41:51 +00:00
631376e2ac
Notify replication. Use correct network_id
2016-12-12 14:28:15 +00:00
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
9240948346
Merge remote-tracking branch 'origin/master' into develop
2016-12-12 11:46:46 +00:00
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
d45c984653
Docstring
2016-12-12 11:00:27 +00:00
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
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
deca951241
Remove unused import
2016-12-12 09:24:35 +00:00
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
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
e721a7f2c1
Implement a null 'test' command
2016-12-09 18:00:58 +00:00
1233d244ff
fix pythonpath
2016-12-09 17:52:51 +00:00
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
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
2fda8134f1
Update the readme to use trial
2016-12-09 17:15:38 +00:00
8b34f71bea
Fix unit tests
2016-12-09 16:48:48 +00:00
fbaf868f62
Correctly handle timeout errors
2016-12-09 16:30:29 +00:00
4a9c38bfa3
Fix broken README merge
...
When 546ec1adebbea5#1657 ). Reintroduce it.
2016-12-09 16:05:12 +00:00
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
1697f6a323
Merge pull request #1680 from matrix-org/erikj/joined_rooms
...
Add new room membership APIs
2016-12-09 11:35:48 +00:00
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
c45d8e9ba2
Add profile data to the room_membership table for joins
2016-12-08 13:08:41 +00:00
da13b4aa86
Merge pull request #1678 from matrix-org/rav/fix_receipt_notifications
...
Read-receipt fixes
2016-12-08 12:34:57 +00:00
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
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
de796f27e6
Add joined_rooms servlet
2016-12-08 11:39:03 +00:00
2687af82d4
Comments
2016-12-07 09:58:33 +00:00
3727d66a0e
Don't include appservice id
2016-12-06 17:04:26 +00:00
0d81e26769
Merge pull request #1672 from williamleuschner/develop
...
Add README instructions for OpenBSD installation
2016-12-06 16:39:15 +00:00
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
f32fb65552
Add new API appservice specific public room list
2016-12-06 16:12:27 +00:00
39a76b9cba
Update incorrect information in README about ksh and source
...
Signed-off-by: William Leuschner <wel2138@rit.edu>
2016-12-06 11:09:31 -05:00
1529c19675
Prevent user tokens being used as guest tokens ( #1675 )
...
Make sure that a user cannot pretend to be a guest by adding 'guest = True'
caveats.
2016-12-06 15:31:37 +00:00
194b6259c5
Travis config ( #1674 )
2016-12-06 12:51:32 +00:00
5a2c33c12e
Merge pull request #1673 from matrix-org/rav/fix_tox_tests
...
Fix unittests under tox
2016-12-06 11:45:55 +00:00
7dae7087d3
Fix unittests under tox
...
We now need to set PYTHONPATH when running the unit tests; update tox config to
do so.
2016-12-06 11:35:14 +00:00
12aefb9dfc
Add README instructions for OpenBSD installation
...
Signed-off-by: William Leuschner <wel2138@rit.edu>
2016-12-05 14:16:39 -05:00
9609c91e7d
Merge pull request #653 from matrix-org/erikj/preset_guest_join
...
Enable guest access for private rooms by default
2016-12-05 17:47:14 +00:00
338df4f409
Merge pull request #1649 from matrix-org/dbkr/log_ui_auth_args
...
Log the args that we have on UI auth completion
2016-12-05 16:40:58 +00:00
3e90250ea3
Merge pull request #1668 from pik/bug-console-filter
...
Logging: Fix console filter breaking when level is DEBUG
2016-12-05 16:38:26 +00:00
0b1e287e81
Merge pull request #1671 from kyrias/fix-preview-test
...
Fix preview test
2016-12-05 15:39:17 +00:00
6c9a0ba415
test_preview: Fix incorrect wrapping
...
The old test expected an incorrect wrapping due to the preview function
not using unicode properly, so it got the wrong length.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-05 16:33:57 +01:00
Erik Johnston