Skip to content

Commit

Permalink
Merge branch 'master' into releases
Browse files Browse the repository at this point in the history 
- Knowage v7.2.3
- Keyrock 7.9.0
- Wilma 7.9.0
- Stellio 0.12.1
  • Loading branch information
@jason-fox
jason-fox committed Oct 7, 2020
2 parents 3666e34 + f14b490 commit 945ed76
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion core/stellio
Submodule stellio updated 107 files
2 changes: 1 addition & 1 deletion processing/knowage/server
Submodule server updated 91 files
+1 −1 Knowage-Python/pythonwebservice/app/services/editmode_service.py
+1 −1 Knowage-Python/pythonwebservice/app/services/viewmode_service.py
+8 −3 Knowage-Python/pythonwebservice/app/utilities/security.py
+2 −2 Knowage-Python/pythonwebservice/app/utilities/utils.py
+6 −1 Knowage-Python/pythonwebservice/knowage-python.py
+1 −1 Knowage-Python/setup.py
+1 −1 cas/pom.xml
+1 −1 jdbccore/pom.xml
+2 −1 knowage-ce-parent/pom.xml
+6 −6 knowage-core/pom.xml
+3 −3 knowage-core/src/main/java/it/eng/spagobi/api/DocumentExecutionSendMail.java
+6 −0 knowage-core/src/main/java/it/eng/spagobi/api/v2/LovResource.java
+31 −21 knowage-core/src/main/java/it/eng/spagobi/commons/initializers/metadata/DomainsInitializer.java
+6 −6 knowage/pom.xml
+3 −3 knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/configs.xml
+5 −2 knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/domains.xml
+5 −0 knowage/src/main/resources/log4j.properties
+1 −1 knowage/src/main/webapp/WEB-INF/jsp/commons/angular/angularImport.jsp
+17 −1 knowage/src/main/webapp/WEB-INF/jsp/tools/documentbrowser/templates/documentBrowserTemplate.jsp
+188 −164 knowage/src/main/webapp/js/src/angular_1.4/tools/commons/document-tree/DocumentTree.js
+1 −4 knowage/src/main/webapp/js/src/angular_1.4/tools/commons/document-tree/template/document-tree.html
+2 −3 knowage/src/main/webapp/js/src/angular_1.4/tools/workspace/scripts/directive/components/modelsViewWorkspace.js
+8 −8 knowage/src/main/webapp/js/src/angular_1.4/tools/workspace/scripts/services/qbeViewerTemplate.html
+1 −0 knowage/src/main/webapp/js/src/messages/messages.properties
+2 −1 knowage/src/main/webapp/manifest.json
+3 −0 knowage/src/main/webapp/themes/commons/css/SASS/vendors/_aggrid.scss
+1 −1 knowage/src/main/webapp/themes/commons/css/customStyle.css
+2 −2 knowage/src/main/webapp/themes/sbi_default/jsp/login.jsp
+4 −4 knowagebirtreportengine/pom.xml
+5 −5 knowagecockpitengine/pom.xml
+4 −4 knowagecockpitengine/src/main/resources/chart/templates/highcharts/column_chart.vm
+1 −1 knowagecockpitengine/src/main/resources/chart/templates/highcharts/pie_chart.vm
+3 −3 ...itengine/src/main/webapp/js/src/angular_1.4/chart/chartInitializer/services/highchartsInitializerService.js
+15 −14 ...n/webapp/js/src/angular_1.4/chart/designer/directives/custom_directives/structure-tab/chartstructure-tab.js
+5 −9 ...bapp/js/src/angular_1.4/cockpit/directives/cockpit-data-configuration/cockpitDataConfigurationController.js
+1 −1 knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/cockpitWidget.js
+3 −3 ...gine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/chartWidget/chartWidget.js
+4 −3 ...engine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/htmlWidget/htmlWidget.js
+4 −4 ...ne/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/pythonWidget/pythonWidget.js
+1 −1 ...rc/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/pythonWidget/pythonWidgetEdit.js
+19 −13 ...rc/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/selectorWidget/selectorWidget.js
+7 −5 ...c/angular_1.4/cockpit/directives/cockpit-widget/widget/selectorWidget/templates/selectorWidgetTemplate.html
+4 −4 knowagecommonjengine/pom.xml
+4 −4 knowagedao/pom.xml
+45 −67 knowagedao/src/main/java/it/eng/spagobi/behaviouralmodel/lov/bo/QueryDetail.java
+16 −0 knowagedatabasescripts/assembly-mysql.xml
+16 −0 knowagedatabasescripts/assembly-oracle.xml
+16 −0 knowagedatabasescripts/assembly-postgres.xml
+67 −0 knowagedatabasescripts/pom.xml
+3 −3 knowagedataminingengine/pom.xml
+3 −3 knowagegeoreportengine/pom.xml
+3 −3 knowagegooglesecurityprovider/pom.xml
+3 −3 knowagejasperreportengine/pom.xml
+3 −3 knowagekpiengine/pom.xml
+3 −3 knowageldapsecurityprovider/pom.xml
+4 −4 knowagemeta/pom.xml
+2 −2 knowageoauth2securityprovider/pom.xml
+3 −3 knowageqbeengine/pom.xml
+2 −13 knowageqbeengine/src/main/java/it/eng/spagobi/engines/qbe/services/registry/LoadRegistryAction.java
+6 −1 knowageqbeengine/src/main/resources/formulas.xml
+2 −2 knowagesdk/pom.xml
+4 −4 knowagesvgviewerengine/pom.xml
+1 −1 knowagetalendenginclientapi/pom.xml
+2 −2 knowagetalendengine/pom.xml
+3 −3 knowageutils/pom.xml
+70 −26 knowageutils/src/main/java/it/eng/knowage/mail/MailSessionBuilder.java
+1 −0 knowageutils/src/main/java/it/eng/spagobi/tools/dataset/constants/DatasetFunctionsConfig.java
+3 −2 knowageutils/src/main/java/it/eng/spagobi/tools/dataset/metasql/query/DatabaseDialect.java
+1 −0 knowageutils/src/main/java/it/eng/spagobi/tools/dataset/metasql/query/visitor/SelectQueryVisitorFactory.java
+2 −1 knowageutils/src/main/java/it/eng/spagobi/tools/dataset/persist/PersistedTableManager.java
+1 −0 knowageutils/src/main/java/it/eng/spagobi/utilities/database/DataBaseFactory.java
+10 −1 knowageutils/src/main/java/it/eng/spagobi/utilities/engines/rest/AbstractRestService.java
+121 −0 knowageutils/src/test/java/it/eng/knowage/mail/MailSessionBuilderTest.java
+6 −0 knowageutils/src/test/resources/log4j.properties
+1 −1 knowageutilsjson/pom.xml
+2 −2 knowagewhatifengine/pom.xml
+27 −0 knowagewhatifengine/src/main/java/it/eng/spagobi/engines/whatif/api/HierarchyResource.java
+3 −1 knowagewhatifengine/src/main/resources/log4j.properties
+4 −75 knowagewhatifengine/src/main/webapp/WEB-INF/jsp/commons/angular/sbiModule.jspf
+7 −5 knowagewhatifengine/src/main/webapp/WEB-INF/jsp/whatIf2.jsp
+2 −2 knowagewhatifengine/src/main/webapp/html/template/main/filter/filterDialog.html
+1 −2 knowagewhatifengine/src/main/webapp/js/src/angular_1.x/scripts/controllers/mainController.js
+34 −26 knowagewhatifengine/src/main/webapp/js/src/angular_1.x/scripts/directives/components/FilterPanel.js
+2 −2 qbecore/pom.xml
+27 −0 qbecore/src/main/java/org/hibernate/dialect/Hive2Dialect.java
+2 −2 slimerjs-wrapper/pom.xml
+1 −1 spagobi-commons-core/pom.xml
+1 −1 spagobi-cwm/pom.xml
+3 −3 spagobi-metamodel-core/pom.xml
+3 −3 spagobi-metamodel-utils/pom.xml
+2 −2 spagobi.birt.oda/pom.xml
8 changes: 4 additions & 4 deletions release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ findRelease core/orion telefonicaid/fiware-orion 2.4.2
findRelease core/orion-ld FIWARE/context.Orion-LD v0.5.0-alpha
findRelease core/quantum-leap smartsdk/ngsi-timeseries-api 0.7.6
findRelease core/scorpio ScorpioBroker/ScorpioBroker FIWARE_7.9
findRelease core/stellio stellio-hub/stellio-context-broker v0.11.0
findRelease core/stellio stellio-hub/stellio-context-broker v0.12.1
findRelease core/sth-comet telefonicaid/fiware-sth-comet 2.8.0


