Merge branch 'master' into pdb-annotation
# Conflicts: # rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java # rest-api/src/test/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementRestImplTest.java
No related branches found
No related tags found
Showing
- frontend-js/src/main/css/global.css 16 additions, 1 deletionfrontend-js/src/main/css/global.css
- frontend-js/src/main/js/Configuration.js 22 additions, 0 deletionsfrontend-js/src/main/js/Configuration.js
- frontend-js/src/main/js/gui/leftPanel/GuiUtils.js 25 additions, 3 deletionsfrontend-js/src/main/js/gui/leftPanel/GuiUtils.js
- frontend-js/src/main/js/gui/topMenu/TopMenu.js 1 addition, 1 deletionfrontend-js/src/main/js/gui/topMenu/TopMenu.js
- frontend-js/src/main/js/map/data/ModificationStateType.js 42 additions, 0 deletionsfrontend-js/src/main/js/map/data/ModificationStateType.js
- frontend-js/src/main/js/map/marker/AbstractMarker.js 1 addition, 2 deletionsfrontend-js/src/main/js/map/marker/AbstractMarker.js
- frontend-js/src/main/js/map/overlay/AbstractDbOverlay.js 1 addition, 1 deletionfrontend-js/src/main/js/map/overlay/AbstractDbOverlay.js
- frontend-js/src/main/js/map/overlay/SearchDbOverlay.js 38 additions, 28 deletionsfrontend-js/src/main/js/map/overlay/SearchDbOverlay.js
- frontend-js/src/main/js/map/window/AbstractInfoWindow.js 2 additions, 2 deletionsfrontend-js/src/main/js/map/window/AbstractInfoWindow.js
- frontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js 27 additions, 2 deletionsfrontend-js/src/test/js/gui/leftPanel/GuiUtils-test.js
- frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js 96 additions, 62 deletionsfrontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
- frontend-js/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID& 1 addition, 1 deletion...-js/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&
- frontend-js/testFiles/apiCalls/projects/empty/models/20638/bioEntities.search/coordinates=553.10,479.18&count=1&token=MOCK_TOKEN_ID& 1 addition, 0 deletions...ch/coordinates=553.10,479.18&count=1&token=MOCK_TOKEN_ID&
- frontend-js/testFiles/apiCalls/projects/empty/overlays/token=MOCK_TOKEN_ID& 1 addition, 0 deletions...les/apiCalls/projects/empty/overlays/token=MOCK_TOKEN_ID&
- frontend-js/testFiles/apiCalls/projects/empty/token=MOCK_TOKEN_ID& 1 addition, 0 deletions...js/testFiles/apiCalls/projects/empty/token=MOCK_TOKEN_ID&
- model/src/main/java/lcsb/mapviewer/model/map/MiriamData.java 1 addition, 1 deletionmodel/src/main/java/lcsb/mapviewer/model/map/MiriamData.java
- model/src/main/java/lcsb/mapviewer/model/map/species/field/AntisenseRnaRegion.java 3 additions, 3 deletions...mapviewer/model/map/species/field/AntisenseRnaRegion.java
- model/src/main/java/lcsb/mapviewer/model/map/species/field/ElementModification.java 7 additions, 0 deletions...apviewer/model/map/species/field/ElementModification.java
- model/src/main/java/lcsb/mapviewer/model/map/species/field/ModificationResidue.java 1 addition, 1 deletion...apviewer/model/map/species/field/ModificationResidue.java
- model/src/main/java/lcsb/mapviewer/model/map/species/field/RnaRegion.java 2 additions, 2 deletions...ava/lcsb/mapviewer/model/map/species/field/RnaRegion.java
Loading
Please register or sign in to comment