5dbff34509
Fixup bsaed on review comments
2019-05-17 15:48:04 +01:00
d46aab3fa8
Add basic editing support
2019-05-16 16:54:45 +01:00
5c39d262c0
Merge pull request #5192 from matrix-org/erikj/relations_aggregations
...
Add relation aggregation APIs
2019-05-16 16:54:05 +01:00
7a7eba8302
Move parsing of tokens out of storage layer
2019-05-16 14:26:23 +01:00
2c662ddde4
Indirect tuple conversion
2019-05-16 14:21:39 +01:00
95f3fcda3c
Check that event is visible in new APIs
2019-05-16 14:19:06 +01:00
b5c62c6b26
Fix relations in worker mode
2019-05-16 10:38:13 +01:00
33453419b0
Add cache to relations
2019-05-16 10:02:14 +01:00
a0603523d2
Add aggregations API
2019-05-16 09:37:20 +01:00
f201a30244
Merge pull request #5186 from matrix-org/erikj/simple_pagination
...
Add simple relations API
2019-05-16 09:34:12 +01:00
5be34fc3e3
Actually check for None rather falsey
2019-05-15 17:30:23 +01:00
e6459c26b4
Actually implement idempotency
2019-05-15 17:28:33 +01:00
5fb72e6888
Newsfile
2019-05-15 13:36:51 +01:00
b50641e357
Add simple pagination API
2019-05-15 13:36:51 +01:00
efe3c7977a
Add simple send_relation API and track in DB
2019-05-15 13:36:51 +01:00
a9fc71c372
Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_base
2019-05-15 13:36:29 +01:00
7155162844
Newsfile
2019-05-15 11:33:22 +01:00
54d77107c1
Make generating SQL bounds for pagination generic
...
This will allow us to reuse the same structure when we paginate e.g.
relations
2019-05-15 11:30:05 +01:00
0aba6c8251
Merge pull request #5183 from matrix-org/erikj/async_serialize_event
...
Allow client event serialization to be async
2019-05-15 10:36:30 +01:00
d94544051b
Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array
...
Expose DataStore._get_events as get_events_as_list
2019-05-15 10:17:38 +01:00
99c7dae087
Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimiting
...
Use correct config option for ratelimiting in tests
2019-05-15 09:54:15 +01:00
8ed2f182f7
Update docstring with correct return type
...
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-05-15 09:52:52 +01:00
52ddc6c0ed
Update docstring with correct type
...
Co-Authored-By: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2019-05-15 09:52:15 +01:00
daa2fb6317
comment about user_joined_room
2019-05-14 18:53:09 +01:00
495e859e58
Merge branch 'erikj/fix_config_ratelimiting' into erikj/test
2019-05-14 14:42:47 +01:00
db3046f565
Newsfile
2019-05-14 14:39:27 +01:00
dc4f6d1b01
Use correct config option for ratelimiting in tests
2019-05-14 14:37:40 +01:00
ae69a6aa9d
Merge branch 'erikj/async_serialize_event' into erikj/reactions_rebase
2019-05-14 14:09:33 +01:00
53788a447f
Newsfile
2019-05-14 13:41:36 +01:00
4fb44fb5b9
Expose DataStore._get_events as get_events_as_list
...
This is in preparation for reaction work which requires it.
2019-05-14 13:37:44 +01:00
a80e6b53f9
Newsfile
2019-05-14 13:12:23 +01:00
b54b03f9e1
Allow client event serialization to be async
2019-05-14 11:58:01 +01:00
df2ebd75d3
Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig ( #5171 )
2019-05-13 15:01:14 -05:00
5a4b328f52
Add ability to blacklist ip ranges for federation traffic ( #5043 )
2019-05-13 19:05:06 +01:00
2e1129b5f7
0.99.4rc1
2019-05-13 16:11:21 +01:00
8cc9ba3522
Merge pull request #5179 from matrix-org/babolivier/isort
...
Fix CI after new release of isort
2019-05-13 15:48:29 +01:00
2725cd2290
Fix changelog
2019-05-13 15:32:07 +01:00
1a536699fd
Changelog
2019-05-13 15:21:23 +01:00
bb93757b32
Fix CI after new release of isort
2019-05-13 15:19:44 +01:00
9a18e1d832
Merge branch 'master' into develop
2019-05-10 23:01:41 +01:00
2f48c4e1ae
URL preview blacklisting fixes ( #5155 )
...
Prevents a SynapseError being raised inside of a IResolutionReceiver and instead opts to just return 0 results. This thus means that we have to lump a failed lookup and a blacklisted lookup together with the same error message, but the substitute should be generic enough to cover both cases.
2019-05-10 10:32:44 -07:00
c2bb7476c9
Revert 085ae346ac
...
Accidentally went straight to develop
2019-05-10 11:08:01 +01:00
085ae346ac
Add a DUMMY stage to captcha-only registration flow
...
This allows the client to complete the email last which is more
natual for the user. Without this stage, if the client would
complete the recaptcha (and terms, if enabled) stages and then the
registration request would complete because you've now completed a
flow, even if you were intending to complete the flow that's the
same except has email auth at the end.
Adding a dummy auth stage to the recaptcha-only flow means it's
always unambiguous which flow the client was trying to complete.
Longer term we should think about changing the protocol so the
client explicitly says which flow it's trying to complete.
https://github.com/vector-im/riot-web/issues/9586
2019-05-10 10:52:24 +01:00
a78996cc4a
fix sample config
2019-05-10 09:46:28 +01:00
cd3f30014a
Make Prometheus snippet less confusing on the metrics collection doc ( #4288 )
...
Signed-off-by: Gergely Polonkai <gergely@polonkai.eu>
2019-05-10 09:15:08 +01:00
ee90c06e38
Set syslog identifiers in systemd units ( #5023 )
2019-05-10 09:09:25 +01:00
b36c82576e
Run Black on the tests again ( #5170 )
2019-05-10 00:12:11 -05:00
d9a02d1201
Add AllowEncodedSlashes to apache ( #5068 )
...
* Add AllowEncodedSlashes to apache
Add `AllowEncodedSlashes On` to apache config to support encoding for v3 rooms. "The AllowEncodedSlashes setting is not inherited by virtual hosts, and virtual hosts are used in many default Apache configurations, such as the one in Ubuntu. The workaround is to add the AllowEncodedSlashes setting inside a <VirtualHost> container (/etc/apache2/sites-available/default in Ubuntu)." Source: https://stackoverflow.com/questions/4390436/need-to-allow-encoded-slashes-on-apache
* change allowencodedslashes to nodecode
2019-05-09 23:27:04 +01:00
ea41c740ee
Merge remote-tracking branch 'origin/master' into develop
2019-05-09 22:54:04 +01:00
84cebb89cc
remove instructions for jessie installation ( #5164 )
...
We don't ship jessie packages, so these were a bit misleading.
2019-05-09 22:53:46 +01:00
Erik Johnston