Expand Down Expand Up @@ -89,7 +89,7 @@ findRelease iot-agents/iotagent-sigfox telefonicaid/sigfox-iotagent 1.4.0

findRelease processing/fogflow/fogflow smartfog/fogflow FIWARE_7.9
findRelease processing/knowage/documentation KnowageLabs/Knowage-Documentation "latest"
findRelease processing/knowage/server KnowageLabs/Knowage-Server v7.2.2
findRelease processing/knowage/server KnowageLabs/Knowage-Server v7.2.3
findRelease processing/knowage/server-chef KnowageLabs/Knowage-Server-Chef 6.1.1
findRelease processing/knowage/server-docker KnowageLabs/Knowage-Server-Docker v7.0.0
findRelease processing/kurento/documentation Kurento/doc-fiware-readthedocs "latest"
Expand All @@ -111,8 +111,8 @@ findRelease robotics/firos iml130/firos v0.3.0
findRelease security/apinf/apinf apinf/platform 0.60.0
findRelease security/apinf/api-umbrella apinf/api-umbrella v0.15.0-apinf2.1
findRelease security/authzforce authzforce/server release-9.0.1
findRelease security/keyrock ging/fiware-idm 7.8.2
findRelease security/wilma ging/fiware-pep-proxy 7.8.2
findRelease security/keyrock ging/fiware-idm 7.9.0
findRelease security/wilma ging/fiware-pep-proxy 7.9.0

