You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2020/10/02 08:35:38 UTC
[incubator-streampipes] branch dev updated (b75e4fd -> bc87abc)
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from b75e4fd Revert "[maven-release-plugin] rollback the release of streampipes-parent-0.67.1"
add b27be36 [STREAMPIPES-243] Configuration of And Processor is broken
add 7a82857 [STREAMPIPES-231] Images are not shown in Data Explorer
add 58c6c5c Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
new 4491819 Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
new c7a41ba Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
new bc87abc Activate image labeling app
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docker-compose.yml | 21 +++++++++++++++++++++
ui/src/app/app-overview/app-overview.component.html | 4 ++--
ui/src/app/app-overview/app-overview.component.ts | 13 ++++++-------
.../custom-output-strategy.component.html | 2 +-
4 files changed, 30 insertions(+), 10 deletions(-)
[incubator-streampipes] 02/03: Merge branch 'dev' of
github.com:apache/incubator-streampipes into dev
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit c7a41ba123e0d1fb5b2ce96ee5b930d565b2de3e
Merge: 4491819 b75e4fd
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Fri Oct 2 10:31:13 2020 +0200
Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
[incubator-streampipes] 01/03: Merge branch 'dev' of
github.com:apache/incubator-streampipes into dev
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 449181999f7628e2c7733245037e5942841106f4
Merge: 58c6c5c 5714f20
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Sat Sep 26 21:31:05 2020 +0200
Merge branch 'dev' of github.com:apache/incubator-streampipes into dev
pom.xml | 1 -
streampipes-app-file-export/pom.xml | 79 -----
.../app/file/export/ElasticsearchAppData.java | 83 ------
.../app/file/export/ElasticsearchConfig.java | 60 ----
.../app/file/export/api/IElasticsearch.java | 36 ---
.../application/AppFileExportApplication.java | 30 --
.../app/file/export/converter/JsonConverter.java | 65 -----
.../app/file/export/impl/Elasticsearch.java | 320 ---------------------
.../app/file/export/model/IndexInfo.java | 45 ---
streampipes-backend/pom.xml | 5 -
.../backend/StreamPipesBackendApplication.java | 9 -
.../static-alternatives.component.html | 4 +-
.../static-alternatives.component.ts | 1 -
.../pipeline-element-recommendation.component.ts | 26 +-
14 files changed, 20 insertions(+), 744 deletions(-)
[incubator-streampipes] 03/03: Activate image labeling app
Posted by ze...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit bc87abc6267ae8a22bda1e3af3d277c9ce1becfc
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Fri Oct 2 10:35:19 2020 +0200
Activate image labeling app
---
ui/src/app/app-overview/app-overview.component.html | 4 ++--
ui/src/app/app-overview/app-overview.component.ts | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ui/src/app/app-overview/app-overview.component.html b/ui/src/app/app-overview/app-overview.component.html
index cd47b8a..ce1010e 100644
--- a/ui/src/app/app-overview/app-overview.component.html
+++ b/ui/src/app/app-overview/app-overview.component.html
@@ -49,8 +49,8 @@
</div>
<app-asset-monitoring (appOpened)="appOpened($event)"
*ngIf="currentlySelectedApp === apps[0].appId"></app-asset-monitoring>
-<!-- <app-image-labeling (appOpened)="appOpened($event)"-->
-<!-- *ngIf="currentlySelectedApp === apps[1].appId"></app-image-labeling>-->
+ <app-image-labeling (appOpened)="appOpened($event)"
+ *ngIf="currentlySelectedApp === apps[1].appId"></app-image-labeling>
<!-- <app-new-app (appOpened)="appOpened($event)"-->
<!-- *ngIf="currentlySelectedApp === apps[2].appId"></app-new-app>-->
</div>
diff --git a/ui/src/app/app-overview/app-overview.component.ts b/ui/src/app/app-overview/app-overview.component.ts
index 09e6318..733bcfb 100644
--- a/ui/src/app/app-overview/app-overview.component.ts
+++ b/ui/src/app/app-overview/app-overview.component.ts
@@ -33,13 +33,12 @@ export class AppOverviewComponent implements OnInit {
appName: 'Asset Dashboards',
appDescription: 'Monitor measurements of your assets by placing visualizations on an image of your asset.',
appId: 'asset-monitoring',
- }
- // ,
- // {
- // appName: 'Image Labeling',
- // appDescription: 'Label in data lake stored images.',
- // appId: 'image-labeling',
- // },
+ },
+ {
+ appName: 'Image Labeling',
+ appDescription: 'Label in data lake stored images.',
+ appId: 'image-labeling',
+ },
// {
// appName: 'New App',
// appDescription: 'An app that has some function',