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
0697bb2247
Make test_preview use unicode strings
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-05 16:33:57 +01:00
24081224d1
Merge remote-tracking branch 'origin/master' into develop
2016-12-05 11:12:43 +00:00
c46e7a9c9b
Bugfix: Console logging handler missing default filter
2016-12-03 20:14:58 -03:00
a2849a18a5
README: fix link
2016-12-03 13:18:27 +00:00
59984e9f58
Merge remote-tracking branch 'origin/master' into develop
2016-12-03 13:08:53 +00:00
546ec1a5cf
Merge pull request #1667 from matrix-org/rav/update_readme
...
Updates to the README
2016-12-03 13:07:43 +00:00
7a00178832
Merge pull request #1664 from kyrias/preview-url-resource-encoding
...
preview_url_resource: Ellipsis must be in unicode string
2016-12-03 01:34:59 +00:00
9df84dd22d
README: review comments
...
Minor updates post-review
2016-12-02 17:17:15 +00:00
3f23154088
README: rewrite federation section
2016-12-02 12:02:33 +00:00
f6270a8fe2
README: add reverse-proxying section
2016-12-02 12:02:33 +00:00
235407a78e
README: Rewrite "Identity servers" section
2016-12-02 12:02:33 +00:00
77bf92e3c6
README: rewrite installation instructions
2016-12-02 12:02:33 +00:00
bb3d0c270d
README: remove refs to demo client
...
The demo client isn't really fit for purpose, so stop encouraging people to use
it.
2016-12-02 11:54:59 +00:00
f8c45d428c
README: code quotes
...
Add some syntax highlighting
2016-12-02 11:47:55 +00:00
153535fc56
README: "About matrix" updates
...
- remove redundant "where's the spec" section: this would belong in "About
matrix", but it's already there.
- E2E is in beta rather than dev
2016-12-02 11:46:00 +00:00
a8d8225ead
README: Fix links
...
Fix a couple of broken links
2016-12-02 11:43:10 +00:00
cc03f4c58b
Rearrange the README
...
Move some bits of the README around. No words were changed in the making of
this commit.
2016-12-02 11:42:59 +00:00
32c8b5507c
preview_url_resource: Ellipsis must be in unicode string
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-01 13:12:13 +01:00
971edd04af
rename CAPTCHA_SETUP
...
this is rst so name it accordingly
2016-12-01 12:08:03 +00:00
471200074b
Merge pull request #1654 from matrix-org/rav/no_more_refresh_tokens
...
Stop generating refresh_tokens
2016-12-01 11:42:53 +00:00
6841d8ff55
Fix doc-string
...
Remove refresh_token reference
2016-12-01 11:42:17 +00:00
12f3b9000c
fix imports
2016-11-30 17:45:49 +00:00
aa09d6b8f0
Rip out more refresh_token code
...
We might as well treat all refresh_tokens as invalid. Just return a 403 from
/tokenrefresh, so that we don't have a load of dead, untestable code hanging
around.
Still TODO: removing the table from the schema.
2016-11-30 17:40:18 +00:00
Erik Johnston