Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Use the default templates when a custom template file cannot be found #8037

Merged
merged 41 commits into from
Aug 17, 2020
Merged

Use the default templates when a custom template file cannot be found #8037

Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3d4f917
Remove conditional requirement for already required Jinja2
anoadragon453 Aug 4, 2020
0046454
Create a generic function to read jinja2 templates
anoadragon453 Aug 5, 2020
4ace21a
Switch saml2_config to use read_templates
anoadragon453 Aug 5, 2020
e3c75b1
Change create_mxc_to_http_filter to public function
anoadragon453 Aug 5, 2020
dd81441
Update synapse/push/pusher.py to use read_templates
anoadragon453 Aug 6, 2020
15f5aa0
Convert synapse/handlers/auth.py to use read_templates
anoadragon453 Aug 6, 2020
6f9e4b0
Convert synapse/handlers/account_validity.py to use read_templates
anoadragon453 Aug 6, 2020
e1ba6be
Convert synapse/handlers/oidc_handler.py to use read_templates
anoadragon453 Aug 6, 2020
44dc4aa
Convert synapse/rest/client/v2_alpha/account.py to use read_templates
anoadragon453 Aug 6, 2020
c8f105b
Convert synapse/rest/client/v2_alpha/register.py to use read_templates
anoadragon453 Aug 6, 2020
e8799e8
Remove load_jinja2_templates method
anoadragon453 Aug 6, 2020
2d442bf
Make template content variable names consistent
anoadragon453 Aug 6, 2020
7034971
Add a test
anoadragon453 Aug 6, 2020
00f4f63
Changelog
anoadragon453 Aug 6, 2020
2e7de8d
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/def…
anoadragon453 Aug 14, 2020
7b674bf
sample config
anoadragon453 Aug 14, 2020
57c64c4
Simplify template loading code
anoadragon453 Aug 14, 2020
93555f4
Fix jinja environment filter update code
anoadragon453 Aug 14, 2020
ab3f058
Remove extra comma
anoadragon453 Aug 14, 2020
bcb04ad
Autoescape always enabled
anoadragon453 Aug 14, 2020
c77608c
Filters are not template-specific
anoadragon453 Aug 14, 2020
bf79f9e
Add docstring and improve create_mxc_to_http_filter
anoadragon453 Aug 14, 2020
49dbd26
Use tempfile.TemporaryDirectory in tests to clean up tmpdir
anoadragon453 Aug 14, 2020
1dfca15
misc -> feature
anoadragon453 Aug 14, 2020
45d6e4c
Add test for a custom template directory
anoadragon453 Aug 14, 2020
de41b66
Move read_templates to Config class
anoadragon453 Aug 14, 2020
e7ca492
Raise ConfigError if custom template directory does not exist
anoadragon453 Aug 14, 2020
c81cdb6
Add test for ConfigError being raised on invalid custom template dir
anoadragon453 Aug 14, 2020
87fea4c
Switch all read_templates calls from handlers to synapse.config
anoadragon453 Aug 17, 2020
7660398
Add typing to filter methods
anoadragon453 Aug 17, 2020
d9d8d72
Use custom filters on all templates
anoadragon453 Aug 17, 2020
405db9a
Switch filter methods to be private
anoadragon453 Aug 17, 2020
93b71d8
Only abspath the template_dir if it's set
anoadragon453 Aug 17, 2020
a1d7d9c
Fix a couple missed read_templates in account.py
anoadragon453 Aug 17, 2020
94300cc
Switch sso read_file calls to read_templates
anoadragon453 Aug 17, 2020
f08b610
Move some sso read_templates calls to synapse.config
anoadragon453 Aug 17, 2020
7b943e6
Remove stale comment part
anoadragon453 Aug 17, 2020
5806a08
Apply self.config suggestions
anoadragon453 Aug 17, 2020
c654916
Remove unnecessary import
anoadragon453 Aug 17, 2020
d35c049
Some more hs.config -> self.config
anoadragon453 Aug 17, 2020
116a895
Render sso deactived/success templates
anoadragon453 Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions synapse/python_dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
"matrix-synapse-ldap3": ["matrix-synapse-ldap3>=0.1"],
# we use execute_batch, which arrived in psycopg 2.7.
"postgres": ["psycopg2>=2.7"],
# ConsentResource uses select_autoescape, which arrived in jinja 2.9
"resources.consent": ["Jinja2>=2.9"],
# ACME support is required to provision TLS certificates from authorities
# that use the protocol, such as Let's Encrypt.
"acme": [
Expand Down