Neil Johnson
|
d49b77404b
|
clean up, no functional changes
|
2018-08-17 15:21:34 +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
|
4c22b4047b
|
Merge pull request #3707 from matrix-org/neilj/limit_exceeded_error
add new error type ResourceLimit
|
2018-08-17 13:33:54 +00: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
|
9fd161c6fb
|
Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse into neilj/limit_exceeded_error
|
2018-08-17 13:58:40 +01:00 |
|
Neil Johnson
|
0195dfbf52
|
server limits config docs
|
2018-08-17 13:58:25 +01:00 |
|
Neil Johnson
|
69c49d3fa3
|
Merge branch 'develop' into neilj/limit_exceeded_error
|
2018-08-17 12:44:26 +00:00 |
|
Neil Johnson
|
a2d872e7b3
|
Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_creation
Neilj/resource limit block event creation
|
2018-08-17 12:42:59 +00:00 |
|
Amber Brown
|
fa27073b14
|
Merge pull request #3712 from matrix-org/travis/register-admin-docs
Update the admin register documentation to return a real user ID
|
2018-08-17 22:31:02 +10:00 |
|
Neil Johnson
|
521d369e7a
|
remove errant yield
|
2018-08-17 10:12:11 +01:00 |
|
Travis Ralston
|
b99a0f3941
|
Create 3712.misc
|
2018-08-17 02:47:31 -06:00 |
|
Travis Ralston
|
a8ffc27db7
|
Update the admin register documentation to return a real user ID
Presumably this is the intention anyways. I've also updated the domain part to be something more along the lines of what people might expect.
|
2018-08-17 02:46:25 -06:00 |
|
Neil Johnson
|
7e51342196
|
For resource limit blocked users, prevent writing into rooms
|
2018-08-16 23:05:20 +01:00 |
|
Neil Johnson
|
bcfeb44afe
|
call reap on start up and fix under reaping bug
|
2018-08-16 22:55:32 +01:00 |
|
Neil Johnson
|
372bf073c1
|
block event creation and room creation on hitting resource limits
|
2018-08-16 21:25:16 +01:00 |
|
Neil Johnson
|
7edd11623d
|
add new error type ResourceLimit
|
2018-08-16 21:04:30 +01:00 |
|
Neil Johnson
|
13ad9930c8
|
add new error type ResourceLimit
|
2018-08-16 18:02:02 +01:00 |
|
Neil Johnson
|
51b17ec566
|
flake8
|
2018-08-16 17:32:22 +01:00 |
|
Neil Johnson
|
3c1080b6e4
|
refactor for readability, and reuse caching for setting tags
|
2018-08-16 17:02:04 +01:00 |
|
Neil Johnson
|
eff3ae3b9a
|
add room tagging
|
2018-08-16 15:48:34 +01:00 |
|
Erik Johnston
|
b4d6db5c4a
|
Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker
Fix inbound federation on reader worker
|
2018-08-16 15:42:50 +01:00 |
|
Erik Johnston
|
aae86a81ef
|
Newsfile
|
2018-08-16 15:41:48 +01:00 |
|
Erik Johnston
|
7d5b1a60a3
|
Fix inbound federation on reader worker
Inbound federation requires calculating push, which in turn relies on
having access to account data.
|
2018-08-16 15:32:20 +01:00 |
|
Neil Johnson
|
bfb6c58624
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-16 15:10:16 +01:00 |
|
Neil Johnson
|
a675f9c556
|
check for room state before deciding on action
|
2018-08-16 14:53:35 +01:00 |
|
Will Hunt
|
c151b32b1d
|
Add GET media/v1/config (#3184)
|
2018-08-16 14:23:38 +01:00 |
|
Matthew Hodgson
|
762a758fea
|
lazyload aware /messages (#3589)
|
2018-08-16 14:22:47 +01:00 |
|
Neil Johnson
|
25d2b5d55f
|
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
|
2018-08-16 11:37:17 +01:00 |
|
Neil Johnson
|
df1e4f259f
|
WIP impl commiting to get feedback
|
2018-08-16 11:10:53 +01:00 |
|
Neil Johnson
|
c055c91655
|
fix case where empty string state check is evaulated as False
|
2018-08-16 11:10:19 +01:00 |
|
Matthew Hodgson
|
3f543dc021
|
initial cut at a room summary API (#3574)
|
2018-08-16 09:46:50 +01:00 |
|
Richard van der Hoff
|
859989f958
|
Merge pull request #3686 from matrix-org/rav/changelog_links_to_prs
Changelog should link to PRs
|
2018-08-15 22:22:38 +01:00 |
|
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 |
|