Merge remote-tracking branch 'origin/devel_13.2.x' into merge-13.2.0 (17a8bf77) · 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

17a8bf77

Commit 17a8bf77 authored 5 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/devel_13.2.x' into merge-13.2.0

parents e9f40baa 3e5f3475

No related branches found

No related tags found

1 merge request!925Merge 13.2.0

Pipeline #13392 failed 5 years ago

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 22 additions, 15 deletions

CHANGELOG
frontend-js/package.json 1 addition, 1 deletion

frontend-js/package.json
frontend-js/src/main/js/gui/AddOverlayDialog.js 3 additions, 0 deletions

frontend-js/src/main/js/gui/AddOverlayDialog.js
frontend-js/src/main/js/gui/admin/MapsAdminPanel.js 1 addition, 1 deletion

frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
frontend-js/src/main/js/gui/admin/UsersAdminPanel.js 1 addition, 1 deletion

frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
frontend-js/src/main/js/gui/leftPanel/GuiUtils.js 10 additions, 2 deletions

frontend-js/src/main/js/gui/leftPanel/GuiUtils.js
service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java 8 additions, 1 deletion

...java/lcsb/mapviewer/services/utils/ColorSchemaReader.java
service/src/test/java/lcsb/mapviewer/services/search/drug/DrugServiceTest.java 11 additions, 0 deletions

.../lcsb/mapviewer/services/search/drug/DrugServiceTest.java
service/src/test/java/lcsb/mapviewer/services/utils/ColorSchemaReaderTest.java 9 additions, 0 deletions

.../lcsb/mapviewer/services/utils/ColorSchemaReaderTest.java
service/testFiles/coloring/invalidType.txt 5 additions, 0 deletions

service/testFiles/coloring/invalidType.txt

with 71 additions and 21 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