Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-04 16:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
6985 commits 887 branches 702 tags 478 MiB
Commit graph

6985 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston fcde5b2a97 Print authorization header for federation_client.py 2016-08-02 15:06:17 +01:00
Erik Johnston 342e072024 Merge pull request #967 from matrix-org/erikj/fed_reader 
Split out the federation reading portions into a separate.
 2016-08-02 13:59:47 +01:00
Erik Johnston 55e8a87888 Change default jenkins port base and count 2016-08-02 13:41:17 +01:00
David Baker 26a8c1d7ab Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_register 
Fix adding emails on registration
 2016-08-02 10:32:17 +01:00
Mark Haines 54de6a812a Merge branch 'develop' into dbkr/fix_add_email_on_register 2016-08-02 10:18:15 +01:00
Erik Johnston 733bf44290 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader 2016-08-02 09:56:31 +01:00
Erik Johnston f14cd95342 Merge pull request #970 from matrix-org/erikj/clock 
Ignore AlreadyCalled errors on timer cancel
 2016-08-02 09:50:37 +01:00
Matthew Hodgson bfeaab6dfc missing --upgrade 2016-08-01 17:12:02 +01:00
Erik Johnston b260f92936 Ignore AlreadyCalled errors on timer cancel 2016-07-31 16:00:12 +01:00
David Baker 271d3e7865 Fix adding emails on registration 
Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing.
 2016-07-29 15:25:24 +01:00
Paul Evans 18b7eb830b Merge pull request #958 from matrix-org/paul/SYN-738 
Forbid non-ASes from registering users whose names begin with '_'
 2016-07-29 14:10:45 +01:00
Erik Johnston 74106ba171 Make jenkins dendron test federation read apis 2016-07-29 11:45:03 +01:00
Erik Johnston 2a9ce8c422 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader 2016-07-29 11:33:46 +01:00
Erik Johnston cbea0c7044 Merge pull request #964 from matrix-org/erikj/fed_join_fix 
Handle the case of missing auth events when joining a room
 2016-07-29 11:33:16 +01:00
Erik Johnston 5aa024e501 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader 2016-07-29 11:24:56 +01:00
Erik Johnston c51a52f300 Mention that func will fetch auth events 2016-07-29 11:17:04 +01:00
Erik Johnston 3d13c3a295 Update docstring 2016-07-29 10:45:05 +01:00
Mark Haines a679a01dbe Merge pull request #966 from matrix-org/markjh/fix_push 
Create separate methods for getting messages to push
 2016-07-29 10:13:01 +01:00
Mark Haines 8dad08a950 Fix SQL to supply arguments in the same order 2016-07-29 09:57:13 +01:00
Mark Haines 0a7d3cd00f Create separate methods for getting messages to push 
for the email and http pushers rather than trying to make a single
method that will work with their conflicting requirements.

The http pusher needs to get the messages in ascending stream order, and
doesn't want to miss a message.

The email pusher needs to get the messages in descending timestamp order,
and doesn't mind if it misses messages.
 2016-07-28 20:24:24 +01:00
Erik Johnston ec8b217722 Add destination retry to slave store 2016-07-28 17:35:53 +01:00
Kegsay 328ad6901d Merge pull request #965 from matrix-org/kegan/comment-push-actions-fn 
Comment get_unread_push_actions_for_user_in_range function
 2016-07-28 17:27:28 +01:00
Erik Johnston 76b89d0edb Add slace storage functions for public room list 2016-07-28 17:03:40 +01:00
Kegan Dougal 370135ad0b Comment get_unread_push_actions_for_user_in_range function 2016-07-28 16:47:37 +01:00
Erik Johnston 0fcbca531f Add get_auth_chain to slave store 2016-07-28 16:36:28 +01:00
Erik Johnston 1e2740caab Handle the case of missing auth events when joining a room 2016-07-28 16:08:33 +01:00
Erik Johnston 6ede23ff1b Add more key storage funcs into slave store 2016-07-28 15:41:26 +01:00
Erik Johnston 591ad2268c Merge pull request #963 from matrix-org/erikj/admin_docs 
Add some basic admin API docs
 2016-07-28 15:19:30 +01:00
Erik Johnston 3c3246c078 Use correct path 2016-07-28 15:08:37 +01:00
Erik Johnston 5fb41a955c Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop 2016-07-28 14:56:32 +01:00
Erik Johnston 367b594183 Add some basic admin API docs 2016-07-28 14:56:09 +01:00
Erik Johnston 7861cfec0a Add authors to changelog 2016-07-28 14:35:05 +01:00
Erik Johnston 019cf013d6 Update changelog 2016-07-28 11:30:08 +01:00
Mark Haines 4329f20e3f Merge pull request #962 from matrix-org/markjh/retry 
Fix retry utils to check if the exception is a subclass of CME
 2016-07-28 11:12:19 +01:00
Erik Johnston a285194021 Merge branch 'erikj/key_client_fix' of github.com:matrix-org/synapse into release-v0.17.0 2016-07-28 10:47:06 +01:00
Mark Haines bf81e38d36 Fix retry utils to check if the exception is a subclass of CME 2016-07-28 10:47:02 +01:00
Erik Johnston 78cac3e594 Merge pull request #941 from matrix-org/erikj/key_client_fix 
Send the correct host header when fetching keys
 2016-07-28 10:46:36 +01:00
Erik Johnston 7871790db1 Bump version and changelog 2016-07-28 10:38:56 +01:00
Erik Johnston 18e044628e Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0 2016-07-28 10:37:43 +01:00
Erik Johnston b557b682d9 Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name 
Don't include name of room for invites in push
 2016-07-28 10:36:41 +01:00
David Baker 389c890f14 Don't include name of room for invites in push 
Avoids insane pushes like, "Bob invited you to invite from Bob"
 2016-07-28 10:20:47 +01:00
Richard van der Hoff cd8738ab63 Merge pull request #960 from matrix-org/rav/support_r0.2 
Add r0.2.0 to the "supported versions" list
 2016-07-28 10:14:33 +01:00
Richard van der Hoff f6f8f81a48 Add r0.1.0 to the "supported versions" list 2016-07-28 10:14:07 +01:00
David Baker ecd5e6bfa4 Typo 2016-07-28 10:04:52 +01:00
Richard van der Hoff fda078f995 Add r0.2.0 to the "supported versions" list 2016-07-28 09:14:21 +01:00
Richard van der Hoff 40e539683c Merge pull request #956 from matrix-org/rav/check_device_id_on_key_upload 
Make the device id on e2e key upload optional
 2016-07-27 18:16:57 +01:00
Paul "LeoNerd" Evans 05f6447301 Forbid non-ASes from registering users whose names begin with '_' (SYN-738) 2016-07-27 17:54:26 +01:00
Erik Johnston 5238960850 Bump CHANGES and version 2016-07-27 17:33:09 +01:00
Richard van der Hoff ccec25e2c6 key upload tweaks 
1. Add v2_alpha URL back in, since things seem to be using it.

2. Don't reject the request if the device_id in the upload request fails to
   match that in the access_token.
 2016-07-27 16:41:06 +01:00
Mark Haines c38b7c4104 Merge pull request #957 from matrix-org/markjh/verify 
Clean up verify_json_objects_for_server
 2016-07-27 15:33:32 +01:00