Travis Ralston
|
f293d124b6
|
Merge branch 'develop' into travis/login-terms
|
2018-10-15 14:44:32 -06:00 |
|
David Baker
|
83e72bb2f0
|
PR feedback pt. 1
|
2018-10-12 11:26:18 +01:00 |
|
David Baker
|
b8d9e108be
|
Fix mergefail
|
2018-10-09 18:04:21 +01:00 |
|
David Baker
|
dc045ef202
|
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
|
2018-10-09 10:05:02 +01:00 |
|
Travis Ralston
|
fd99787162
|
Incorporate Dave's work for GDPR login flows
As per https://github.com/vector-im/riot-web/issues/7168#issuecomment-419996117
|
2018-10-03 15:57:42 -06:00 |
|
Amber Brown
|
6e05fd032c
|
Fix userconsent on Python 3 (#3938)
|
2018-10-02 00:11:58 +10:00 |
|
Schnuffle
|
dc5db01ff2
|
Replaced all occurences of e.message with str(e)
Signed-off-by: Schnuffle <schnuffle@github.com>
|
2018-09-27 13:38:50 +02:00 |
|
Hubert Chathi
|
3801b8aa03
|
try to make flake8 and isort happy
|
2018-09-06 11:35:19 -04:00 |
|
Richard van der Hoff
|
87c18d12ee
|
Implement 'event_format' filter param in /sync
This has been specced and part-implemented; let's implement it for /sync (but
no other endpoints yet :/).
|
2018-09-04 15:20:09 +01:00 |
|
Neil Johnson
|
301cb60d0b
|
assert rather than warn
|
2018-08-31 17:29:35 +01:00 |
|
Neil Johnson
|
0b01281e77
|
move threepid checker to config, add missing yields
|
2018-08-31 17:11:11 +01:00 |
|
Neil Johnson
|
e8e540630e
|
fix reference to is_threepid_reserved
|
2018-08-31 16:09:15 +01:00 |
|
Neil Johnson
|
09f3cf1a7e
|
ensure post registration auth checks do not fail erroneously
|
2018-08-31 15:42:51 +01:00 |
|
Neil Johnson
|
ea068d6f3c
|
fix bug where preserved threepid user comes to sign up and server is mau blocked
|
2018-08-31 10:49:14 +01:00 |
|
Erik Johnston
|
05077e06fa
|
Change admin_uri to admin_contact in config and errors
|
2018-08-24 16:51:27 +01:00 |
|
Hubert Chathi
|
83caead95a
|
Merge branch 'develop' into e2e_backups
|
2018-08-24 11:44:26 -04:00 |
|
Erik Johnston
|
cd77270a66
|
Implement trail users
|
2018-08-23 19:17:19 +01:00 |
|
Erik Johnston
|
fd2dbf1836
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-22 17:06:10 +01:00 |
|
Erik Johnston
|
9643a6f7f2
|
Update notice format
|
2018-08-22 17:00:29 +01:00 |
|
Erik Johnston
|
3bf8bab8f9
|
Merge pull request #3673 from matrix-org/erikj/refactor_state_handler
Refactor state module to support multiple room versions
|
2018-08-22 10:04:55 +01:00 |
|
Amber Brown
|
324525f40c
|
Port over enough to get some sytests running on Python 3 (#3668)
|
2018-08-20 23:54:49 +10:00 |
|
Erik Johnston
|
4d664278af
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler
|
2018-08-20 14:49:43 +01:00 |
|
Neil Johnson
|
e07970165f
|
rename error code
|
2018-08-18 14:39:45 +01:00 |
|
Neil Johnson
|
c5171bf171
|
special case server_notices_mxid
|
2018-08-18 12:33:07 +01:00 |
|
Neil Johnson
|
3ee57bdcbb
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-17 14:34:10 +01:00 |
|
Neil Johnson
|
b5f638f1f4
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-17 14:04:15 +01:00 |
|
Neil Johnson
|
69c49d3fa3
|
Merge branch 'develop' into neilj/limit_exceeded_error
|
2018-08-17 12:44:26 +00:00 |
|
Neil Johnson
|
bcfeb44afe
|
call reap on start up and fix under reaping bug
|
2018-08-16 22:55:32 +01:00 |
|
Neil Johnson
|
13ad9930c8
|
add new error type ResourceLimit
|
2018-08-16 18:02:02 +01:00 |
|
Neil Johnson
|
fc5d937550
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-15 16:31:40 +01:00 |
|
Neil Johnson
|
c24fc9797b
|
add new event types
|
2018-08-15 15:04:30 +01:00 |
|
Neil Johnson
|
87a824bad1
|
clean up AuthError
|
2018-08-15 11:58:03 +01:00 |
|
Neil Johnson
|
b8429c7c81
|
update error codes for resource limiting
|
2018-08-15 10:19:48 +01:00 |
|
Neil Johnson
|
ab035bdeac
|
replace admin_email with admin_uri for greater flexibility
|
2018-08-15 10:16:41 +01:00 |
|
Neil Johnson
|
19b433e3f4
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email
|
2018-08-14 17:44:46 +01:00 |
|
Neil Johnson
|
2545993ce4
|
make comments clearer
|
2018-08-14 15:48:12 +01:00 |
|
Neil Johnson
|
9b75c78b4d
|
support server notice state events for resource limits
|
2018-08-14 11:20:41 +01:00 |
|
Neil Johnson
|
f4b49152e2
|
support admin_email config and pass through into blocking errors, return AuthError in all cases
|
2018-08-13 21:09:47 +01:00 |
|
Neil Johnson
|
ce7de9ae6b
|
Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"
This reverts commit 0d43f991a1.
|
2018-08-13 18:06:18 +01:00 |
|
Neil Johnson
|
0d43f991a1
|
support admin_email config and pass through into blocking errors, return AuthError in all cases
|
2018-08-13 18:00:23 +01:00 |
|
Matthew Hodgson
|
0abb205b47
|
blindly incorporate PR review - needs testing & fixing
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
8ae64b270f
|
implement /room_keys/version too (untested)
|
2018-08-12 19:14:31 -04:00 |
|
Neil Johnson
|
885ea9c602
|
rename _user_last_seen_monthly_active
|
2018-08-09 18:02:12 +01:00 |
|
Neil Johnson
|
c1f9dec92a
|
fix errant parenthesis
|
2018-08-09 17:43:26 +01:00 |
|
Neil Johnson
|
09cf130898
|
only block on sync where user is not part of the mau cohort
|
2018-08-09 17:39:12 +01:00 |
|
Erik Johnston
|
152c0aa58e
|
Add constants for room versions
|
2018-08-09 14:55:47 +01:00 |
|
Neil Johnson
|
839a317c96
|
fix pep8 too many lines
|
2018-08-08 17:39:04 +01:00 |
|
Neil Johnson
|
5298d79fb5
|
Merge branch 'develop' into neilj/disable_hs
|
2018-08-08 16:13:03 +00:00 |
|
Richard van der Hoff
|
8521ae13e3
|
Merge pull request #3654 from matrix-org/rav/room_versions
Support for room versioning
|
2018-08-08 17:10:53 +01:00 |
|
Richard van der Hoff
|
3523f5432a
|
Don't expose default_room_version as config opt
|
2018-08-07 12:51:57 +01:00 |