lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/defiant-dingirma' into fix/flat-schema

Browse source
This commit is contained in:
Taranto 2020-06-01 21:02:44 +01:00
commit db32ad4f16
29 changed files with 2454 additions and 3157 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/routes.js
View file

@ -114,10 +114,10 @@ function poll (req, res, next) {
operatorInfo
}
// BACKWARDS_COMPATIBILITY 7.5
// machines before 7.5 expect t&c on poll
if (!machineVersion || semver.lt(machineVersion, '7.5.0-beta')) {
response.terms = createTerms(terms)
// BACKWARDS_COMPATIBILITY 7.4.9
// machines before 7.4.9 expect t&c on poll
if (!machineVersion || semver.lt(machineVersion, '7.4.9')) {
response.terms = config.termsScreenActive && config.termsScreenText ? createTerms(config) : null
}
return res.json(_.assign(response, results))