Skip to content

Commit 4cd5d4d

Browse files
committed
Merge branch 'master' of github.com:polypheny/Polypheny-UI into gis
# Conflicts: # angular.json # package-lock.json # package.json # src/app/components/components.module.ts # src/app/components/data-view/data-graph/data-graph.component.ts # src/app/services/webui-settings.service.ts # src/app/views/querying/console/console.component.html # src/app/views/querying/console/console.component.scss # src/app/views/querying/console/console.component.ts # src/app/views/views.module.ts
2 parents 7661ae3 + f7dd66a commit 4cd5d4d

262 files changed

Lines changed: 20671 additions & 5946 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish to DBIS Nexus
1+
name: Publish to artifacts.polypheny.com
22

33
on:
44
push:
@@ -11,16 +11,16 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
- name: Set up JDK
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
distribution: 'temurin'
19-
java-version: 17
19+
java-version: 21
2020
- name: Build with Gradle
2121
run: ./gradlew --no-daemon build packageDistribution
2222
- name: Publish Zip to artifacts.polypheny.com
23-
uses: SamKirkland/FTP-Deploy-Action@v4.3.4
23+
uses: SamKirkland/FTP-Deploy-Action@v4.3.6
2424
with:
2525
server: artifacts.polypheny.com
2626
username: ${{ secrets.FTP_USERNAME }}

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ Polypheny-UI supports a wide range of features including:
99

1010
* Monitoring the current status
1111
* Modifying settings
12-
* Modify the schema
13-
* Model foreign key relationships
12+
* Defining and modify the schema
13+
* Create and modify constraints
14+
* Model relationships
1415
* View and edit stored data
1516
* Execute arbitrary queries
1617
* Analyze query execution
1718
* Graphically build query plans
18-
* Explore-by-example based data exploration
19+
* Define Workflows
20+
* Work with Polypheny Notebooks
1921

2022

2123
## Roadmap ##

angular.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@
1919
"lodash",
2020
"jquery",
2121
"jquery-ui",
22-
"highlightjs",
2322
"chart.js",
24-
"graphlib-dot",
2523
"dagre-d3",
2624
"ansi_up",
2725
"ace-builds",
2826
"mobx",
2927
"flatpickr",
3028
"plyr",
31-
"moment"
29+
"moment",
30+
"elkjs",
31+
"json-pointer",
32+
"@tweenjs/tween.js",
33+
"@babel/runtime/regenerator"
3234
],
3335
"outputPath": "dist",
3436
"index": "src/index.html",
@@ -52,6 +54,7 @@
5254
"node_modules/@ali-hm/angular-tree-component/css/angular-tree-component.css",
5355
"node_modules/katex/dist/katex.min.css",
5456
"node_modules/prismjs/themes/prism-okaidia.css",
57+
"src/scss/angular2-multiselect-dropdown.scss",
5558
"src/app/components/data-view/data-map/leaflet.css",
5659
"node_modules/leaflet-draw/dist/leaflet.draw.css"
5760
],
@@ -63,6 +66,7 @@
6366
"scripts": [
6467
"node_modules/chart.js/dist/chart.min.js",
6568
"node_modules/katex/dist/katex.min.js",
69+
"node_modules/katex/dist/contrib/auto-render.min.js",
6670
"node_modules/prismjs/prism.js",
6771
"node_modules/prismjs/components/prism-css.min.js",
6872
"node_modules/prismjs/components/prism-cypher.min.js",

gradle/wrapper/gradle-wrapper.jar

4.09 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 28 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)