diff --git a/.travis.yml b/.travis.yml index 382e608dff..f25c60973e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,23 +9,25 @@ before_script: - npm -v - node -v - env -- npm install -g @angular/cli@latest +#- npm install -g @angular/cli@latest - npm install -g bower -- npm install @angular/core@latest +#- npm install @angular/core@latest - chmod +x ./get_seroUtils.sh - "./get_seroUtils.sh" - ls -l ./WebContent/WEB-INF/lib/seroUtils.jar +# correct version base on Milestones +- sed -i '94s/.*/ return "'$SCADA_LTS_MILESTONE'";/' ./src/com/serotonin/mango/Common.java - cd ./WebContent/resources/app; bower update; - cd ../../.. -- cd ./ScadaLTS-UI -- npm install -- ls -l ./src/app/media -- ng version -- ng build -- cd ./war -- ant war -- ant -- cd ../.. +#- cd ./ScadaLTS-UI +#- npm install +#- ls -l ./src/app/media +#- ng version +#- ng build +#- cd ./war +#- ant war +#- ant +#- cd ../.. - cd ./ScadaLTS-UI-1 - npm install - cd ../WebContent/resources/npm/ @@ -69,7 +71,7 @@ after_script: - rm -rf ./apache-tomcat-7.0.85 - cp ../../ScadaBR.war ./webapps #- cp ../../ScadaLTS-UI/war/ScadaLTS.war ./webapps -- ls -l ./webapps/ScadaLTS.war +#- ls -l ./webapps/ScadaLTS.war - ls -l ./webapps/ScadaBR.war - cp ../../WebContent/WEB-INF/lib/mysql-connector-java-3.1.8-bin.jar ./lib/ - cp ../../WebContent/WEB-INF/lib/mysql-connector-java-5.1.38-bin.jar ./lib/ @@ -86,5 +88,4 @@ after_script: - export IMAGE_NAME=scadalts/scadalts - docker build -t $IMAGE_NAME:$TRAVIS_COMMIT . - docker tag $IMAGE_NAME:$TRAVIS_COMMIT $IMAGE_NAME:$TAG -- docker push $IMAGE_NAME:$TAG - +- docker push $IMAGE_NAME:$TAG \ No newline at end of file diff --git a/ScadaLTS-UI-1/package-lock.json b/ScadaLTS-UI-1/package-lock.json index e6f06e76d9..3425c1259c 100644 --- a/ScadaLTS-UI-1/package-lock.json +++ b/ScadaLTS-UI-1/package-lock.json @@ -253,14 +253,14 @@ } }, "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", + "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", + "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.1" } }, "ajv-keywords": { @@ -3889,6 +3889,18 @@ "text-table": "~0.2.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", @@ -3910,6 +3922,12 @@ "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", "dev": true }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, "globals": { "version": "11.7.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", @@ -3926,6 +3944,12 @@ "esprima": "^4.0.0" } }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -4602,9 +4626,9 @@ "dev": true }, "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-json-stable-stringify": { "version": "2.0.0", @@ -5857,6 +5881,32 @@ "requires": { "ajv": "^5.1.0", "har-schema": "^2.0.0" + }, + "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + } } }, "has": { @@ -7880,9 +7930,9 @@ "dev": true }, "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stable-stringify": { "version": "1.0.1", @@ -7926,6 +7976,29 @@ "brace": "0.11.0", "javascript-natural-sort": "0.7.1", "picomodal": "3.0.0" + }, + "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + } } }, "jsonify": { @@ -12345,6 +12418,32 @@ "dev": true, "requires": { "ajv": "^5.0.0" + }, + "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + } } }, "select-hose": { @@ -13131,6 +13230,32 @@ "lodash": "^4.17.4", "slice-ansi": "1.0.0", "string-width": "^2.1.1" + }, + "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + } } }, "tapable": { @@ -13617,7 +13742,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, "requires": { "punycode": "^2.1.0" }, @@ -13625,8 +13749,7 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" } } }, diff --git a/WebContent/WEB-INF/classes/messages_de.properties b/WebContent/WEB-INF/classes/messages_de.properties index 7582b3a593..51b1c94e70 100644 --- a/WebContent/WEB-INF/classes/messages_de.properties +++ b/WebContent/WEB-INF/classes/messages_de.properties @@ -2872,7 +2872,7 @@ systemSettings.uiPerformance.med=Normal systemSettings.upToDate=Diese Mangoinstallation ist aktuell systemSettings.useProxy=Proxy verwenden systemSettings.validation.invalidColour=Invalid color -systemSettings.version=Mango version +systemSettings.version=ScadaLTS version systemSettings.versionCheck1=Socket timeout during check. Please try again systemSettings.versionCheck2=An error occurred: {0}: {1} systemSettings.versionSaved=Version settings have been saved @@ -3156,4 +3156,3 @@ menu.point_hierarchy.info.tooltip=Info header.changeTheme= - diff --git a/WebContent/WEB-INF/classes/messages_en.properties b/WebContent/WEB-INF/classes/messages_en.properties index 200d1a46f9..86b0156623 100644 --- a/WebContent/WEB-INF/classes/messages_en.properties +++ b/WebContent/WEB-INF/classes/messages_en.properties @@ -2874,7 +2874,7 @@ systemSettings.uiPerformance.med=Medium systemSettings.upToDate=This instance of ScadaBR is up to date systemSettings.useProxy=Use proxy systemSettings.validation.invalidColour=Invalid color -systemSettings.version=This ScadaBR version +systemSettings.version=ScadaLTS version systemSettings.versionCheck1=Socket timeout during check. Please try again systemSettings.versionCheck2=An error occurred: {0}: {1} systemSettings.versionSaved=Version settings have been saved diff --git a/WebContent/WEB-INF/classes/messages_es.properties b/WebContent/WEB-INF/classes/messages_es.properties index 0417efad1b..b8c364e376 100644 --- a/WebContent/WEB-INF/classes/messages_es.properties +++ b/WebContent/WEB-INF/classes/messages_es.properties @@ -2856,7 +2856,7 @@ systemSettings.uiPerformance.med=Medio systemSettings.upToDate=Esta instancia del ScadaBR está actualizada systemSettings.useProxy=Activar proxy systemSettings.validation.invalidColour=Color inválido -systemSettings.version=Esta versión de ScadaBR +systemSettings.version=Esta versión de ScadaLTS systemSettings.versionCheck1=Finalizado el tiempo de espera de Socket durante la revisión. Por favor intente nuevamente systemSettings.versionCheck2=Ha ocurrido un error: {0}: {1} systemSettings.versionSaved=La configuración de la versión ha sido guardada diff --git a/WebContent/WEB-INF/classes/messages_fi.properties b/WebContent/WEB-INF/classes/messages_fi.properties index 4907f5745e..e856446adf 100644 --- a/WebContent/WEB-INF/classes/messages_fi.properties +++ b/WebContent/WEB-INF/classes/messages_fi.properties @@ -1771,7 +1771,7 @@ systemSettings.proxyPort=Portti systemSettings.proxyUsername=Käyttäjätunnus systemSettings.proxyPassword=Salasana systemSettings.systemInformation=Järjestelmän asetukset -systemSettings.version=Mangon versio +systemSettings.version=ScadaLTS versio systemSettings.notify=Ilmoita päivitysjulkaisuista systemSettings.notifyStable=Vain vakaat versiot systemSettings.notifyRC=Julkaisukanditaatti tai parempi diff --git a/WebContent/WEB-INF/classes/messages_fr.properties b/WebContent/WEB-INF/classes/messages_fr.properties index 6681b92a9a..c7df0fb091 100644 --- a/WebContent/WEB-INF/classes/messages_fr.properties +++ b/WebContent/WEB-INF/classes/messages_fr.properties @@ -2706,7 +2706,7 @@ systemSettings.uiPerformance=Performance de l’UI systemSettings.upToDate=Cette instance de ScadaBR est à jour systemSettings.useProxy=Utiliser proxy systemSettings.validation.invalidColour=Invalid color -systemSettings.version=Cette version de ScadaBR +systemSettings.version=Cette version de ScadaLTS systemSettings.versionCheck1=Temps de pause du socket lors d’un contrôle. S’il vous plaît essayer à nouveau systemSettings.versionCheck2=Une erreur s’est produite: {0}: {1} systemSettings.versionSaved=Paramètres de version ont été sauvés diff --git a/WebContent/WEB-INF/classes/messages_lu.properties b/WebContent/WEB-INF/classes/messages_lu.properties index 89b6f23c79..5e87f00f2a 100644 --- a/WebContent/WEB-INF/classes/messages_lu.properties +++ b/WebContent/WEB-INF/classes/messages_lu.properties @@ -2927,7 +2927,7 @@ systemSettings.uiPerformance.med=Normal systemSettings.upToDate=Des Mangoinstallatioun ass aktuell systemSettings.useProxy=Proxy verwenden systemSettings.validation.invalidColour=Invalid color -systemSettings.version=Mango versioun +systemSettings.version=ScadaLTS versioun systemSettings.versionCheck1=Socket timeout during check. Please try again systemSettings.versionCheck2=An error occurred: {0}: {1} systemSettings.versionSaved=Version settings have been saved diff --git a/WebContent/WEB-INF/classes/messages_pl.properties b/WebContent/WEB-INF/classes/messages_pl.properties index d1955cca4b..9e9f1f9ca5 100644 --- a/WebContent/WEB-INF/classes/messages_pl.properties +++ b/WebContent/WEB-INF/classes/messages_pl.properties @@ -1778,7 +1778,7 @@ systemSettings.systemAlarmLevelsSaved=Zapisano poziomy alarmowe zdarzeń systemo systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved systemSettings.httpSaved=Http settings have been saved systemSettings.miscSaved=Settings have been saved -systemSettings.versionSaved=Version settings have been saved +systemSettings.versionSaved=ScadaLTS systemSettings.upToDate=This instance of ScadaBR is up to date systemSettings.emailSettings=Ustawienia Email systemSettings.smtpHost=SMTP host diff --git a/WebContent/WEB-INF/classes/messages_pt.properties b/WebContent/WEB-INF/classes/messages_pt.properties index a81b0cb562..81ee07db5e 100644 --- a/WebContent/WEB-INF/classes/messages_pt.properties +++ b/WebContent/WEB-INF/classes/messages_pt.properties @@ -1883,7 +1883,7 @@ systemSettings.proxyPassword=Senha do proxy systemSettings.systemInformation=Informações do sistema systemSettings.instanceId=ID da instância systemSettings.instanceDescription=Descrição da instância -systemSettings.version=Esta versão do ScadaBR +systemSettings.version=Esta versão do ScadaLTS systemSettings.notify=Notificar após aprovação de systemSettings.notifyStable=Apenas versões estáveis systemSettings.notifyRC=Release candidates ou melhor diff --git a/WebContent/WEB-INF/classes/messages_ru.properties b/WebContent/WEB-INF/classes/messages_ru.properties index 06b6840258..b5438d492f 100644 --- a/WebContent/WEB-INF/classes/messages_ru.properties +++ b/WebContent/WEB-INF/classes/messages_ru.properties @@ -1832,7 +1832,7 @@ systemSettings.proxyUsername=Имя пользователя Proxy systemSettings.proxyPassword=Пароль Proxy systemSettings.systemInformation=Информация о системе systemSettings.instanceId=Идентификатор экземпляра -systemSettings.version=Текущая версия ScadaBR +systemSettings.version=Текущая версия ScadaLTS systemSettings.notify=Уведомить о выпуске systemSettings.notifyStable=Только стабильные версии systemSettings.notifyRC=Предвыпускные (Release candidates) версии и лучше diff --git a/WebContent/WEB-INF/classes/messages_zh.properties b/WebContent/WEB-INF/classes/messages_zh.properties index 7a78de9076..81f1085475 100644 --- a/WebContent/WEB-INF/classes/messages_zh.properties +++ b/WebContent/WEB-INF/classes/messages_zh.properties @@ -1456,7 +1456,7 @@ systemSettings.proxyPort=代理端口 systemSettings.proxyUsername=代理用户名 systemSettings.proxyPassword=代理密码 systemSettings.systemInformation=系统信息 -systemSettings.version=本Mango系统的版本 +systemSettings.version=本ScadaLTS系统的版本 systemSettings.notify=Notify upon release of systemSettings.notifyStable=仅稳定版本 systemSettings.notifyRC=Release candidates or better diff --git a/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp b/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp index f6d347b0b1..c5666c3445 100644 --- a/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp +++ b/WebContent/WEB-INF/jsp/pointHierarchySLTS.jsp @@ -781,10 +781,10 @@ var messages = { var toMove ={}; $("#tree").fancytree({ - extensions: ["dnd","glyph", "wide"], + extensions: ["dnd","glyph"], debugLevel: 0, checkbox: false, - autoScroll: true, + autoScroll: false, autoActivate: true, activeVisible: false, clickFolderMode: 4,