summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* fix docker build to install optional deps github/release-v0.34.1 release-v0.34.1Richard van der Hoff2019-01-091-3/+1
|
* debian: Remove Breaks: matrix-synapse-ldap3 v0.34.1+1Richard van der Hoff2019-01-092-1/+8
|
* 0.34.1 v0.34.1Richard van der Hoff2019-01-095-5/+13
|
* Merge branch 'develop' into release-v0.34.1Erik Johnston2019-01-094-6/+13
|\
| * Merge pull request #4362 from matrix-org/erikj/better_errorsErik Johnston2019-01-092-5/+6
| |\ | | | | | | Use RequestSendFailed when fail to parse content type headers
| | * NewsfileErik Johnston2019-01-081-0/+1
| | |
| | * Use RequestSendFailed when fail to parse content type headersErik Johnston2019-01-081-5/+5
| | |
| * | Merge pull request #4361 from matrix-org/erikj/better_errorsErik Johnston2019-01-082-1/+7
| |\| | | | | | | Don't log stack traces for HTTP error responses
| | * NewsfileErik Johnston2019-01-081-0/+1
| | |
| | * Don't log stack traces for HTTP error responsesErik Johnston2019-01-081-1/+6
| |/
* | clean up changelog v0.34.1rc1Richard van der Hoff2019-01-081-3/+2
| |
* | 0.34.1rc1Richard van der Hoff2019-01-081-1/+1
| |
* | changelogRichard van der Hoff2019-01-0841-41/+61
|/
* Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-086-44/+119
| | | | | | | | | | | | | | * Correctly retry and back off if we get a HTTPerror response * Refactor request sending to have better excpetions MatrixFederationHttpClient blindly reraised exceptions to the caller without differentiating "expected" failures (e.g. connection timeouts etc) versus more severe problems (e.g. programming errors). This commit adds a RequestSendFailed exception that is raised when "expected" failures happen, allowing the TransactionQueue to log them as warnings while allowing us to log other exceptions as actual exceptions.
* Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-082-1/+2
|
* Fix command hint to generate a config file (#4353)Jason Robinson2019-01-073-2/+8
| | | | | | | | | | | | | | | | | * Fix command hint to generate a config file When trying to start Synapse without a config file, it will complain and give a hint towards what command to run. This hinted command is missing the "report_stats" parameter, which is required with either yes or no value. Add this to the command. Not an ideal situation but makes the given command work without the user getting another error, even though it might be unclear what "report_stats" represents. Signed-off-by: Jason Robinson <jasonr@matrix.org>
* Add GET account data routes (#4303)Travis Ralston2019-01-072-1/+34
| | | | As per https://github.com/matrix-org/matrix-doc/issues/1339
* Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-074-28/+75
| | | | | | | | * Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog
* fix the check for whether `is_url` to match all the other ones in codebase ↵Michael Telatynski2019-01-062-3/+9
| | | | | | (#3405) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update debian Conflicts specifications (#4349)Richard van der Hoff2019-01-043-2/+14
| | | ... to allow installation alongside our matrix-synapse transitional package.
* fix NPE in /messages by checking if all events were filtered out (#4330)Matthew Hodgson2019-01-022-10/+12
|
* Update README to not lie about required restart (#4343)Aaron Raimist2019-01-022-2/+3
| | | | | | | | | | * Update README to not lie about required restart Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* Merge pull request #4344 from matrix-org/neilj/fix_synchrotron_fix_4312Neil Johnson2019-01-022-25/+26
|\ | | | | Ensure synchrotrons can access is_support_user in the storage layer
| * Ensure synchrotrons can access is_support_user in the storage layerNeil Johnson2019-01-022-25/+26
|/
* Update docker-compose.yml (#4282)jribal2019-01-021-1/+1
| | | | | | Hi, the original docker-compose file did not work by default. You get federation port working but no client port. My proposal is to let federation port work as it is by default (8448) and let traefik handle client http/https traffic.
* Update PR template to use absolute links (#4341)Aaron Raimist2019-01-022-2/+3
| | | | | | | | | | * Update PR template to use absolute links Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* Avoid packaging _trial_temp directory (#4326)Richard van der Hoff2019-01-022-2/+3
| | | | | | Make sure we don't put the _trial_temp directory in the package target directory. Fixes https://github.com/matrix-org/synapse/issues/4322
* Install the optional dependencies into the debian package (#4325)Richard van der Hoff2019-01-025-20/+37
| | | | | | | | since #4298, the optional dependencies are no longer installed with a simple `pip install .`, which meant that they were not being included in the debian package. The easy fix to that is dh_virtualenv --extras, but that needs dh_virtualenv 1.1...
* Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-297-590/+45
|
* Remove mention of lt-cred-mech in the sample coturn config. (#4333)Krithin Sitaram2018-12-282-3/+3
| | | | | | | | | | | * Remove mention of lt-cred-mech in the sample coturn config. See https://github.com/coturn/coturn/pull/262 for more context. Also clean up some minor formatting issues while I'm here. * Add changelog. Signed-off-by: Krithin Sitaram <krithin@gmail.com>
* Log roomid along with Unknown room (#4297)Will Hunt2018-12-242-1/+2
|
* Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-243-1/+6
|\ | | | | Add v2 room version
| * NewsfileErik Johnston2018-12-181-0/+1
| |
| * Add v2 room versionErik Johnston2018-12-182-1/+5
| |
* | Return well_known in /login response (#4319)Richard van der Hoff2018-12-243-7/+15
| | | | | | | | ... as per MSC1730.
* | Merge pull request #4317 from de-vri-es/test-metric-prometheus-0.5Richard van der Hoff2018-12-232-1/+24
|\ \ | | | | | | Fix test_metrics.py compatibility prometheus_client 0.5
| * | Fix test_metrics.py compatibility prometheus_client 0.5Maarten de Vries2018-12-212-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | prometheus_client 0.5 has a named-tuple Sample type with more member than the old plain tuple had. This commit makes sure the unit test detects this and changes the way it reads the sample. Signed-off-by: Maarten de Vries <maarten@de-vri.es>
* | | Merge pull request #4316 from matrix-org/rav/fix_docker_uploadRichard van der Hoff2018-12-212-2/+3
|\ \ \ | | | | | | | | Fix circleci config for synapse:latest docker upload
| * | | Fix circleci config for synapse:latest docker uploadRichard van der Hoff2018-12-212-2/+3
| |/ / | | | | | | | | | Give the image the right tag, so that we can push it.
* | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-2211-46/+157
| | |
* | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-222-35/+36
| | | | | | | | | These settings are not supposed to be under 'listeners'.
* | | Fix IP URL previews on Python 3 (#4215)Amber Brown2018-12-228-272/+590
| | |
* | | Make the dependencies more like a standard Python project and hook up the ↵Amber Brown2018-12-227-158/+111
|/ / | | | | | | optional dependencies to setuptools (#4298)
* | Merge branch 'master' into developRichard van der Hoff2018-12-201-2/+7
|\ \
| * | Mention updating extensions github/release-v0.34.0 release-v0.34.0Richard van der Hoff2018-12-201-2/+7
| | |
* | | Merge branch 'master' into developRichard van der Hoff2018-12-201-3/+4
|\| |
| * | clarify that installing -py3 removes the old pkgRichard van der Hoff2018-12-201-3/+4
| | |
* | | Merge branch 'master' into developRichard van der Hoff2018-12-201-1/+8
|\| |
| * | buster is a thingRichard van der Hoff2018-12-201-1/+8
| | |
* | | Merge branch 'master' into developRichard van der Hoff2018-12-2042-29/+2514
|\| |
| * | Clarify that py2 packages will continue to exist v0.34.0Richard van der Hoff2018-12-201-0/+4
| | |
| * | document supported python 3 versionsRichard van der Hoff2018-12-202-5/+9
| | |
| * | more changelog fixRichard van der Hoff2018-12-201-1/+1
| | |
| * | minor changelog tweaksRichard van der Hoff2018-12-201-4/+4
| | |
| * | fix UPGRADE formattingRichard van der Hoff2018-12-201-6/+6
| | |
| * | Prepare 0.34 releaseRichard van der Hoff2018-12-207-24/+18
| | |
| * | Update log config for debian packagesRichard van der Hoff2018-12-201-0/+1
| | | | | | | | | | | | Better follow our own release notes.
| * | Debian packaging via dh_virtualenvRichard van der Hoff2018-12-2041-2/+2481
| |\ \
| | * | Debian packaging via dh_virtualenv (#4285)Richard van der Hoff2018-12-2036-509/+310
| | | |
| | * | import from package-debian-synapseAmber Brown2018-12-2038-0/+2678
| | | |
| * | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-202-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog
| * | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
| * | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
| |/ /
* | | Merge pull request #4309 from KB1RD/KB1RD-fixesRichard van der Hoff2018-12-192-3/+8
|\ \ \ | | | | | | | | Fix the variable names used for account_data
| * | | Create 4309.bugfixNathan Pennie2018-12-191-0/+1
| | | |
| * | | Fixed line lengthNathan Pennie2018-12-191-1/+5
| | | |
| * | | Fix the variable names used for account_dataNathan Pennie2018-12-191-3/+3
|/ / /
* | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305)Neil Johnson2018-12-182-1/+2
| | | | | | | | | * ensure can report mau stats when hs.config.mau_stats_only is set
* | | create support user (#4141)Neil Johnson2018-12-1420-47/+371
| | | | | | | | | | | | | | | | | | Allow for the creation of a support user. A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits.
* | | Settings Fix deleting e2e room keys on xenial (#4295)Amber Brown2018-12-142-1/+2
| | |
* | | Improved welcome page (#4294)Nad Chishtie2018-12-142-25/+63
| | | | | | | | | | | | | | | | | | | | | * Improved static/index.html look, feel and content. * Added accessibility tags to in-line SVG. * Grammar.
* | | Merge pull request #4274 from matrix-org/michaelkaye/update_kernel_dco_linkRichard van der Hoff2018-12-112-1/+2
|\ \ \ | | | | | | | | Update link to kernel.org DCO usage
| * | | Update CONTRIBUTING.rstMichael Kaye2018-12-111-1/+1
| | | | | | | | | | | | Reduce size of hyperlink
| * | | changelogMichael Kaye2018-12-071-0/+1
| | | |
| * | | Update link to kernel.org DCO usageMichael Kaye2018-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | https://www.kernel.org/doc/Documentation/SubmittingPatches returns a simple page indicating that it's moved to: "process/submitting-patches.rst". I believe the new link contains the same information as what was previously linked to.
* | | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-1143-98/+146
|\ \ \ \ | | |/ / | |/| |
| * | | 0.34.0rc2 v0.34.0rc2Richard van der Hoff2018-12-115-4/+17
| | | |
| * | | remove changelog filesRichard van der Hoff2018-12-1134-36/+0
| | | |
| * | | Merge pull request #4290 from matrix-org/rav/remove_webclientRichard van der Hoff2018-12-116-58/+44
| |\ \ \ | | | | | | | | | | Stop installing Matrix Console by default
| | * | | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-116-58/+44
| | | | | | | | | | | | | | | | | | | | This is based on the work done by @krombel in #2601.
| * | | | Merge pull request #4289 from matrix-org/rav/welcome_pageRichard van der Hoff2018-12-113-0/+30
| |\ \ \ \ | | | | | | | | | | | | Add a welcome page to the static resources
| | * \ \ \ Merge branch 'rav/disable_pager_in_ci' into rav/welcome_pageRichard van der Hoff2018-12-112-2/+3
| | |\ \ \ \
| | * | | | | Add a welcome page to the static resourcesRichard van der Hoff2018-12-113-0/+30
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a precursor for the removal of the bundled webclient. The idea is to present a page at / which reassures people that something is working, and to give them some links for next steps. The welcome page lives at `/_matrix/static/`, so is enabled alongside the other `static` resources (which, in practice, means the client API is enabled). We'll redirect to it from `/` if we have nothing better to display there. It would be nice to have a way to disable it (in the same way that you might disable the nginx welcome page), but I can't really think of a good way to do that without a load of ickiness. It's based on the work done by @krombel for #2601.
| * | | | | Merge pull request #4291 from matrix-org/rav/disable_pager_in_ciRichard van der Hoff2018-12-112-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | | Disable pager for ci script
| | * | | | Disable pager for ci scriptRichard van der Hoff2018-12-112-2/+3
| | |/ / / | | | | | | | | | | | | | | | ... otherwise it hangs
| * | | | fix upgrade.rst link again v0.34.0rc1Richard van der Hoff2018-12-041-1/+1
| | | | |
| * | | | Fix link to upgrade notesRichard van der Hoff2018-12-041-1/+1
| | | | |
| * | | | fix typo in changelogRichard van der Hoff2018-12-041-1/+1
| | | | |
| * | | | Prepare 0.34.0rc1Richard van der Hoff2018-12-042-2/+56
| |/ / /
* | | | Add 'sandbox' to CSP for media repo (#4284)David Baker2018-12-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Add 'sandbox' to the CSP for media repo * Changelog
* | | | Merge pull request #4279 from matrix-org/hs/fix-config-corsWill Hunt2018-12-102-1/+2
|\ \ \ \ | | | | | | | | | | Make /config more CORS-y
| * | | | Move imports to one lineWill Hunt2018-12-101-4/+1
| | | | |
| * | | | Use `send_cors`Will Hunt2018-12-101-4/+1
| | | | |
| * | | | changelog & isortWill Hunt2018-12-092-1/+6
| | | | |
| * | | | Make /config more CORS-yWill Hunt2018-12-091-1/+3
| | |/ / | |/| |
* | | | Merge pull request #4283 from matrix-org/erikj/isort_dfErik Johnston2018-12-102-2/+3
|\ \ \ \ | |/ / / |/| | | Make isort tox check print diff when it fails
| * | | NewsfileErik Johnston2018-12-101-0/+1
| | | |
| * | | Make isort tox check print diff when it failsErik Johnston2018-12-101-2/+2
|/ / /
* | | Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-076-15/+39
| | | | | | | | | | | | | | | When we register a new user from SAML2 data, initialise their displayname correctly.
* | | Update the example systemd config to use a virtualenv (#4273)Richard van der Hoff2018-12-073-22/+32
| | | | | | | | | | | | | | | If you're installing as a system package, the system package should have set up the systemd config, so it's more useful to give an example of running in a virtualenv here.
* | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-079-2/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements both a SAML2 metadata endpoint (at `/_matrix/saml2/metadata.xml`), and a SAML2 response receiver (at `/_matrix/saml2/authn_response`). If the SAML2 response matches what's been configured, we complete the SSO login flow by redirecting to the client url (aka `RelayState` in SAML2 jargon) with a login token. What we don't yet have is anything to build a SAML2 request and redirect the user to the identity provider. That is left as an exercise for the reader.
* | | Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-075-32/+184
| | | | | | | | | | | | This is mostly factoring out the post-CAS-login code to somewhere we can reuse it for other SSO flows, but it also fixes the userid mapping while we're at it.
* | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-067-169/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rip out half-implemented m.login.saml2 support This was implemented in an odd way that left most of the work to the client, in a way that I really didn't understand. It's going to be a pain to maintain, so let's start by ripping it out. * drop undocumented dependency on dateutil It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* | | drop undocumented dependency on dateutil (#4266)Richard van der Hoff2018-12-062-7/+7
| | | | | | | | | | | | It turns out we were relying on dateutil being pulled in transitively by pysaml2. There's no need for that bloat.
* | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-055-0/+140
|/ / | | | | | | Sometimes it's useful for synapse to generate its own .well-known file.
* | Merge pull request #4260 from matrix-org/rav/python3Richard van der Hoff2018-12-043-53/+82
|\ \ | | | | | | Notes on upgrading to python3, and README updates.
| * | Notes on upgrading to python3, and README updates.Richard van der Hoff2018-12-043-53/+82
| | |
* | | Merge pull request #4261 from matrix-org/rav/docker/remove_log_fileRichard van der Hoff2018-12-042-3/+2
|\ \ \ | | | | | | | | Remove obsolete settings from docker homeserver.yaml
| * | | Remove obsolete settings from docker homeserver.yamlRichard van der Hoff2018-12-042-3/+2
| |/ / | | | | | | | | | These aren't used, because we have a `log_config` setting.
* | | Merge pull request #4005 from matrix-org/michaelkaye/move_to_docker_labelRichard van der Hoff2018-12-041-8/+4
|\ \ \ | |/ / |/| | Use labels to tag builds with their SHA1 version.
| * | Use labels to tag builds with their SHA1 version.Michael Kaye2018-10-041-8/+4
| | | | | | | | | | | | | | | The additional sha1 tagged builds in docker hub are messy, so instead tag the build with the SHA1 version.
* | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-043-9/+26
| | |
* | | Fix non-ASCII pushrules (#4248)Amber Brown2018-12-042-12/+24
| | |
* | | Merge pull request #4210 from axelsimon/patch-1Richard van der Hoff2018-12-041-2/+2
|\ \ \ | | | | | | | | Replace mentions of Vector with Riot
| * | | Replace mentions of Vector with Riotaxel simon2018-11-201-2/+2
| | |/ | |/| | | | | | | https://github.com/vector-im/vector-web/issues/1977 --> https://github.com/vector-im/riot-web/issues/1977 And mention of Vector as a client replaced with Riot.
* | | Add an option to disable search for homeservers which may not be interested ↵Travis Ralston2018-12-044-1/+21
| | | | | | | | | | | | | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data.
* | | Add note to UPGRADE.rst about removing riot.im from list of trusted identity ↵Aaron Raimist2018-12-042-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | servers (#4224) * Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers Signed-off-by: Aaron Raimist <aaron@raim.ist> * Add changelog Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | add more detail to logging regarding "More than one row matched" error (#4234)Ben Parsons2018-12-042-6/+7
| | |
* | | Fix UnicodeDecodeError when postgres is not configured in english (#4253)Richard van der Hoff2018-12-043-8/+47
| | | | | | | | | | | | This is a bit of a half-assed effort at fixing https://github.com/matrix-org/synapse/issues/4252. Fundamentally the right answer is to drop support for Python 2.
* | | Merge pull request #4244 from aaronraimist/drop-sent-txtRichard van der Hoff2018-12-047-74/+4
|\ \ \ | | | | | | | | Drop sent_transactions
| * | | Add changelogAaron Raimist2018-12-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | Drop sent_transactionsAaron Raimist2018-12-016-74/+3
| | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | Patch defer.inlineCallbacks to check logcontexts in tests (#4205)Richard van der Hoff2018-12-044-3/+99
| | | |
* | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3Richard van der Hoff2018-12-042-1/+2
|\ \ \ \ | | | | | | | | | | Fix removing pushers on python 3
| * | | | changelogAmber Brown2018-12-031-0/+1
| | | | |
| * | | | fix type errorAmber Brown2018-12-031-1/+1
| | | | |
* | | | | Merge pull request #4257 from aaronraimist/add-editorconfigRichard van der Hoff2018-12-043-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Add a basic .editorconfig
| * | | | | Add a basic .editorconfigAaron Raimist2018-12-033-0/+11
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* / / / / Run the AS senders as background processes (#4189)Richard van der Hoff2018-12-042-12/+26
|/ / / / | | | | | | | | | | | | This should fix some "Starting db connection from sentinel context" warnings, and will mean we get metrics for these processes.
* / / / Workaround for non-ascii event ids (#4241)Richard van der Hoff2018-12-032-1/+4
|/ / / | | | | | | | | | | | | | | | It turns out that we accept events with non-ascii IDs, which would later cause an explosion during state res. Fixes #4226
* | | Neilj/fix autojoin (#4223)Neil Johnson2018-11-285-3/+36
| | | | | | | | | | | | | | | | | | * Fix auto join failures for servers that require user consent * Fix auto join failures for servers that require user consent
* | | Report combined coverage to codecov (#4225)Amber Brown2018-11-283-17/+23
| | |
* | | Neilj/fix mau initial reserved users (#4211)Neil Johnson2018-11-282-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | * fix transaction wrapping bug that caused get_user_id_by_threepid_txn to fail * towncrier * white space
* | | Support m.login.sso (#4220)Richard van der Hoff2018-11-275-52/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up the CSS for the fallback login form I was finding this hard to work with, so simplify a bunch of things. Each flow is now a form inside a div of class login_flow. The login_flow class now has a fixed width, as that looks much better than each flow having a differnt width. * Support m.login.sso MSC1721 renames m.login.cas to m.login.sso. This implements the change (retaining support for m.login.cas for older clients). * changelog
* | | Check logcontexts before and after each test (#4190)Richard van der Hoff2018-11-273-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add better diagnostics to flakey keyring test * fix interpolation fail * Check logcontexts before and after each test * update changelog * update changelog
* | | Fix more logcontext leaks in tests (#4209)Richard van der Hoff2018-11-272-1/+3
| | |
* | | Do a GC after each test to fix logcontext leaks (#4227)Richard van der Hoff2018-11-273-3/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Some words about garbage collections and logcontexts * Do a GC after each test to fix logcontext leaks This feels like an awful hack, but... * changelog
* | | Merge pull request #4214 from matrix-org/rav/ignore_pycacheAmber Brown2018-11-202-1/+2
|\ \ \ | | | | | | | | Ignore __pycache__ directories in schema delta dir
| * | | Ignore __pycache__ directories in schema delta dirRichard van der Hoff2018-11-202-1/+2
|/ / / | | | | | | | | | Now that we use py3, compiled python ends up in __pycache__ rather than *.pyc.
* | | Remove riot.im from the list of trusted Identity Servers in the default ↵Neil Johnson2018-11-203-2/+7
| | | | | | | | | | | | configuration (#4207)
* | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixesRichard van der Hoff2018-11-206-7/+12
|\ \ \ | | | | | | | | Fix some logcontext leaks
| * | | changelogRichard van der Hoff2018-11-191-0/+1
| | | |
| * | | Fix logcontext leak in test_url_previewRichard van der Hoff2018-11-191-1/+2
| | | |
| * | | Fix logcontext leak in http pusher testRichard van der Hoff2018-11-191-1/+2
| | | |
| * | | Fix some tests which leaked logcontextsRichard van der Hoff2018-11-192-3/+4
| | | |
| * | | Fix logcontext leak in EmailPusherRichard van der Hoff2018-11-191-2/+3
| | | |
* | | | Merge remote-tracking branch 'origin/master' into developAmber Brown2018-11-1941-40/+62
|\ \ \ \ | | |/ / | |/| |
| * | | Merge tag 'v0.33.9' 0.34.0rc2Amber Brown2018-11-1995-969/+2846
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features -------- - Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled. ([\#4004](https://github.com/matrix-org/synapse/issues/4004), [\#4133](https://github.com/matrix-org/synapse/issues/4133), [\#4142](https://github.com/matrix-org/synapse/issues/4142), [\#4184](https://github.com/matrix-org/synapse/issues/4184)) - Support for replacing rooms with new ones ([\#4091](https://github.com/matrix-org/synapse/issues/4091), [\#4099](https://github.com/matrix-org/synapse/issues/4099), [\#4100](https://github.com/matrix-org/synapse/issues/4100), [\#4101](https://github.com/matrix-org/synapse/issues/4101)) Bugfixes -------- - Fix exceptions when using the email mailer on Python 3. ([\#4095](https://github.com/matrix-org/synapse/issues/4095)) - Fix e2e key backup with more than 9 backup versions ([\#4113](https://github.com/matrix-org/synapse/issues/4113)) - Searches that request profile info now no longer fail with a 500. ([\#4122](https://github.com/matrix-org/synapse/issues/4122)) - fix return code of empty key backups ([\#4123](https://github.com/matrix-org/synapse/issues/4123)) - If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new typing events. ([\#4127](https://github.com/matrix-org/synapse/issues/4127)) - Fix table lock of device_lists_remote_cache which could freeze the application ([\#4132](https://github.com/matrix-org/synapse/issues/4132)) - Fix exception when using state res v2 algorithm ([\#4135](https://github.com/matrix-org/synapse/issues/4135)) - Generating the user consent URI no longer fails on Python 3. ([\#4140](https://github.com/matrix-org/synapse/issues/4140), [\#4163](https://github.com/matrix-org/synapse/issues/4163)) - Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if the remote server returns a Content-Type header with the chartype in quotes. ([\#4157](https://github.com/matrix-org/synapse/issues/4157)) - The hash_password script now works on Python 3. ([\#4161](https://github.com/matrix-org/synapse/issues/4161)) - Fix noop checks when updating device keys, reducing spurious device list update notifications. ([\#4164](https://github.com/matrix-org/synapse/issues/4164)) Deprecations and Removals ------------------------- - The disused and un-specced identicon generator has been removed. ([\#4106](https://github.com/matrix-org/synapse/issues/4106)) - The obsolete and non-functional /pull federation endpoint has been removed. ([\#4118](https://github.com/matrix-org/synapse/issues/4118)) - The deprecated v1 key exchange endpoints have been removed. ([\#4119](https://github.com/matrix-org/synapse/issues/4119)) - Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2. ([\#4120](https://github.com/matrix-org/synapse/issues/4120)) Internal Changes ---------------- - Fix build of Docker image with docker-compose ([\#3778](https://github.com/matrix-org/synapse/issues/3778)) - Delete unreferenced state groups during history purge ([\#4006](https://github.com/matrix-org/synapse/issues/4006)) - The "Received rdata" log messages on workers is now logged at DEBUG, not INFO. ([\#4108](https://github.com/matrix-org/synapse/issues/4108)) - Reduce replication traffic for device lists ([\#4109](https://github.com/matrix-org/synapse/issues/4109)) - Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character ([\#4110](https://github.com/matrix-org/synapse/issues/4110)) - Log some bits about room creation ([\#4121](https://github.com/matrix-org/synapse/issues/4121)) - Fix `tox` failure on old systems ([\#4124](https://github.com/matrix-org/synapse/issues/4124)) - Add STATE_V2_TEST room version ([\#4128](https://github.com/matrix-org/synapse/issues/4128)) - Clean up event accesses and tests ([\#4137](https://github.com/matrix-org/synapse/issues/4137)) - The default logging config will now set an explicit log file encoding of UTF-8. ([\#4138](https://github.com/matrix-org/synapse/issues/4138)) - Add helpers functions for getting prev and auth events of an event ([\#4139](https://github.com/matrix-org/synapse/issues/4139)) - Add some tests for the HTTP pusher. ([\#4149](https://github.com/matrix-org/synapse/issues/4149)) - add purge_history.sh and purge_remote_media.sh scripts to contrib/ ([\#4155](https://github.com/matrix-org/synapse/issues/4155)) - HTTP tests have been refactored to contain less boilerplate. ([\#4156](https://github.com/matrix-org/synapse/issues/4156)) - Drop incoming events from federation for unknown rooms ([\#4165](https://github.com/matrix-org/synapse/issues/4165))
| | * | | towncrier v0.33.9Amber Brown2018-11-191-0/+6
| | | | |
| | * | | versionAmber Brown2018-11-191-1/+1
| | | | |
| | * | | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9Neil Johnson2018-11-1441-40/+56
| | | | |
* | | | | Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-193-22/+121
| |_|/ / |/| | |
* | | | Merge pull request #4182 from aaronraimist/update-issue-templateRichard van der Hoff2018-11-196-10/+57
|\ \ \ \ | | | | | | | | | | Add a pull request template and add multiple issue templates
| * | | | Fix caseAaron Raimist2018-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | Add SUPPORT.mdAaron Raimist2018-11-131-0/+3
| | | | | | | | | | | | | | | | | | | | https://help.github.com/articles/adding-support-resources-to-your-project/
| * | | | Add changelogAaron Raimist2018-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | Add a pull request template and add multiple issue templatesAaron Raimist2018-11-134-10/+53
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | Merge pull request #4200 from aaronraimist/vacuum-full-noteRichard van der Hoff2018-11-192-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Add a note saying you need to manually reclaim disk space
| * | | | | Add changelogAaron Raimist2018-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aaron Raimist <aaron@raim.ist>
| * | | | | Add a note saying you need to manually reclaim disk spaceAaron Raimist2018-11-181-0/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | People keep asking why their database hasn't gotten smaller after using this API. Signed-off-by: Aaron Raimist <aaron@raim.ist>
* | | | | Merge pull request #4193 from kivikakk/add-openbsd-prereqAmber Brown2018-11-172-1/+2
|\ \ \ \ \ | | | | | | | | | | | | add jpeg to OpenBSD prereq list
| * | | | | add changelog.d entryAshe Connor2018-11-171-0/+1
| | | | | |
| * | | | | add jpeg to OpenBSD prereq listAshe Connor2018-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ashe Connor <ashe@kivikakk.ee>
* | | | | | Merge pull request #4192 from matrix-org/travis/fix-consent-urlsTravis Ralston2018-11-164-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove duplicate slashes in generated consent URLs
| * | | | | Fix the terms UI auth testsTravis Ralston2018-11-151-1/+1
| | | | | | | | | | | | | | | | | | By setting the config value directly, we skip the block that adds the slash automatically for us.
| * | | | | ChangelogTravis Ralston2018-11-151-0/+1
| | | | | |
| * | | | | Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-152-3/+3
|/ / / / /
* | | | | Fix Content-Disposition in media repository (#4176)Amber Brown2018-11-156-90/+271
| | | | |
* | | | | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-157-35/+92
| | | | |
* | | | | Use <meta> tags to discover the per-page encoding of html previews (#4183)Amber Brown2018-11-153-9/+100
| | | | |
* | | | | Add a coveragerc (#4180)Amber Brown2018-11-154-2/+27
| | | | |
* | | | | Merge pull request #4188 from matrix-org/rav/readme-update-1Neil Johnson2018-11-152-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Update README for #1491 fix
| * | | | Update README for #1491 fixRichard van der Hoff2018-11-152-3/+5
|/ / / /
* | | | Merge pull request #4184 from matrix-org/rav/fix_public_consentRichard van der Hoff2018-11-143-5/+16
|\ \ \ \ | | | | | | | | | | Fix an internal server error when viewing the public privacy policy
| * | | | changelogRichard van der Hoff2018-11-141-0/+1
| | | | |
| * | | | Add a test for the public T&Cs formRichard van der Hoff2018-11-142-1/+8
| | | | |
| * | | | Fix an internal server error when viewing the public privacy policyRichard van der Hoff2018-11-141-4/+7
|/ / / /
* | | | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbersDavid Baker2018-11-143-2/+71
|\ \ \ \ | | | | | | | | | | Make e2e backup versions numeric in the DB
| * \ \ \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2018-11-09140-758/+2475
| |\ \ \ \ | | | | | | | | | | | | | | | | | | dbkr/e2e_backup_versions_are_numbers
| * | | | | pep8David Baker2018-11-091-1/+2
| | | | | |
| * | | | | add docsDavid Baker2018-11-091-1/+4
| | | | | |
| * | | | | Remove unnecessary str()David Baker2018-11-091-1/+1
| | | | | |
| * | | | | Cast to int here tooDavid Baker2018-10-301-0/+5
| | | | | |
| * | | | | Cast bacjup version to int when queryingDavid Baker2018-10-301-1/+6
| | | | | |
| * | | | | Convert version back to a stringDavid Baker2018-10-301-0/+1
| | | | | |
| * | | | | news fragmentDavid Baker2018-10-301-0/+1
| | | | | |
| * | | | | Try & make it work on postgresDavid Baker2018-10-301-2/+2
| | | | | |
| * | | | | Make e2e backup versions numeric in the DBDavid Baker2018-10-293-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing max(version) which does not do what we wanted on a column of type TEXT.
* | | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_eventsErik Johnston2018-11-093-89/+75
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Drop incoming events from federation for unknown rooms
| * | | | | Remove hack to support rejoining roomsErik Johnston2018-11-091-74/+42
| | | | | |
| * | | | | Simplify to always drop events if server isn't in the roomErik Johnston2018-11-091-14/+9
| | | | | |
| * | | | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | | | | Update synapse/federation/federation_server.pyRichard van der Hoff2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | Co-Authored-By: erikjohnston <erikj@jki.re>
| * | | | | NewsfileErik Johnston2018-11-081-0/+1
| | | | | |
| * | | | | Drop PDUs of unknown roomsErik Johnston2018-11-081-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we receive events over federation we will need to know the room version to be able to correctly handle them, e.g. once we start changing event formats. Currently, we attempt to handle events in unknown rooms.
* | | | | | Merge pull request #4168 from ↵Brendan Abolivier2018-11-091-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/babolivier/federation-client-content-type Add a Content-Type header on POST requests to the federation client script
| * | | | | | Add a Content-Type header on POST requests to the federation clientBrendan Abolivier2018-11-091-2/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparisonErik Johnston2018-11-083-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix noop checks when updating device keys
| * | | | | | Add test to assert set_e2e_device_keys correctly returns False on no-opErik Johnston2018-11-081-0/+15
| | | | | | |
| * | | | | | Lets convert bytes to unicode insteadErik Johnston2018-11-081-5/+3
| | | | | | |
| * | | | | | NewsfileErik Johnston2018-11-081-0/+1
| | | | | | |
| * | | | | | Fix noop checks when updating device keysErik Johnston2018-11-081-0/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients often reupload their device keys (for some reason) so its important for the server to check for no-ops before sending out device list update notifications. The check is broken in python 3 due to the fact comparing bytes and unicode always fails, and that we write bytes to the DB but get unicode when we read.
* | | | | | Merge pull request #4163 from matrix-org/rav/fix_consent_on_py3Richard van der Hoff2018-11-083-6/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix encoding error for consent form on python3
| * | | | | fix parse_string docstringRichard van der Hoff2018-11-081-5/+4
| | | | | |
| * | | | | changelogRichard van der Hoff2018-11-081-0/+1
| | | | | |
| * | | | | Fix encoding error for consent form on python3hera2018-11-081-1/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The form was rendering this as "b'01234....'". -- richvdh
* | | | | Port hash_password to Python 3 (#4161)Amber Brown2018-11-083-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * port hash_password * changelog
* | | | | Fix URL preview bugs (type error when loading cache from db, content-type ↵Amber Brown2018-11-085-10/+187
| | | | | | | | | | | | | | | | | | | | including quotes) (#4157)
* | | | | Merge pull request #4155 from rubo77/purge-apiRichard van der Hoff2018-11-074-0/+212
|\ \ \ \ \ | | | | | | | | | | | | add purge_history.sh and purge_remote_media.sh scripts
| * | | | | add purge_history.sh and purge_remote_media.sh scripts to contrib/purge_api/rubo772018-11-074-0/+212
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ruben Barkow <github@r.z11.de>
* | | | | | Remove some boilerplate in tests (#4156)Amber Brown2018-11-0711-216/+162
|/ / / / /
* | | | | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-0610-11/+65
| | | | | | | | | | | | | | | | | | | | So people can still collect consent the old way if they want to.
* | | | | handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-054-52/+71
| | | | | | | | | | | | | | | fixes #4056
* | | | | Tests for user consent resource (#4140)Amber Brown2018-11-065-6/+140
| | | | |
* | | | | Add some tests for the HTTP pusher (#4149)Amber Brown2018-11-062-0/+160
| | | | |
* | | | | Add helpers for getting prev and auth events (#4139)Erik Johnston2018-11-0610-45/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add helpers for getting prev and auth events This is in preparation for allowing the event format to change between room versions.
* | | | | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-032-0/+2
| | | | |
* | | | | Merge pull request #4137 from matrix-org/erikj/clean_up_eventsErik Johnston2018-11-026-10/+8
|\ \ \ \ \ | | | | | | | | | | | | Clean up event accesses and tests
| * | | | | NewsfileErik Johnston2018-11-021-0/+1
| | | | | |
| * | | | | Clean up event accesses and testsErik Johnston2018-11-025-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation to refactor FrozenEvent to support different event formats for different room versions
* | | | | | Fix typing being reset causing infinite syncs (#4127)Amber Brown2018-11-035-5/+155
| | | | | |
* | | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_lockingRichard van der Hoff2018-11-024-11/+129
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix locked upsert on device_lists_remote_cache
| * | | | | | changelogRichard van der Hoff2018-11-021-0/+1
| | | | | | |
| * | | | | | Add unique indexes to a couple of tablesRichard van der Hoff2018-11-023-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The indexes on device_lists_remote_extremeties can be unique, and they therefore should, to ensure that the db remains consistent.
| * | | | | | Remove redundant database locks for device list updatesRichard van der Hoff2018-11-021-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can rely on the application-level per-user linearizer.
* | | | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-authRichard van der Hoff2018-11-022-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix logic error that prevented guests from seeing the privacy policy
| * | | | | | | ChangelogTravis Ralston2018-11-011-0/+1
| | | | | | | |
| * | | | | | | Fix logic error that prevented guests from seeing the privacy policyTravis Ralston2018-11-011-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_noneErik Johnston2018-11-023-2/+103
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix None exception in state res v2
| * | | | | | | NewsfileErik Johnston2018-11-021-0/+1
| | | | | | | |
| * | | | | | | Fix None exception in state res v2Erik Johnston2018-11-022-2/+102
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #3778 from z3ntu/patch-1Richard van der Hoff2018-11-012-2/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix build of Docker image with docker-compose
| * | | | | | changelog.d entry somehow got lostLuca Weiss2018-09-111-0/+1
| | | | | | |
| * | | | | | Fix build of Docker image with docker-composeLuca Weiss2018-09-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and fix a typo
* | | | | | | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-019-27/+277
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add m.login.terms to the registration flow
| * | | | | | The tests also need a version parameter Travis Ralston2018-10-311-1/+1
| | | | | | |
| * | | | | | Include a version query string arg for the consent routeTravis Ralston2018-10-312-3/+8
| | | | | | |
| * | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-3191-1262/+2561
| |\ \ \ \ \ \
| * | | | | | | pep8Travis Ralston2018-10-242-6/+3
| | | | | | | |
| * | | | | | | It helps to import thingsTravis Ralston2018-10-241-0/+16
| | | | | | | |
| * | | | | | | Move test to where the other integration tests areTravis Ralston2018-10-242-97/+109
| | | | | | | |
| * | | | | | | Fix testTravis Ralston2018-10-241-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debug tests Try printing the channel fix Import and use six Remove debugging Disable captcha Add some mocks Define the URL Fix the clock? Less rendering? use the other render Complete the dummy auth stage Fix last stage of the test Remove mocks we don't need
| * | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-2490-971/+2312
| |\ \ \ \ \ \ \
| * | | | | | | | Fix terms UI auth testTravis Ralston2018-10-181-2/+5
| | | | | | | | |
| * | | | | | | | Test for terms UI authTravis Ralston2018-10-181-0/+70
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1843-163/+308
| |\ \ \ \ \ \ \ \
| * | | | | | | | | pep8Travis Ralston2018-10-153-14/+3
| | | | | | | | | |
| * | | | | | | | | Ensure the terms params are actually providedTravis Ralston2018-10-151-0/+1
| | | | | | | | | |
| * | | | | | | | | Python is hardTravis Ralston2018-10-151-5/+6
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-1513-3/+1447
| |\ \ \ \ \ \ \ \ \