| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Ship the email templates as package_data | Richard van der Hoff | 2018-10-17 | 1 | -3/+30 |
|/ / |
|
* | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
* | | Remove some superfluous logging (#3855) | Amber Brown | 2018-09-13 | 1 | -1/+16 |
* | | Fix jwt import check | Richard van der Hoff | 2018-09-07 | 2 | -1/+1 |
* | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -0/+17 |
* | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 1 | -2/+2 |
* | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -0/+6 |
* | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 1 | -1/+2 |
* | | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 1 | -0/+6 |
* | | server limits config docs | Neil Johnson | 2018-08-17 | 1 | -0/+26 |
* | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
* | | update admin email to uri | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
* | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
* | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 1 | -0/+4 |
* | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 1 | -4/+0 |
* | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 1 | -0/+4 |
* | | log *after* reloading log config | Richard van der Hoff | 2018-08-10 | 1 | -2/+1 |
* | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+3 |
|\ \ |
|
| * | | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 1 | -1/+1 |
| * | | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 |
* | | | disable HS from config | Neil Johnson | 2018-08-04 | 1 | -0/+4 |
|/ / |
|
* / | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 1 | -2/+2 |
|/ |
|
* | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 1 | -0/+2 |
|\ |
|
| * | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 |
| |\ |
|
| | * | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
| | * | Merge tag 'v0.31.0' | Neil Johnson | 2018-06-06 | 3 | -1/+20 |
| | |\ |
|
* | | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 1 | -3/+6 |
* | | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+1 |
* | | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+5 |
* | | | | Comment dummy TURN parameters in default config | David Baker | 2018-07-11 | 1 | -2/+2 |
|/ / / |
|
* | | | run isort | Amber Brown | 2018-07-09 | 13 | -51/+59 |
* | | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -2/+9 |
* | | | fix tests | Matthew Hodgson | 2018-06-28 | 1 | -0/+1 |
* | | | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 1 | -1/+10 |
* | | | Write a clear restart indicator in logs | Richard van der Hoff | 2018-06-20 | 1 | -6/+18 |
* | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2018-06-05 | 1 | -0/+3 |
|\| |
| |/
|/| |
|
| * | remove trailing whitespace | Richard van der Hoff | 2018-05-30 | 1 | -2/+2 |
| * | fix english and wrap comment | Richard van der Hoff | 2018-05-30 | 1 | -1/+2 |
| * | add link to thorough instruction how to configure consent | Ruben Barkow | 2018-05-25 | 1 | -0/+2 |
* | | Add private IPv6 addresses to preview blacklist #3312 | Felix Schäfer | 2018-06-01 | 1 | -0/+3 |
* | | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 1 | -0/+10 |
* | | Fix default for send_server_notice_to_guests | Richard van der Hoff | 2018-05-25 | 1 | -1/+1 |
* | | Avoid sending consent notice to guest users | Richard van der Hoff | 2018-05-25 | 1 | -1/+7 |
|/ |
|
* | Allow overriding the server_notices user's avatar | Richard van der Hoff | 2018-05-23 | 1 | -3/+12 |
* | Support for putting %(consent_uri)s in messages | Richard van der Hoff | 2018-05-23 | 1 | -4/+7 |
* | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 1 | -0/+10 |
* | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -1/+15 |
* | Send users a server notice about consent | Richard van der Hoff | 2018-05-22 | 1 | -0/+8 |
* | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 1 | -4/+6 |
* | Replace inline docstrings with "Attributes" in class docstring | Richard van der Hoff | 2018-05-18 | 1 | -23/+15 |
* | Infrastructure for a server notices room | Richard van der Hoff | 2018-05-17 | 2 | -1/+89 |
* | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 4 | -3/+63 |
* | Merge pull request #3085 from NotAFile/py3-config-text-mode | Richard van der Hoff | 2018-04-30 | 2 | -4/+4 |
|\ |
|
| * | open log_config in text mode too | Adrian Tschira | 2018-04-28 | 1 | -1/+1 |
| * | Open config file in non-bytes mode | Adrian Tschira | 2018-04-10 | 1 | -3/+3 |
* | | Merge pull request #3084 from NotAFile/py3-certs-byte-mode | Richard van der Hoff | 2018-04-30 | 1 | -2/+2 |
|\ \ |
|
| * | | Open certificate files as bytes | Adrian Tschira | 2018-04-10 | 1 | -2/+2 |
| |/ |
|
* / | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 1 | -2/+2 |
|/ |
|
* | Merge pull request #3074 from NotAFile/fix-py3-prints | Richard van der Hoff | 2018-04-09 | 1 | -5/+5 |
|\ |
|
| * | use python3-compatible prints | Adrian Tschira | 2018-04-06 | 1 | -5/+5 |
* | | Replace some type checks with six type checks | Adrian Tschira | 2018-04-07 | 2 | -5/+9 |
|/ |
|
* | spell out not to massively increase bcrypt rounds | Matthew Hodgson | 2018-03-19 | 1 | -1/+3 |
* | Add replication http endpoint for event sending | Erik Johnston | 2018-02-07 | 1 | -0/+8 |
* | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+22 |
* | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 1 | -0/+19 |
|\ |
|
| * | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 1 | -3/+9 |
| * | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 1 | -0/+13 |
* | | Fix passing wrong config to provider constructor | Erik Johnston | 2018-01-18 | 1 | -1/+1 |
* | | Remove duplicate directory test | Erik Johnston | 2018-01-18 | 1 | -4/+0 |
* | | Fixup comments | Erik Johnston | 2018-01-18 | 1 | -1/+5 |
* | | Make storage providers more configurable | Erik Johnston | 2018-01-18 | 1 | -11/+72 |
|/ |
|
* | fix typo | Matthew Hodgson | 2018-01-16 | 1 | -1/+1 |
* | Actually make it work | Erik Johnston | 2018-01-12 | 1 | -0/+5 |
* | Merge pull request #2763 from matrix-org/rav/fix_config_uts | Richard van der Hoff | 2018-01-09 | 1 | -2/+2 |
|\ |
|
| * | Fix broken config UTs | Richard van der Hoff | 2018-01-09 | 1 | -2/+2 |
* | | Make indentation of generated log config consistent | Richard van der Hoff | 2018-01-09 | 1 | -17/+17 |
|/ |
|
* | Remove 'verbosity'/'log_file' from generated cfg | Richard van der Hoff | 2018-01-05 | 1 | -8/+4 |
* | Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typo | Richard van der Hoff | 2017-12-18 | 1 | -2/+2 |
|\ |
|
| * | synapse/config/password_auth_providers: Fixed bracket typo | Richard von Seck | 2017-11-16 | 1 | -2/+2 |
* | | Allow binds to both :: and 0.0.0.0 | Silke Hofstra | 2017-12-17 | 1 | -5/+3 |
* | | Adapt the default config to bind on IPv6. | Willem Mulder | 2017-12-17 | 1 | -8/+9 |
* | | better doc | Matthew Hodgson | 2017-12-04 | 1 | -1/+4 |
* | | switch to a simpler 'search_all_users' button as per review feedback | Matthew Hodgson | 2017-12-04 | 1 | -7/+8 |
* | | Merge branch 'develop' into matthew/search-all-local-users | Matthew Hodgson | 2017-11-30 | 1 | -0/+6 |
|\ \ |
|
| * | | Add config option to disable media_repo on main synapse | Richard van der Hoff | 2017-11-22 | 1 | -0/+6 |
* | | | specify default user_directory_include_pattern | Matthew Hodgson | 2017-11-30 | 1 | -0/+1 |
* | | | untested WIP but might actually work | Matthew Hodgson | 2017-11-29 | 1 | -3/+2 |
* | | | Add user_directory_include_pattern config param to expand search results to a... | Matthew Hodgson | 2017-11-29 | 2 | -1/+42 |
|/ / |
|
* / | Check group_id belongs to this domain | Luke Barnard | 2017-11-16 | 1 | -0/+1 |
|/ |
|
* | Print instead of logging | David Baker | 2017-11-13 | 1 | -11/+4 |
* | Make the commented config have the default | David Baker | 2017-11-09 | 1 | -1/+1 |
* | better comments | David Baker | 2017-11-08 | 1 | -2/+5 |
* | Log if any of the old config flags are set | David Baker | 2017-11-08 | 1 | -2/+24 |
* | Rename redact_content option to include_content | David Baker | 2017-11-08 | 1 | -15/+13 |
* | Add a hook for custom rest endpoints | Richard van der Hoff | 2017-11-02 | 1 | -0/+7 |
* | Clean up backwards-compat hacks for ldap | Richard van der Hoff | 2017-10-31 | 1 | -20/+19 |
* | fix typo | Matthew Hodgson | 2017-10-29 | 1 | -1/+1 |
* | Fix error when running synapse with no logfile | Richard van der Hoff | 2017-10-26 | 1 | -1/+5 |
* | tip for generating tls_fingerprints | Matthew Hodgson | 2017-10-24 | 1 | -0/+6 |
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -1/+1 |
* | Flake8 | Erik Johnston | 2017-10-19 | 1 | -4/+0 |
* | Add missing file... | Erik Johnston | 2017-10-19 | 1 | -0/+36 |
* | Add config to enable group creation | Erik Johnston | 2017-10-19 | 1 | -1/+2 |
* | Improve error handling for missing files (#2551) | Richard van der Hoff | 2017-10-17 | 3 | -17/+33 |
* | pep8 | David Baker | 2017-10-17 | 1 | -1/+2 |
* | Add config option to auto-join new users to rooms | David Baker | 2017-10-16 | 1 | -0/+6 |
* | Copy everything to backup | Erik Johnston | 2017-10-12 | 1 | -1/+3 |
* | Basic implementation of backup media store | Erik Johnston | 2017-10-12 | 1 | -0/+18 |
* | Forgot the new file again :( | David Baker | 2017-09-27 | 1 | -0/+35 |
* | Make the spam checker a module | David Baker | 2017-09-26 | 1 | -1/+3 |
* | Factor out module loading to a separate place | David Baker | 2017-09-26 | 1 | -12/+10 |
* | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+10 |
* | Fix process startup | Richard van der Hoff | 2017-08-16 | 1 | -10/+13 |
* | explain why CPU affinity is a good idea | Matthew Hodgson | 2017-08-15 | 1 | -0/+8 |
* | Allow configuration of CPU affinity | Richard van der Hoff | 2017-08-15 | 2 | -0/+13 |
* | Add a frontend proxy | Erik Johnston | 2017-07-07 | 1 | -0/+2 |
* | Change the config file generator to more descriptive explanation of push.reda... | Caleb James DeLisle | 2017-06-24 | 1 | -3/+11 |
* | Fix TravisCI tests for PR #2301 - Fat finger mistake | Caleb James DeLisle | 2017-06-23 | 1 | -0/+37 |
* | Fix TravisCI tests for PR #2301 | Caleb James DeLisle | 2017-06-23 | 2 | -41/+1 |
* | Add configuration parameter to allow redaction of content from push messages ... | Caleb James DeLisle | 2017-06-23 | 2 | -1/+42 |
* | Initial worker impl | Erik Johnston | 2017-06-16 | 1 | -0/+4 |
* | Configurable maximum number of events requested by /sync and /messages (#2220) | Pablo Saavedra | 2017-05-13 | 1 | -0/+6 |
* | web_server_root documentation fix | Matthew Wolff | 2017-04-17 | 1 | -0/+6 |
* | trust a hypothetical future riot.im IS | Matthew Hodgson | 2017-04-10 | 1 | -0/+1 |
* | Merge pull request #2102 from DanielDent/add-auth-email | David Baker | 2017-04-10 | 1 | -0/+16 |
|\ |
|
| * | Support authenticated SMTP | Daniel Dent | 2017-04-05 | 1 | -0/+16 |
* | | Merge pull request #2097 from matrix-org/erikj/repl_tcp_client | Erik Johnston | 2017-04-05 | 1 | -1/+3 |
|\ \
| |/
|/| |
|
| * | Remove unused worker config option | Erik Johnston | 2017-04-04 | 1 | -1/+0 |
| * | Update all the workers and master to use TCP replication | Erik Johnston | 2017-04-03 | 1 | -0/+3 |
* | | typo | Matthew Hodgson | 2017-03-15 | 1 | -1/+1 |
* | | set default for turn_allow_guests correctly | Matthew Hodgson | 2017-03-15 | 1 | -1/+1 |
* | | add setting (on by default) to support TURN for guests | Matthew Hodgson | 2017-03-15 | 1 | -0/+8 |
|/ |
|
* | Add helpful texts to logger config options | Richard van der Hoff | 2017-03-13 | 1 | -5/+7 |
* | Merge pull request #1983 from matrix-org/rav/no_redirect_stdio | Richard van der Hoff | 2017-03-13 | 1 | -6/+28 |
|\ |
|
| * | Add an option to disable stdio redirect | Richard van der Hoff | 2017-03-10 | 1 | -1/+12 |
| * | Refactor logger config for workers | Richard van der Hoff | 2017-03-10 | 1 | -5/+16 |
* | | Reread log config on SIGHUP | Richard van der Hoff | 2017-03-10 | 1 | -10/+19 |
|/ |
|
* | Fix typo in config comments. | Tyler Smith | 2017-02-11 | 1 | -1/+1 |
* | Merge pull request #1835 from matrix-org/erikj/fix_workers | Erik Johnston | 2017-01-20 | 1 | -0/+10 |
|\ |
|
| * | Make worker listener config backwards compat | Erik Johnston | 2017-01-20 | 1 | -0/+10 |
* | | Added default config for turn username and password | Marvin Steadfast | 2017-01-19 | 1 | -0/+5 |
* | | Added username and password for turn server | Marvin Steadfast | 2017-01-19 | 1 | -1/+3 |
|/ |
|
* | Allow configuring the Riot URL used in notification emails | Adrian Perez de Castro | 2017-01-13 | 1 | -0/+7 |
* | Merge pull request #1795 from matrix-org/erikj/port_defaults | Erik Johnston | 2017-01-13 | 1 | -4/+13 |
|\ |
|
| * | Pop bind_address | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| * | Restore default bind address | Erik Johnston | 2017-01-10 | 1 | -4/+13 |
* | | Remove full_twisted_stacktraces option | Erik Johnston | 2017-01-12 | 1 | -8/+0 |
|/ |
|
* | Merge remote-tracking branch 'origin/release-v0.18.6' into develop | Mark Haines | 2016-12-30 | 1 | -3/+13 |
|\ |
|
| * | Use the new twisted logging framework. | Mark Haines | 2016-12-30 | 1 | -3/+13 |
* | | Add IPv6 comment to default config | Johannes Löthberg | 2016-12-18 | 1 | -0/+4 |
* | | Make default homeserver config use bind_addresses | Johannes Löthberg | 2016-12-18 | 1 | -4/+5 |
|/ |
|
* | Bugfix: Console logging handler missing default filter | pik | 2016-12-03 | 1 | -0/+1 |
* | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 1 | -6/+0 |
* | Hook up the send queue and create a federation sender worker | Erik Johnston | 2016-11-16 | 1 | -0/+5 |
* | Use external ldap auth pacakge | Erik Johnston | 2016-11-15 | 1 | -7/+13 |
* | Merge pull request #1625 from DanielDent/patch-1 | Erik Johnston | 2016-11-12 | 1 | -2/+3 |
|\ |
|
| * | Add support for durations in minutes | Daniel Dent | 2016-11-12 | 1 | -2/+3 |
* | | Don't assume providers raise ConfigError's | Erik Johnston | 2016-11-08 | 1 | -2/+7 |
* | | default config: blacklist more internal ips | Euan Kemp | 2016-11-06 | 1 | -0/+2 |
|/ |
|
* | Allow Configurable Rate Limiting Per AS | Luke Barnard | 2016-10-18 | 1 | -0/+6 |
* | Merge pull request #1167 from matrix-org/markjh/fingerprints | Mark Haines | 2016-10-12 | 1 | -0/+38 |
|\ |
|
| * | Explain how long the servers can cache the TLS fingerprints for | Mark Haines | 2016-10-12 | 1 | -3/+4 |
| * | Improve comment formatting | Mark Haines | 2016-10-12 | 1 | -1/+1 |
| * | Add config option for adding additional TLS fingerprints | Mark Haines | 2016-10-11 | 1 | -0/+37 |
* | | Implement pluggable password auth | Erik Johnston | 2016-10-03 | 3 | -103/+64 |
|/ |
|
* | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 1 | -9/+0 |
* | flake8 | Kegan Dougal | 2016-08-30 | 1 | -2/+3 |
* | Use None instead of the empty string | Kegan Dougal | 2016-08-30 | 1 | -4/+11 |
* | Flake8 | Kegan Dougal | 2016-08-30 | 1 | -1/+2 |
* | Allow application services to have an optional 'url' | Kegan Dougal | 2016-08-30 | 1 | -0/+6 |
* | Merge pull request #1026 from matrix-org/paul/thirdpartylookup | Paul Evans | 2016-08-18 | 1 | -0/+10 |
|\ |
|
| * | Filter 3PU lookups by only ASes that declare knowledge of that protocol | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+10 |
* | | Add appservice worker | Erik Johnston | 2016-08-18 | 1 | -0/+1 |
|/ |
|
* | Update password config comment | Kent Shikama | 2016-07-06 | 1 | -1/+1 |
* | Remove default password pepper string | Kent Shikama | 2016-07-05 | 1 | -2/+1 |
* | Fix password config | Kent Shikama | 2016-07-05 | 1 | -1/+1 |
* | Fix pep8 | Kent Shikama | 2016-07-05 | 1 | -1/+1 |
* | Add comment to prompt changing of pepper | Kent Shikama | 2016-07-05 | 1 | -0/+1 |
* | Add pepper to password hashing | Kent Shikama | 2016-07-05 | 1 | -1/+5 |
* | remove vector.im from default secondary DS list | Matthew Hodgson | 2016-06-27 | 1 | -1/+0 |
* | Merge branch 'master' into develop | Mark Haines | 2016-06-23 | 1 | -0/+1 |
|\ |
|
| * | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1 | Erik Johnston | 2016-06-20 | 5 | -107/+210 |
| |\ |
|
| * | | point to the CAPTCHA docs | Matthew Hodgson | 2016-06-12 | 1 | -0/+1 |
* | | | Rework ldap integration with ldap3 | Martin Weinelt | 2016-06-22 | 1 | -27/+75 |
* | | | Remove the legacy v0 content upload API. | Mark Haines | 2016-06-21 | 1 | -20/+0 |
| |/
|/| |
|
* | | Turn use_frozen_events off by default | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
* | | Use worker_ prefixes for worker config, use existing support for multiple con... | Mark Haines | 2016-06-16 | 1 | -41/+8 |
* | | Access the event_cache_size directly from the server object. | Mark Haines | 2016-06-16 | 1 | -14/+0 |
* | | Access replication_url from the worker config directly | Mark Haines | 2016-06-16 | 1 | -4/+0 |
* | | Comment on what's going on in clobber_with_worker_config | Mark Haines | 2016-06-16 | 1 | -1/+12 |
* | | Add worker config module | Mark Haines | 2016-06-16 | 1 | -0/+71 |
* | | Inline the synchrotron and pusher configs into the main config | Mark Haines | 2016-06-16 | 3 | -63/+74 |
* | | Add function to load config without generating it | Mark Haines | 2016-06-09 | 1 | -43/+104 |
|/ |
|
* | Allow setting of gc.set_thresholds | Erik Johnston | 2016-06-07 | 1 | -1/+18 |
* | brand the email from header | Matthew Hodgson | 2016-06-02 | 1 | -1/+1 |
* | Add vector.im to default secondary_directory_servers and add comment explaini... | David Baker | 2016-05-31 | 1 | -0/+4 |
* | Add federation room list servlet | David Baker | 2016-05-31 | 1 | -0/+6 |
* | Move the functions for parsing app service config | Mark Haines | 2016-05-17 | 1 | -1/+106 |
* | Clean up the blacklist/whitelist handling. | Mark Haines | 2016-05-16 | 1 | -6/+6 |
* | Merge branch 'develop' into matthew/preview_url_ip_whitelist | Mark Haines | 2016-05-16 | 5 | -1/+119 |
|\ |
|
| * | Create user with expiry | Negi Fazeli | 2016-05-13 | 2 | -0/+11 |
| * | More consistent config naming | David Baker | 2016-05-10 | 1 | -1/+1 |
| * | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 1 | -0/+4 |
| * | fix layout; handle app naming in synapse, not jinja | Matthew Hodgson | 2016-05-05 | 1 | -0/+5 |
| * | fix assorted typos in default config | Matthew Hodgson | 2016-05-04 | 1 | -3/+3 |
| * | Try imports in config | David Baker | 2016-04-29 | 1 | -0/+7 |
| * | Default enable email notifs to False | David Baker | 2016-04-29 | 1 | -1/+1 |
| * | Correct public_baseurl default | David Baker | 2016-04-29 | 1 | -2/+2 |
| * | Nicer get() shorthand | David Baker | 2016-04-29 | 1 | -3/+2 |
| * | Remove redundant docstring | David Baker | 2016-04-29 | 1 | -4/+0 |
| * | Correct default template and add text template | David Baker | 2016-04-29 | 1 | -1/+2 |
| * | Send mail notifs with a plaintext part too | David Baker | 2016-04-29 | 1 | -0/+2 |
| * | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 2 | -1/+19 |
| |\ |
|
| * | | pep8 | David Baker | 2016-04-28 | 1 | -1/+1 |
| * | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 2 | -1/+16 |
| * | | Generate mails from a template | David Baker | 2016-04-20 | 1 | -10/+25 |
| * | | Send a rather basic email notif | David Baker | 2016-04-20 | 2 | -1/+64 |
* | | | add a url_preview_ip_range_whitelist config param so we can whitelist the mat... | Matthew Hodgson | 2016-05-01 | 1 | -0/+14 |
| |/
|/| |
|
* | | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 1 | -1/+16 |
* | | Merge pull request #746 from matrix-org/markjh/split_out_pusher | Mark Haines | 2016-04-22 | 1 | -0/+1 |
|\ \ |
|
| * | | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 1 | -0/+1 |
| |/ |
|
* | | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 1 | -0/+2 |
|\ \
| |/
|/| |
|
| * | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 1 | -0/+2 |
* | | Give install requirements | Erik Johnston | 2016-04-13 | 1 | -1/+7 |
* | | Add back in helpful description for missing url_preview_ip_range_blacklist | Erik Johnston | 2016-04-13 | 1 | -1/+5 |
* | | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 1 | -10/+28 |
* | | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 1 | -2/+75 |
|\ \ |
|
| * | | fix typo | Matthew Hodgson | 2016-04-08 | 1 | -1/+1 |
| * | | Add url_preview_enabled config option to turn on/off preview_url endpoint. de... | Matthew Hodgson | 2016-04-08 | 1 | -4/+73 |
| * | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 2 | -1/+39 |
| |\| |
|
| * | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-27 | 7 | -25/+118 |
| |\ \ |
|
| * | | | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper... | Matthew Hodgson | 2016-01-24 | 1 | -1/+5 |
* | | | | add tls property | Christoph Witzany | 2016-04-06 | 1 | -6/+10 |
* | | | | Introduce LDAP authentication | Christoph Witzany | 2016-04-06 | 2 | -1/+50 |
| |_|/
|/| | |
|
* | | | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 2 | -1/+39 |
| |/
|/| |
|
* | | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 1 | -0/+4 |
* | | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 2 | -2/+2 |
* | | config,handlers/_base: added homeserver config for what state is included in ... | Patrik Oldsberg | 2016-03-04 | 2 | -1/+42 |
* | | add 800x600 thumbnails to make vector look prettier (and anyone else who like... | Matthew Hodgson | 2016-03-02 | 1 | -0/+3 |
* | | Derive macaroon_secret_key from signing key. | Erik Johnston | 2016-02-08 | 2 | -16/+30 |
* | | Error if macaroon key is missing from config | Daniel Wagner-Hall | 2016-02-05 | 3 | -18/+42 |
* | | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 1 | -3/+3 |
* | | Add config option for setting the trusted id servers, disabling checking the ... | Mark Haines | 2016-01-29 | 1 | -0/+7 |
|/ |
|
* | Merge pull request #473 from matrix-org/erikj/ssh_manhole | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
|\ |
|
| * | s/telnet/ssh/ | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
* | | copyrights | Matthew Hodgson | 2016-01-07 | 17 | -17/+17 |
* | | Config Comment mixup in captcha public/private key | Robin Lambertz | 2016-01-06 | 1 | -2/+2 |
|/ |
|
* | Added a single line to explain what the server_name is used for | Mads R. Christensen | 2015-12-02 | 1 | -0/+1 |
* | Comment | Erik Johnston | 2015-11-19 | 1 | -0/+2 |
* | Split out text for missing config options. | Erik Johnston | 2015-11-18 | 1 | -16/+26 |