Neil Johnson
|
8f9a7eb58d
|
support admin_email config and pass through into blocking errors, return AuthError in all cases
|
2018-08-14 15:11:54 +01:00 |
|
Neil Johnson
|
c74c71128d
|
remove blank line
|
2018-08-14 15:06:24 +01:00 |
|
Neil Johnson
|
ed4bc3d2fc
|
fix off by 1s on mau
|
2018-08-14 15:04:48 +01:00 |
|
Neil Johnson
|
bd92c8eaa7
|
Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
|
2018-08-14 14:56:45 +01:00 |
|
Neil Johnson
|
99ebaed8e6
|
Update register.py
remove comments
|
2018-08-14 14:55:55 +01:00 |
|
Neil Johnson
|
9b5bf3d858
|
Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
|
2018-08-14 14:51:38 +01:00 |
|
Neil Johnson
|
e25d87d97b
|
Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
|
2018-08-14 14:32:18 +01:00 |
|
Neil Johnson
|
e2c9fe0a6a
|
backout ability to pass in event type to server notices
|
2018-08-14 13:32:56 +01:00 |
|
Amber Brown
|
614e6d517d
|
Dockerised sytest (#3660)
|
2018-08-14 21:30:34 +10:00 |
|
Amber Brown
|
0bdc362598
|
Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgres
Neilj/fix reap users in postgres
|
2018-08-14 21:29:35 +10:00 |
|
Amber Brown
|
591bf87c6a
|
Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres
|
2018-08-14 20:56:23 +10:00 |
|
Amber Brown
|
bdfbd934d6
|
Implement a new test baseclass to cut down on boilerplate (#3684)
|
2018-08-14 20:53:43 +10:00 |
|
Neil Johnson
|
9b75c78b4d
|
support server notice state events for resource limits
|
2018-08-14 11:20:41 +01:00 |
|
Jan Christian Grünhage
|
8f0c430ca4
|
Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-base
update docker base-image to alpine 3.8
|
2018-08-14 11:43:59 +02:00 |
|
Neil Johnson
|
63417c31e9
|
fix typo
|
2018-08-13 22:36:52 +01:00 |
|
Neil Johnson
|
1f24d8681b
|
set admin email via config
|
2018-08-13 21:26:43 +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 |
|
Richard van der Hoff
|
b6d55588e1
|
Changelog should link to PRs
The changelog makes much more sense if it consistently links to PRs, rather
than mostly PRs with the occasional issue #.
|
2018-08-13 18:56:55 +01:00 |
|
Richard van der Hoff
|
8ba2dac6ea
|
Name changelog after PR, not bug
|
2018-08-13 18:54:01 +01:00 |
|
Richard van der Hoff
|
50bcaf1a27
|
Merge pull request #3677 from andrewshadura/master
Use recaptcha_ajax.js directly from Google
|
2018-08-13 18:52:56 +01:00 |
|
Richard van der Hoff
|
cd32c19a60
|
Merge pull request #3685 from matrix-org/revert-3677-master
Revert "Use recaptcha_ajax.js directly from Google"
|
2018-08-13 18:49:50 +01:00 |
|
Richard van der Hoff
|
34f51babc5
|
Revert "Use recaptcha_ajax.js directly from Google"
|
2018-08-13 18:48:03 +01:00 |
|
Richard van der Hoff
|
8226e5597a
|
Merge pull request #3677 from andrewshadura/master
Use recaptcha_ajax.js directly from Google
|
2018-08-13 18:47:51 +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 |
|
Amber Brown
|
99dd975dae
|
Run tests under PostgreSQL (#3423)
|
2018-08-13 16:47:46 +10:00 |
|
Matthew Hodgson
|
4f7064f6b5
|
missing import
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
f0cede5556
|
missing import
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
54ac18e832
|
use parse_string
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
66a4ca1d28
|
404 nicely if you try to interact with a missing current version
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
72788cf9c1
|
support DELETE /version with no args
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
edc427a351
|
flake8
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
fe87890b18
|
implement remaining tests and make them work
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
f6a3067868
|
linting
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
15d513f16f
|
fix idiocies and so make tests pass
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
174be586e5
|
first cut at a UT
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
b5eee511c7
|
don't needlessly return user_id
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
93d174bcc4
|
improve docstring
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
5e42c45c96
|
switch get_current_version_info back to being get_version_info
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
982edca380
|
fix flakes
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
234611f347
|
fix typos
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
14b3da63a3
|
add a tonne of docstring; make upload_room_keys properly assert version
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
9f0791b7bd
|
add a tonne of docstring; make upload_room_keys properly assert version
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
9f500cb39e
|
more docstring for the e2e_room_keys rest
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
8d14598e90
|
add storage docstring; remove unused set_e2e_room_keys
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
ca0b052307
|
fix factoring out of _should_replace_room_key
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
cac0253799
|
rename room_key_version table correctly, and fix opt args
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
0abb205b47
|
blindly incorporate PR review - needs testing & fixing
|
2018-08-12 19:14:31 -04:00 |
|
Matthew Hodgson
|
69e51c7ba4
|
make /room_keys/version work
|
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 |
|