Commit Graph

14543 Commits (40ea934de0dbc680d4533931a077352a652a1287)

Author SHA1 Message Date
Brendan Abolivier 40ea934de0
Merge pull request #5471 from matrix-org/erikj/3pid_remote_invite_state
Port "Fix 3PID invite room state over federation" to dinsic
2019-06-17 11:43:02 +01:00
Brendan Abolivier 5c4296b47a Merge branch 'babolivier/third_party_event_rules' into dinsic 2019-06-14 19:38:44 +01:00
Brendan Abolivier 8b2543c0ec
Merge pull request #5466 from matrix-org/babolivier/fix_deactivation_bg_job
Port "Fix background job for deactivated flag" to dinsic
2019-06-14 19:22:56 +01:00
Brendan Abolivier bd59e154c1 Fix changelog 2019-06-14 18:29:13 +01:00
Brendan Abolivier 66378d13ce Changelog 2019-06-14 18:29:13 +01:00
Brendan Abolivier 65d3652cb7 Fix background job for deactivated flag 2019-06-14 18:29:13 +01:00
Brendan Abolivier f874b16b2e Add plugin APIs for implementations of custom event rules. 2019-06-14 18:16:03 +01:00
Brendan Abolivier c644755123
Merge pull request #5463 from matrix-org/babolivier/account_validity_deactivated_accounts_2
Port "Don't send renewal emails to deactivated users" to dinsic
2019-06-14 17:19:57 +01:00
Brendan Abolivier c7964e7430
Fix test 2019-06-14 16:25:18 +01:00
Erik Johnston 3c9bb86fde Newsfile 2019-06-14 16:19:11 +01:00
Erik Johnston 304a1376c2 Fix 3PID invite room state over federation.
Fixes that when a user exchanges a 3PID invite for a proper invite over
federation it does not include the `invite_room_state` key.

This was due to synapse incorrectly sending out two invite requests.
2019-06-14 16:19:11 +01:00
Brendan Abolivier aded5cfb72 Don't send renewal emails to deactivated users 2019-06-14 15:39:18 +01:00
Brendan Abolivier 57bd5cfc9a Track deactivated accounts in the database (#5378) 2019-06-14 13:45:36 +01:00
Brendan Abolivier ad566df746
Merge pull request #5420 from matrix-org/babolivier/userdir_hide_users
Add configuration option to hide new users from the user directory
2019-06-14 10:59:45 +01:00
Brendan Abolivier c4759cd041 Merge branch 'dinsic' into babolivier/userdir_hide_users 2019-06-14 10:37:43 +01:00
Brendan Abolivier 4dda68da9a
Make index unique 2019-06-14 10:37:12 +01:00
Brendan Abolivier adf3eee668 Merge branch 'babolivier/fix_profile_replication' into babolivier/userdir_hide_users 2019-06-13 18:11:11 +01:00
Brendan Abolivier a6cf1e079e
Merge pull request #5416 from matrix-org/babolivier/fix_profile_replication
Add unique index to the profile_replication_status table.
2019-06-13 18:10:14 +01:00
Brendan Abolivier 996cf15d42
Lint 2019-06-13 17:41:13 +01:00
Brendan Abolivier 27cd0b3037
Fix snafu 2019-06-13 17:40:14 +01:00
Neil Johnson 4f68188d0b
Change to absolute path for contrib/docker
because this file is reproduced on dockerhub and relative paths don't work
2019-06-13 16:42:36 +01:00
Brendan Abolivier 26a27e06b9
Create the index in a background update 2019-06-13 15:57:55 +01:00
Brendan Abolivier 5283f65316 Fix bogus changelog 2019-06-12 16:49:10 +01:00
Brendan Abolivier 4a1b749582 Lint 2019-06-12 16:48:51 +01:00
Brendan Abolivier e0c56d6527
Merge branch 'dinsic' into babolivier/fix_profile_replication 2019-06-12 16:41:08 +01:00
Brendan Abolivier 7c2d936802
Fix bogus changelog 2019-06-12 16:38:00 +01:00
Brendan Abolivier 1c7628eb3a
Lint 2019-06-12 16:36:28 +01:00
Brendan Abolivier 8400e5f624
Merge branch 'dinsic' into babolivier/userdir_hide_users 2019-06-12 16:29:56 +01:00
Brendan Abolivier 02a659ae30
Regenerate full schemas 2019-06-12 15:51:59 +01:00
Brendan Abolivier a55b2efca1
Fix path for password policy endpoints 2019-06-12 15:51:42 +01:00
Brendan Abolivier d907e8f599
Merge branch 'master' into dinsic 2019-06-12 14:36:44 +01:00
Erik Johnston 97174780ce 1.0.0 2019-06-11 17:10:01 +01:00
Erik Johnston 9532eb55ec
Merge pull request #5424 from matrix-org/erikj/change_password_reset_links
Change password reset links to /_matrix.
2019-06-11 13:29:42 +01:00
Erik Johnston a766c41d25 Bump bleach version so that tests can run on old deps. 2019-06-11 12:34:18 +01:00
Neil Johnson 426218323b
Neilj/improve federation docs (#5419)
Add FAQ questions to federate.md. Add a health warning making it clear that the 1711 upgrade FAQ is now out of date.
2019-06-11 12:17:43 +01:00
Erik Johnston 453aaaadc0 Newsfile 2019-06-11 11:34:38 +01:00
Erik Johnston 10383e6e6f Change password reset links to /_matrix. 2019-06-11 11:34:33 +01:00
Brendan Abolivier 3c8262b181
Merge branch 'master' into dinsic 2019-06-11 10:55:53 +01:00
Erik Johnston 6bac9ca6d7 1.0.0rc3 2019-06-11 00:13:02 +01:00
Erik Johnston 49e01e5710 Fix defaults on checking threepids 2019-06-10 23:09:31 +01:00
Erik Johnston 78e74ab8a1
Merge pull request #5418 from matrix-org/erikj/fix_send_fed_with_limit_zero
Fix bug sending federation transactions with lots of EDUs
2019-06-10 20:19:49 +01:00
Erik Johnston 0167447965 1.0.0rc2 2019-06-10 18:17:43 +01:00
Erik Johnston a6b1817940
Merge pull request #5417 from matrix-org/rav/shared_ssl_context
Share an SSL context object between SSL connections
2019-06-10 18:16:12 +01:00
Richard van der Hoff db74c4fc6c fix ci on py2, again 2019-06-10 17:55:01 +01:00
Richard van der Hoff 81b8fdedf2 rename gutwrenched attr 2019-06-10 17:51:11 +01:00
Richard van der Hoff 19780a521e fix CI on python 2.7 2019-06-10 17:41:10 +01:00
Brendan Abolivier 389aa20170
Generate sample config 2019-06-10 17:31:45 +01:00
Brendan Abolivier c10226581a
Lint 2019-06-10 17:25:42 +01:00
Brendan Abolivier 10510f1e7e
Lint 2019-06-10 17:23:11 +01:00
Brendan Abolivier 9ece96f5c8
Changelog 2019-06-10 17:17:18 +01:00