Merge branch '62-annotations-description-of-a-submap-anchor' into 'master' (8674cd7d) · 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

8674cd7d

Commit 8674cd7d authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch '62-annotations-description-of-a-submap-anchor' into 'master'

Resolve "Annotations: description of a submap anchor"

Closes #62

See merge request !40

parents e8c898c7 10f94447

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

frontend-js/src/main/js/gui/leftPanel/Panel.js 5 additions, 4 deletions

frontend-js/src/main/js/gui/leftPanel/Panel.js
frontend-js/src/main/js/gui/leftPanel/SearchPanel.js 2 additions, 2 deletions

frontend-js/src/main/js/gui/leftPanel/SearchPanel.js
frontend-js/src/main/js/map/CustomMap.js 1 addition, 1 deletion

frontend-js/src/main/js/map/CustomMap.js
frontend-js/src/main/js/map/Submap.js 6 additions, 5 deletions

frontend-js/src/main/js/map/Submap.js
frontend-js/src/main/js/map/data/Alias.js 7 additions, 108 deletions

frontend-js/src/main/js/map/data/Alias.js
frontend-js/src/main/js/map/data/BioEntity.js 129 additions, 0 deletions

frontend-js/src/main/js/map/data/BioEntity.js
frontend-js/src/main/js/map/data/Reaction.js 5 additions, 94 deletions

frontend-js/src/main/js/map/data/Reaction.js
rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java 8 additions, 3 deletions

...rojects/models/bioEntities/elements/ElementsRestImpl.java

with 163 additions and 217 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