findRelease third-party/domibus edelivery/domibus 4.1.5
findRelease third-party/oliot yalewkidane/FIWARE_EPCIS_Mediation_Gateway 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion security/keyrock
Submodule keyrock updated 172 files
2 changes: 1 addition & 1 deletion security/wilma
Submodule wilma updated 28 files
+2 −1 .gitignore
+9 −0 .prettierrc.json
+15 −7 .travis.yml
+80 −54 Dockerfile
+0 −35 Dockerfile-sample
+1 −1 README.md
+41 −0 bin/healthcheck.js
+34 −40 bin/www
+71 −0 config.js
+25 −32 config.js.template
+29 −21 controllers/root.js
+55 −1 doc/admin_guide.md
+1 −1 doc/index.md
+ − doc/resources/Auth_for_nginx.png
+168 −56 extras/docker/Dockerfile
+1 −0 extras/docker/README.md
+0 −78 extras/docker/config.js.template
+0 −29 extras/docker/docker-entrypoint.sh
+14 −0 extras/docker/hooks/build
+272 −221 lib/azf.js
+234 −0 lib/config_service.js
+2 −1 lib/idm.js
+15 −15 log_config.json
+4,131 −4,076 package-lock.json
+33 −32 package.json
+4 −4 sanity/test.js
+6 −9 test/config_test.js
+3 −1 test/unit/sanity-test.js

0 comments on commit 945ed76

Please sign in to comment.