977078f06d
Fix bad merge
2017-10-27 15:10:50 +01:00
6980c4557e
Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into develop
2017-10-27 15:09:05 +01:00
4ab8abbc2b
Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse into develop
2017-10-27 15:07:08 +01:00
6af3656deb
Merge pull request #2595 from matrix-org/erikj/attestation_commnet
...
Add comment about attestations
2017-10-27 14:20:19 +01:00
4d83632009
Merge pull request #2591 from matrix-org/rav/device_delete_auth
...
Device deletion: check UI auth matches access token
2017-10-27 12:30:10 +01:00
110b373e9c
Merge pull request #2589 from matrix-org/rav/as_deactivate_account
...
Allow ASes to deactivate their own users
2017-10-27 12:29:32 +01:00
ca571b0ec3
Add jitter to validity period of attestations
...
This helps ensure that the renewals of attestations are spread out more
evenly.
2017-10-27 11:57:27 +01:00
d8c26162a1
Merge pull request #2582 from matrix-org/luke/group-is-public
...
Add is_public to groups table to allow for private groups
2017-10-27 11:41:13 +01:00
c067088747
Add comment about attestations
2017-10-27 11:35:41 +01:00
5451cc7792
Request is_public from database
2017-10-27 11:27:43 +01:00
124314672f
group is dict
2017-10-27 11:08:19 +01:00
6362298fa5
Create groups with is_public = True
2017-10-27 11:04:20 +01:00
8b56977b6f
Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_header
...
Front-end proxy: pass through auth header
2017-10-27 11:01:50 +01:00
173567a7f2
Docstring for post_urlencoded_get_json
2017-10-27 10:59:50 +01:00
c7d9f25d22
Fix create_group to pass requester_user_id
2017-10-27 10:57:20 +01:00
e27b76d117
Import logger
2017-10-27 10:54:02 +01:00
8854c039f2
Merge pull request #2585 from matrix-org/rav/unstable_to_r0
...
Support /keys/upload on /r0 as well as /unstable
2017-10-27 10:53:48 +01:00
14f581abc2
Merge pull request #2584 from matrix-org/rav/fix_httpclient_logcontexts
...
Fix logcontext leaks in httpclient
2017-10-27 10:53:29 +01:00
2ca46c7afc
Correct logic for checking private group membership
2017-10-27 10:48:01 +01:00
82d8c1bacb
Fixup
2017-10-27 10:30:21 +01:00
2fd9831f7c
Merge pull request #2574 from matrix-org/erikj/room_list_fixes
...
Add logging and fix log contexts for publicRooms
2017-10-27 10:01:23 +01:00
195abfe7a5
Remove incorrect attestations
2017-10-27 09:58:13 +01:00
d8dde19f04
Log if we try to do attestations for our own user and group
2017-10-27 09:55:01 +01:00
585972b51a
Don't generate group attestations for local users
2017-10-27 09:46:56 +01:00
7a6546228b
Device deletion: check UI auth matches access token
...
(otherwise there's no point in the UI auth)
2017-10-27 00:04:31 +01:00
92f680889d
spell out need for libxml2 for lxml to work
2017-10-27 00:02:29 +01:00
785bd7fd75
Allow ASes to deactivate their own users
2017-10-27 00:01:00 +01:00
c89e6aadff
Merge pull request #2581 from matrix-org/rav/fix_init_with_no_logfile
...
Fix error when running synapse with no logfile
2017-10-26 22:16:57 +01:00
54a2525133
Front-end proxy: pass through auth header
...
So that access-token-in-an-auth-header works.
2017-10-26 18:19:01 +01:00
0a5866bec9
Support /keys/upload on /r0 as well as /unstable
...
(So that we can stop riot relying on it in /unstable)
2017-10-26 18:18:23 +01:00
0d8e3ad48b
Fix logcontext leaks in httpclient
...
`preserve_context_over_fn` is borked
2017-10-26 18:17:10 +01:00
12ef02dc3d
SimpleHTTPClient: add support for headers
...
Sometimes we need to pass headers into these methods
2017-10-26 17:59:50 +01:00
69e8a05f35
Make it work
2017-10-26 17:55:58 +01:00
007cd48af6
Recreate groups table instead of adding column
...
Adding a column with non-constant default not possible in sqlite3
2017-10-26 17:55:22 +01:00
713e60b9b6
Awful hack to get default true
2017-10-26 17:38:14 +01:00
e86cefcb6f
Add groups table to BOOLEAN_COLUMNS in synapse_port_db
2017-10-26 17:24:54 +01:00
cfa4e658e0
Bump schema version to 46
2017-10-26 17:23:49 +01:00
595fe67f01
delint
2017-10-26 17:20:24 +01:00
9b2feef9eb
Add is_public to groups table to allow for private groups
...
Prevent group API access to non-members for private groups
Also make all the group code paths consistent with `requester_user_id` always being the User ID of the requesting user.
2017-10-26 16:51:32 +01:00
f7f90e0c8d
Fix error when running synapse with no logfile
...
Fixes 'UnboundLocalError: local variable 'sighup' referenced before assignment'
2017-10-26 16:45:20 +01:00
1dd0f53b21
Merge pull request #2579 from krombel/move_unstable_to_r0
...
register some /unstable endpoints in /r0 as well
2017-10-26 16:10:43 +01:00
8299b323ee
add release endpoints for /thirdparty
2017-10-26 16:58:20 +02:00
9b436c8b4c
register some /unstable endpoints in /r0 as well
2017-10-26 15:22:50 +02:00
5b38fdab31
Merge pull request #2578 from matrix-org/rav/code_style_imports
...
Code_style updates
2017-10-26 11:55:59 +01:00
1eb300e1fc
Document import rules
2017-10-26 11:55:41 +01:00
f7f6bfaae4
code_style: more formatting
2017-10-26 11:55:41 +01:00
4ea882ede4
Merge pull request #2577 from matrix-org/erikj/fix_port
...
Fix port script
2017-10-26 11:54:12 +01:00
566e21eac8
Update room_list.py
2017-10-26 11:39:54 +01:00
351cc35342
code_style.rst: a couple of tidyups
2017-10-26 10:29:26 +01:00
37d766aedd
Fix port script
...
We changed _simple_update_one_txn to use _simple_update_txn but didn't
yank it out in the port script.
Fixes #2565
2017-10-26 10:01:03 +01:00
Erik Johnston