Merge branch 'master' into 101-admin-panel-should-use-api (68b13b86) · 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

68b13b86

Commit 68b13b86 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'master' into 101-admin-panel-should-use-api

parents 2856305b 595e14ef

No related branches found

No related tags found

2 merge requests!115Resolve "admin panel should use API",!114Resolve "admin panel should use API"

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

converter-graphics/src/test/java/lcsb/mapviewer/converter/graphics/ConverterTest.java 46 additions, 0 deletions

...java/lcsb/mapviewer/converter/graphics/ConverterTest.java
frontend-js/.idea/dictionaries/piotr_gawron.xml 1 addition, 0 deletions

frontend-js/.idea/dictionaries/piotr_gawron.xml
frontend-js/src/main/js/GuiConnector.js 5 additions, 1 deletion

frontend-js/src/main/js/GuiConnector.js
frontend-js/src/main/js/gui/AddOverlayDialog.js 2 additions, 0 deletions

frontend-js/src/main/js/gui/AddOverlayDialog.js
frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js 7 additions, 7 deletions

frontend-js/src/main/js/gui/leftPanel/ChemicalPanel.js
frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js 8 additions, 2 deletions

frontend-js/src/main/js/gui/leftPanel/ProjectInfoPanel.js

with 69 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