Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-02 14:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
7864 commits 884 branches 700 tags 471 MiB
Commit graph

7864 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff 0b1e287e81 Merge pull request #1671 from kyrias/fix-preview-test 
Fix preview test
 2016-12-05 15:39:17 +00:00
Johannes Löthberg 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
Johannes Löthberg 0697bb2247 Make test_preview use unicode strings 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2016-12-05 16:33:57 +01:00
Richard van der Hoff 24081224d1 Merge remote-tracking branch 'origin/master' into develop 2016-12-05 11:12:43 +00:00
Richard van der Hoff a2849a18a5 README: fix link 2016-12-03 13:18:27 +00:00
Richard van der Hoff 59984e9f58 Merge remote-tracking branch 'origin/master' into develop 2016-12-03 13:08:53 +00:00
Richard van der Hoff 546ec1a5cf Merge pull request #1667 from matrix-org/rav/update_readme 
Updates to the README
 2016-12-03 13:07:43 +00:00
Matthew Hodgson 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
Richard van der Hoff 9df84dd22d README: review comments 
Minor updates post-review
 2016-12-02 17:17:15 +00:00
Richard van der Hoff 3f23154088 README: rewrite federation section 2016-12-02 12:02:33 +00:00
Richard van der Hoff f6270a8fe2 README: add reverse-proxying section 2016-12-02 12:02:33 +00:00
Richard van der Hoff 235407a78e README: Rewrite "Identity servers" section 2016-12-02 12:02:33 +00:00
Richard van der Hoff 77bf92e3c6 README: rewrite installation instructions 2016-12-02 12:02:33 +00:00
Richard van der Hoff 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
Richard van der Hoff f8c45d428c README: code quotes 
Add some syntax highlighting
 2016-12-02 11:47:55 +00:00
Richard van der Hoff 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
Richard van der Hoff a8d8225ead README: Fix links 
Fix a couple of broken links
 2016-12-02 11:43:10 +00:00
Richard van der Hoff 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
Johannes Löthberg 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
Richard van der Hoff 971edd04af rename CAPTCHA_SETUP 
this is rst so name it accordingly
 2016-12-01 12:08:03 +00:00
Richard van der Hoff 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
Richard van der Hoff 6841d8ff55 Fix doc-string 
Remove refresh_token reference
 2016-12-01 11:42:17 +00:00
Richard van der Hoff 12f3b9000c fix imports 2016-11-30 17:45:49 +00:00
Richard van der Hoff 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
Richard van der Hoff dc4b23e1a1 Merge branch 'develop' into rav/no_more_refresh_tokens 2016-11-30 17:10:04 +00:00
Richard van der Hoff 8379a741cc Merge pull request #1660 from matrix-org/rav/better_content_type_validation 
More intelligent Content-Type parsing
 2016-11-30 16:54:03 +00:00
Richard van der Hoff 321fe5c44c Merge pull request #1656 from matrix-org/rav/remove_time_caveat 
Stop putting a time caveat on access tokens
 2016-11-30 16:53:20 +00:00
Richard van der Hoff b5b3a7e867 More intelligent Content-Type parsing 
Content-Type is allowed to contain options (`; charset=utf-8`, for
instance). We should allow that.
 2016-11-30 15:07:32 +00:00
Richard van der Hoff 4febfe47f0 Comments 
Update comments in verify_macaroon
 2016-11-30 07:36:32 +00:00
Richard van der Hoff 77eca2487c Merge pull request #1653 from matrix-org/rav/guest_e2e 
Implement E2E for guests
 2016-11-29 17:41:35 +00:00
Richard van der Hoff 1c4f05db41 Stop putting a time caveat on access tokens 
The 'time' caveat on the access tokens was something of a lie, since we weren't
enforcing it; more pertinently its presence stops us ever adding useful time
caveats.

Let's move in the right direction by not lying in our caveats.
 2016-11-29 16:49:41 +00:00
Richard van der Hoff 7d855447ef Merge pull request #1657 from matrix-org/rav/hurry_up_pip 
Let pip install multiple packages at once
 2016-11-29 16:28:29 +00:00
Richard van der Hoff debbea5b29 Let pip install multiple packages at once 
Pip can install multiple dependencies at the same time, so there is no need to
use xargs -n1. It's significantly slower with -n1, so let's not do it with no
reason.
 2016-11-29 12:59:19 +00:00
Richard van der Hoff 5c4edc83b5 Stop generating refresh tokens 
Since we're not doing refresh tokens any more, we should start killing off the
dead code paths. /tokenrefresh itself is a bit of a thornier subject, since
there might be apps out there using it, but we can at least not generate
refresh tokens on new logins.
 2016-11-28 10:13:01 +00:00
Richard van der Hoff b6146537d2 Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks 
Remove redundant list of known caveat prefixes
 2016-11-25 16:57:19 +00:00
Richard van der Hoff f62b69e32a Allow guest access to endpoints for E2E 
Expose /devices, /keys, and /sendToDevice to guest users, so that they can use
E2E.
 2016-11-25 15:26:34 +00:00
Richard van der Hoff 7f02e4d008 Give guest users a device_id 
We need to create devices for guests so that they can use e2e, but we don't
have anywhere to store it, so just use a fixed one.
 2016-11-25 15:25:30 +00:00
Erik Johnston 9192e593ec Merge pull request #1650 from matrix-org/erikj/respect_ratelimited 
Correctly handle 500's and 429 on federation
 2016-11-24 15:27:19 +00:00
Erik Johnston 11bfe438a2 Use correct var 2016-11-24 15:26:53 +00:00
Erik Johnston aaecffba3a Correctly handle 500's and 429 on federation 2016-11-24 15:04:49 +00:00
Richard van der Hoff e1d7c96814 Remove redundant list of known caveat prefixes 
Also add some comments.
 2016-11-24 12:38:17 +00:00
Erik Johnston 7e03f9a484 Bump version and changelog 2016-11-24 12:29:58 +00:00
Erik Johnston 46ca345b06 Don't send old events as federation 2016-11-24 12:29:02 +00:00
Erik Johnston f36ea03741 Bump changelog and version 2016-11-24 11:08:01 +00:00
Erik Johnston 11254bdf6d Merge pull request #1644 from matrix-org/erikj/efficient_notif_counts 
More efficient notif count queries
 2016-11-23 16:13:05 +00:00
Erik Johnston 1985860c6e Comment 2016-11-23 15:59:59 +00:00
Erik Johnston 2ac516850b More efficient notif count queries 2016-11-23 15:57:04 +00:00
Erik Johnston 302fbd218d Merge pull request #1635 from matrix-org/erikj/split_out_fed_txn 
Split out federation transaction sending to a worker
 2016-11-23 15:39:12 +00:00
Erik Johnston b2d6e63b79 Merge pull request #1641 from matrix-org/erikj/as_pushers 
Ignore AS users when fetching push rules
 2016-11-23 15:21:52 +00:00
Erik Johnston feec718265 Shuffle receipt handler around so that worker apps don't need to load it 2016-11-23 15:14:24 +00:00