13825 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Morgan	7c432de63e	Simplify with better exception handling	2019-04-03 10:58:50 +01:00
Andrew Morgan	1fd5680496	Don't laugh at my own jokes	2019-04-03 10:57:18 +01:00
Andrew Morgan	983474d250	Remove turning cert validation off from faq	2019-04-03 10:50:37 +01:00
Andrew Morgan	a87b556ab8	regen sample config	2019-04-02 18:13:48 +01:00
Andrew Morgan	e083ae39cd	Address changes. Make federation_domain_whitelist not None	2019-04-02 18:10:13 +01:00
Andrew Morgan	a8adde0624	Restart build	2019-04-02 14:39:58 +01:00
Andrew Morgan	3f1fe92a3b	Shuffle config	2019-04-02 13:45:58 +01:00
Andrew Morgan	f38da61ae7	Pass config	2019-04-02 13:35:53 +01:00
Andrew Morgan	3e29d458f2	isort	2019-04-02 13:18:49 +01:00
Andrew Morgan	61a39a44d3	isort	2019-04-02 13:15:23 +01:00
Andrew Morgan	3adf15d357	Correct imports	2019-04-02 13:12:21 +01:00
Andrew Morgan	d194e5daf5	liiint	2019-04-02 12:07:38 +01:00
Andrew Morgan	86470139e0	lint	2019-04-02 12:05:40 +01:00
Andrew Morgan	cc149b11ea	Give MFA config access	2019-04-02 11:49:10 +01:00
Andrew Morgan	40702b638e	Check for type instead of not None	2019-04-02 11:47:00 +01:00
Andrew Morgan	821baa4e7b	Give tests config with default config values	2019-04-02 11:30:51 +01:00
Andrew Morgan	aeffa4d84a	Use platformTrust instead of verify=True	2019-04-02 11:09:43 +01:00
Andrew Morgan	fec0c9a074	Remove TODO	2019-04-02 10:57:18 +01:00
Andrew Morgan	a7d7c5a060	Don't run validation code if validation is turned off	2019-04-02 10:53:03 +01:00
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