Neil Johnson
|
8cfad2e686
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-15 17:20:38 +01:00 |
|
Neil Johnson
|
81d727efa9
|
Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus
Fix Mau off by one errors
|
2018-08-15 16:19:41 +00:00 |
|
Neil Johnson
|
da7fe43899
|
Fix mau blocking calulation bug on login
|
2018-08-15 17:03:30 +01:00 |
|
Richard van der Hoff
|
e2e846628d
|
Remove incorrectly re-added changelog files
These were removed for the 0.33.2 release, but were incorrectly re-added in
|
2018-08-15 16:38:46 +01:00 |
|
Matthew Hodgson
|
2f78f432c4
|
speed up /members and add at= and membership params (#3568)
|
2018-08-15 16:35:22 +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
|
86a00e05e1
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
|
2018-08-15 16:27:08 +01:00 |
|
Neil Johnson
|
eabc5f8271
|
wip cut at sending resource server notices
|
2018-08-15 15:04:52 +01:00 |
|
Neil Johnson
|
c24fc9797b
|
add new event types
|
2018-08-15 15:04:30 +01:00 |
|
Erik Johnston
|
dc56c47dc0
|
Merge pull request #3653 from matrix-org/erikj/split_federation
Move more federation APIs to workers
|
2018-08-15 14:59:02 +01:00 |
|
Neil Johnson
|
4601129c44
|
Merge pull request #3687 from matrix-org/neilj/admin_email
support admin_email config and pass through into blocking errors,
|
2018-08-15 13:52:25 +00:00 |
|
Erik Johnston
|
ef184caf30
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
|
2018-08-15 14:25:46 +01:00 |
|
Erik Johnston
|
488ffe6fdb
|
Use federation handler function rather than duplicate
This involves renaming _persist_events to be a public function.
|
2018-08-15 14:17:18 +01:00 |
|
Erik Johnston
|
773db62a22
|
Rename slave TransactionStore to SlaveTransactionStore
|
2018-08-15 14:17:06 +01:00 |
|
Neil Johnson
|
39176f27f7
|
remove changelog referencing another PR
|
2018-08-15 13:53:51 +01:00 |
|
Neil Johnson
|
87a824bad1
|
clean up AuthError
|
2018-08-15 11:58:03 +01:00 |
|
Neil Johnson
|
c4eb97518f
|
Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synapse into neilj/admin_email
|
2018-08-15 11:53:01 +01:00 |
|
Neil Johnson
|
55afba0fc5
|
update admin email to uri
|
2018-08-15 11:41:18 +01:00 |
|
Neil Johnson
|
75c663c7b9
|
update error codes
|
2018-08-15 11:27:48 +01:00 |
|
Neil Johnson
|
1c5e690a6b
|
Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name
combine mau metrics into one group
|
2018-08-15 09:53:59 +00:00 |
|
Erik Johnston
|
fef2e65d12
|
Merge pull request #3667 from matrix-org/erikj/fixup_unbind
Don't fail requests to unbind 3pids for non supporting ID servers
|
2018-08-15 10:32:12 +01:00 |
|
Neil Johnson
|
596ce63576
|
update resource limit error codes
|
2018-08-15 10:23:28 +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
|
b586b8b986
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
|
2018-08-14 17:43:22 +01:00 |
|
Neil Johnson
|
70e48cbbb1
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_prometheus_mau_metric_name
|
2018-08-14 17:40:59 +01:00 |
|
Neil Johnson
|
aa3220df6a
|
Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_reserved_users
Neil/fix postgres test initialise reserved users
|
2018-08-14 16:40:11 +00:00 |
|
Neil Johnson
|
7277216d01
|
fix setup_test_homeserver to be postgres compatible
|
2018-08-14 17:14:39 +01:00 |
|
Neil Johnson
|
cd0c749c4f
|
Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users
|
2018-08-14 17:06:51 +01:00 |
|
Neil Johnson
|
9ecbaf8ba8
|
adding missing yield
|
2018-08-14 16:55:28 +01:00 |
|
Neil Johnson
|
1522ed9c07
|
in case max_mau is less than I think
|
2018-08-14 16:52:30 +01:00 |
|
Neil Johnson
|
629f390035
|
Rename MAU prometheus metric
|
2018-08-14 16:38:05 +01:00 |
|
Neil Johnson
|
e5962f845c
|
pep8
|
2018-08-14 16:36:14 +01:00 |
|
Neil Johnson
|
e7d091fb86
|
combine mau metrics into one group
|
2018-08-14 16:26:55 +01:00 |
|
Neil Johnson
|
414d54b61a
|
Merge pull request #3670 from matrix-org/neilj/mau_sync_block
Block ability to read via sync if mau limit exceeded
|
2018-08-14 15:21:31 +00:00 |
|
Neil Johnson
|
2545993ce4
|
make comments clearer
|
2018-08-14 15:48:12 +01:00 |
|
Neil Johnson
|
06b331ff40
|
fix off by 1 errors
|
2018-08-14 15:28:15 +01:00 |
|
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 |