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 |
|
Matthew Hodgson
|
cf1e2000f6
|
document the API
|
2018-08-12 19:13:09 -04:00 |
|
Matthew Hodgson
|
6b8c07abc2
|
make it work and fix pep8
|
2018-08-12 19:13:09 -04:00 |
|
Matthew Hodgson
|
0bc4627a73
|
interim WIP checkin; doesn't build yet
|
2018-08-12 18:23:10 -04:00 |
|
Matthew Hodgson
|
53ace904b2
|
total WIP skeleton for /room_keys API
|
2018-08-12 18:23:10 -04:00 |
|
Neil Johnson
|
ac205a54b2
|
Fixes test_reap_monthly_active_users so it passes under postgres
|
2018-08-11 22:50:09 +01:00 |
|
Neil Johnson
|
31fa743567
|
fix sqlite/postgres incompatibility in reap_monthly_active_users
|
2018-08-11 22:38:34 +01:00 |
|
Neil Johnson
|
c79c4c0a7d
|
server notices for resource limit blocking
|
2018-08-10 15:25:47 +01:00 |
|
Neil Johnson
|
6c6aba76e1
|
implementation of server notices to alert on hitting resource limits
|
2018-08-10 15:12:59 +01:00 |
|
Amber Brown
|
a001038b92
|
Merge pull request #3679 from matrix-org/hawkowl/blackify-tests
Blackify the tests
|
2018-08-11 00:12:56 +10:00 |
|
Amber Brown
|
807449d8f2
|
fix up a forced long line
|
2018-08-11 00:01:43 +10:00 |
|
Richard van der Hoff
|
c31793a784
|
Merge branch 'rav/fix_linearizer_cancellation' into develop
|
2018-08-10 14:57:27 +01:00 |
|
Richard van der Hoff
|
c08f9d95b2
|
log *after* reloading log config
... because logging *before* reloading means the log message gets lost in the old MemoryLogger
|
2018-08-10 14:56:48 +01:00 |
|
Amber Brown
|
dd16e7dfcc
|
changelog
|
2018-08-10 23:54:46 +10:00 |
|
black
|
8b3d9b6b19
|
Run black.
|
2018-08-10 23:54:09 +10:00 |
|
Amber Brown
|
b37c472419
|
Rename async to async_helpers because async is a keyword on Python 3.7 (#3678)
|
2018-08-10 23:50:21 +10:00 |
|