6df1c79c22
Merge branch 'develop' into markjh/pushers_stream
2016-03-15 17:44:39 +00:00
12904932c4
Hook up adding a pusher to the notifier for replication.
2016-03-15 17:42:03 +00:00
b6e8420aee
Add replication stream for pushers
2016-03-15 17:33:10 +00:00
91779b49c4
Merge pull request #646 from matrix-org/erikj/reject_invite_federation
...
Persist rejection of invites over federation
2016-03-15 15:03:00 +00:00
e5f0e58931
Remove needless PreserveLoggingContext
2016-03-15 13:48:40 +00:00
9e982750ee
Persist rejection of invites over federation
2016-03-15 13:24:31 +00:00
6b1e9b8dfe
Merge pull request #645 from matrix-org/erikj/3pid_guest_config
...
Add config to create guest account on 3pid invite
2016-03-14 16:53:53 +00:00
590fbbef03
Add config to create guest account on 3pid invite
...
Currently, when a 3pid invite request is sent to an identity server, it
includes a provisioned guest access token. This allows the link in the,
say, invite email to include the guest access token ensuring that the
same account is used each time the link is clicked.
This flow has a number of flaws, including when using different servers
or servers that have guest access disabled.
For now, we keep this implementation but hide it behind a config option
until a better flow is implemented.
2016-03-14 15:50:40 +00:00
a547e2df85
Return list, not generator.
2016-03-14 15:30:19 +00:00
e462aa97bf
Merge pull request #644 from matrix-org/markjh/parse_jsonIII
...
Fix regression where synapse checked whether push rules were valid
2016-03-14 14:36:17 +00:00
398cd1edfb
Fix regression where synapse checked whether push rules were valid JSON before the compatibility hack that handled clients sending invalid JSON
2016-03-14 14:16:41 +00:00
494d0c8e02
Merge pull request #642 from matrix-org/erikj/logout
...
Implement logout
2016-03-11 20:16:25 +00:00
ffb9dd02fe
Merge pull request #643 from matrix-org/markjh/parse_json_II
...
Use parse_json_object_from_request to parse JSON out of request bodies
2016-03-11 17:27:37 +00:00
15122da0e2
Thats not how transactions work.
2016-03-11 16:45:27 +00:00
e9c1cabac2
Use parse_json_object_from_request to parse JSON out of request bodies
2016-03-11 16:41:03 +00:00
ae6ff09494
Emtpy commit
2016-03-11 16:33:22 +00:00
b13035cc91
Implement logout
2016-03-11 16:27:50 +00:00
c081228439
Fix SQL statement
2016-03-11 15:09:17 +00:00
b5afe6bc38
Merge pull request #641 from matrix-org/dbkr/fix_change_password
...
Fix logout on password change
2016-03-11 14:48:20 +00:00
2dee03aee5
more pep8
2016-03-11 14:38:23 +00:00
af59826a2f
Make select more sensible when dseleting access tokens, rename pusher deletion to match access token deletion and make exception arg optional.
2016-03-11 14:34:09 +00:00
f523177850
Delete old, unused methods and rename new one to just be `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin.
2016-03-11 14:29:01 +00:00
57c444b3ad
Dear PyCharm, please indent sensibly for me. Thx.
2016-03-11 14:25:05 +00:00
d5fda6e3b0
Merge pull request #640 from matrix-org/erikj/keyclient_host
...
Make key client send a Host header
2016-03-11 13:32:59 +00:00
58443a022d
Merge pull request #635 from matrix-org/erikj/sync_order
...
Use topological orders for initial sync timeline
2016-03-11 13:17:49 +00:00
aa11db5f11
Fix cache invalidation so deleting access tokens (which we did when changing password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f0549
2016-03-11 13:14:18 +00:00
2e2be463f8
Make key client send a Host header
2016-03-11 10:29:05 +00:00
379c60b08d
Merge pull request #638 from matrix-org/daniel/appserviceid
...
Store appservice ID on register
2016-03-10 15:58:27 +00:00
465605d616
Store appservice ID on register
2016-03-10 15:58:22 +00:00
703826886c
Merge pull request #639 from matrix-org/erikj/as_user_update_batch
...
Update users table in a batched manner
2016-03-10 15:38:00 +00:00
9669a99d1a
Update users table in a batched manner
2016-03-10 15:12:19 +00:00
c22a3f37a9
Merge pull request #637 from blide/develop
...
SYN-646 - Register endpoint returns refresh_token
2016-03-10 14:03:48 +00:00
1be438f2a6
Flake8 fix
2016-03-10 12:13:35 +03:00
40160e24ab
Register endpoint returns refresh_token
...
Guest registration still doesn't return refresh_token
2016-03-10 10:29:19 +03:00
8a88684736
Add comment
2016-03-09 16:51:22 +00:00
af2fe6110c
Return the correct token form
2016-03-09 16:11:53 +00:00
3ecaabc7fd
Use topological orders for initial sync timeline
2016-03-09 15:45:34 +00:00
1309b8ca97
Merge pull request #634 from matrix-org/erikj/pin_saml2_version
...
Pin pysaml2 version to 3.x
2016-03-09 11:57:33 +00:00
07cf96ebf7
Pin pysaml2 version to 3.x
...
This is due to the fact that `from saml2 import config` fails in version
4.x
2016-03-09 11:54:56 +00:00
b7b899cae6
Merge pull request #628 from matrix-org/markjh/parse_json
...
Add a parse_json_object function
to deduplicate all the copy+pasted _parse_json functions. Also document
the parse_.* functions.
2016-03-09 11:26:30 +00:00
b7dbe5147a
Add a parse_json_object function
...
to deduplicate all the copy+pasted _parse_json functions. Also document
the parse_.* functions.
2016-03-09 11:26:26 +00:00
158a322e82
Ensure integer is an integer
2016-03-09 10:20:48 +00:00
ce829c2aef
Reinstate coverage checks for integ tests
2016-03-09 00:14:19 +00:00
4814e7c9b2
Specify synapse-directory for integ tests
2016-03-09 00:06:57 +00:00
866d0e7cb8
Only build py27 tox env for integ tests
2016-03-08 23:47:50 +00:00
1748d4b739
Use sytest build scripts, rather than reinventing the wheel
2016-03-08 23:37:39 +00:00
5f5817ab05
Merge pull request #632 from matrix-org/markjh/py3v2
...
Fix relative imports so they work in both py3 and py27
2016-03-08 18:11:10 +00:00
b117f67227
Merge pull request #633 from matrix-org/daniel/ick
...
Idempotent-ise schema update script
2016-03-08 17:45:46 +00:00
3b97797c8d
Merge branch 'develop' into daniel/ick
2016-03-08 17:35:09 +00:00
edca2d9891
Idempotent-ise schema update script
...
If any ASes don't have an ID, the schema will fail, and then it will
error when trying to add the column again.
2016-03-08 17:32:29 +00:00
Mark Haines