Merge remote-tracking branch 'origin/master' into 1246-infotab-export-network-suggestion (03aec194) · Commits · minerva / core · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

03aec194

Commit 03aec194 authored 3 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 1246-infotab-export-network-suggestion

parents 3636101c ae25508b

No related branches found

No related tags found

1 merge request!1433Resolve "InfoTab > EXPORT > NETWORK - suggestion"

Pipeline #51995 canceled 3 years ago

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 4 additions, 1 deletion

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/services/ModelAnnotator.java 13 additions, 4 deletions

...va/lcsb/mapviewer/annotation/services/ModelAnnotator.java
frontend-js/src/main/js/gui/admin/MapsAdminPanel.js 30 additions, 2 deletions

frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
model/src/main/java/lcsb/mapviewer/model/user/UserAnnotationSchema.java 3 additions, 3 deletions

.../java/lcsb/mapviewer/model/user/UserAnnotationSchema.java
persist/src/main/java/lcsb/mapviewer/persist/dao/user/UserAnnotationSchemaDao.java 14 additions, 0 deletions

...b/mapviewer/persist/dao/user/UserAnnotationSchemaDao.java

with 64 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment