Commit 4cd5d4d
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.ts262 files changed
Lines changed: 20671 additions & 5946 deletions
File tree
- .github/workflows
- gradle/wrapper
- src
- app
- components
- autocomplete
- breadcrumb
- data-view
- data-card
- data-graph
- data-table
- data-template
- input
- json-text
- models
- view
- delete-confirm
- docker
- dockerinstance
- dockersettings
- dynamic-forms
- editor
- graph
- information-manager
- render-item
- json
- json-elem
- left-sidebar
- polyalg
- controls
- agg-arg
- string-arg
- polyalg-viewer
- panning-boundary
- right-sidebar
- toast-exposer
- toast
- containers/default-layout
- models
- pipes
- plugins
- notebooks
- components
- edit-notebook
- nb-cell
- manage-notebook
- notebooks-dashboard
- services
- workflows
- components
- checkpoint-viewer
- workflow-job
- job-creator
- job-list
- workflow-session
- workflow-viewer
- activity-help
- editor
- activity-port
- activity
- edge
- execution-monitor
- workflow-config-editor
- workflow-help
- workflows-dashboard
- models
- services
- services
- views
- about
- adapters
- dashboard
- dockerconfig
- forms/form-generator
- login
- monitoring
- query-interfaces
- querying
- console
- gis
- components/visualization
- color
- models
- polyalg
- schema-editing
- document-edit-collections
- document-edit-collection
- edit-columns
- edit-entity
- edit-source-columns
- edit-tables
- graph-edit-graph
- statistics-column
- table-view
- assets/ace
- scss
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
18 | | - | |
| 19 | + | |
| 20 | + | |
19 | 21 | | |
20 | 22 | | |
21 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
23 | 22 | | |
24 | | - | |
25 | 23 | | |
26 | 24 | | |
27 | 25 | | |
28 | 26 | | |
29 | 27 | | |
30 | 28 | | |
31 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
32 | 34 | | |
33 | 35 | | |
34 | 36 | | |
| |||
52 | 54 | | |
53 | 55 | | |
54 | 56 | | |
| 57 | + | |
55 | 58 | | |
56 | 59 | | |
57 | 60 | | |
| |||
63 | 66 | | |
64 | 67 | | |
65 | 68 | | |
| 69 | + | |
66 | 70 | | |
67 | 71 | | |
68 | 72 | | |
| |||
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
4 | 6 | | |
5 | 7 | | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments