Commit graph

13806 commits

Author SHA1 Message Date
Andrew Morgan
ee0c7e1ab4 again 2019-04-01 18:52:13 +01:00
Andrew Morgan
5575f7a9a6 again 2019-04-01 18:35:06 +01:00
Andrew Morgan
4f177c5002 again 2019-04-01 18:20:32 +01:00
Andrew Morgan
9d27f8e9e8 Cache config 2019-04-01 18:14:30 +01:00
Andrew Morgan
86dfaf4d76 Merge branch 'develop' into anoa/msc_1711 2019-04-01 18:01:02 +01:00
Neil Johnson
4c552ed78a
Neilj/fix threepid auth check (with tests) (#4474)
test threepid checking
2019-04-01 17:42:18 +01:00
Andrew Morgan
0f0775494f Fix documentation 2019-04-01 15:19:02 +01:00
Andrew Morgan
d95b4efb24 No tls. 2019-04-01 15:18:32 +01:00
Andrew Morgan
2851e647e9 Generate config and remove extra newline 2019-04-01 15:06:58 +01:00
Andrew Morgan
0ce5b5bcfe words 2019-04-01 15:01:10 +01:00
manuroe
d461c65465
Merge pull request #4981 from matrix-org/manuroe/demo_bypass_account_rate_limiting
start.sh: Fix the --no-rate-limit option for messages
2019-04-01 16:00:08 +02:00
Andrew Morgan
2325928149 consolidate logic 2019-04-01 14:59:45 +01:00
Andrew Morgan
da23aa26c5 Cleaner code logic 2019-04-01 14:56:36 +01:00
Andrew Morgan
ffc9c10b6e punctuation 2019-04-01 14:50:48 +01:00
Andrew Morgan
8b1c4592db lint 2019-04-01 14:48:31 +01:00
Andrew Morgan
6de7ab82ca flake8 lied to me :c 2019-04-01 14:47:19 +01:00
Andrew Morgan
8e89fc5fe3 fixes and lint 2019-04-01 14:45:32 +01:00
Andrew Morgan
904ea6c7e0 Add changelog 2019-04-01 14:41:09 +01:00
Andrew Morgan
4d1002fd52 Documentation of new options 2019-04-01 14:39:05 +01:00
Andrew Morgan
9146059419 Ability to specify list of custom CA certificates 2019-04-01 14:09:33 +01:00
Neil Johnson
62988f73fd Merge branch 'master' into develop 2019-04-01 14:08:53 +01:00
Neil Johnson
35442efb75 0.99.3 2019-04-01 12:49:03 +00:00
manuroe
bb925b1bd7 start.sh: Fix the --no-rate-limit option for messages and make it bypass rate limit on registration and login too. 2019-04-01 14:27:28 +02:00
Neil Johnson
ed1ce0333c
convert rst link to md 2019-04-01 12:53:08 +01:00
Richard van der Hoff
54a87a7b08
Collect room-version variations into one place (#4969)
Collect all the things that make room-versions different to one another into
one place, so that it's easier to define new room versions.
2019-04-01 10:24:38 +01:00
Andrew Morgan
5fd4cd0ddd Whitelist per domain 2019-03-29 14:09:07 +00:00
Richard van der Hoff
215c15d049
Merge pull request #4968 from Jurrie/feature/fix_small_stuff_in_Docker_README.md
Feature/fix small stuff in docker readme.md
2019-03-29 10:09:39 +00:00
Jurrie Overgoor
50b5f08740 Add changelog.d entry 2019-03-29 10:30:24 +01:00
Jurrie Overgoor
e0f219789d Add -p argument for docker run command example
Signed-off-by: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
2019-03-29 10:25:41 +01:00
Jurrie Overgoor
aee4ea8ba8 Fix typo in TLS filenames
Signed-off-by: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
2019-03-29 10:25:41 +01:00
Richard van der Hoff
902cdc63b6
Merge pull request #4955 from matrix-org/rav/merge_state_into_events
Combine the CurrentStateDeltaStream into the EventStream
2019-03-28 18:32:13 +00:00
Richard van der Hoff
d688a51736
Merge pull request #4954 from matrix-org/rav/refactor_parse_row
Refactors to replication stream row update/parsing
2019-03-28 18:31:17 +00:00
Andrew Morgan
dbb3319e5c Config option for verifying federation certificates 2019-03-28 18:08:43 +00:00
Neil Johnson
c7296bcb98
remove log line for password (#4965)
Remove log line for password.
2019-03-28 17:38:01 +00:00
Andrew Morgan
7a91b9d81c
Allow password providers to bind emails (#4947)
This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58
2019-03-28 15:48:07 +00:00
Erik Johnston
248014379e
Merge pull request #4942 from matrix-org/erikj/fix_presence
Use event streams to calculate presence
2019-03-28 14:38:31 +00:00
Erik Johnston
4e5f0f7ca0 Use an assert 2019-03-28 14:05:05 +00:00
Erik Johnston
40e56997bc Review comments 2019-03-28 13:48:41 +00:00
Richard van der Hoff
d035d62f6b Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row 2019-03-28 13:45:14 +00:00
Richard van der Hoff
4eeb2c2f07
Merge pull request #4953 from matrix-org/rav/refactor_replication_streams
Split up replication.tcp.streams into smaller files
2019-03-28 13:43:25 +00:00
Amber Brown
2e060774ad
Run black on some storage modules that the stats branch touches (#4959) 2019-03-29 00:37:16 +11:00
Richard van der Hoff
17d7bacbcf changelog 2019-03-27 22:08:39 +00:00
Richard van der Hoff
4b91c313a9 Combine the CurrentStateDeltaStream into the EventStream 2019-03-27 22:07:05 +00:00
Richard van der Hoff
1f6d6f918a Make EventStream rows have a type
... as a precursor to combining it with the CurrentStateDelta stream.
2019-03-27 22:07:05 +00:00
Richard van der Hoff
a65763a5d6 changelog 2019-03-27 22:04:01 +00:00
Richard van der Hoff
015b3622eb Skip building a ROW_TYPE when building updates
We're about to turn it straight into a JSON object anyway so building a
ROW_TYPE is a bit pointless, and reduces flexibility in the update_function.
2019-03-27 21:58:03 +00:00
Richard van der Hoff
f570916a3e Add parse_row method to replication stream class
This will allow individual stream classes to override how a row is parsed.
2019-03-27 21:32:33 +00:00
Richard van der Hoff
91c3513668 changelog 2019-03-27 21:30:01 +00:00
Richard van der Hoff
71dcb275f1 move FederationStream out to its own file 2019-03-27 21:13:14 +00:00
Richard van der Hoff
aa1e017864 move EventsStream out to its own file 2019-03-27 21:13:14 +00:00