Merge branch 'devel_12.1.x' into merge_12.1.6 (83d478a2) · 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

83d478a2

Commit 83d478a2 authored 6 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'devel_12.1.x' into merge_12.1.6

parents d4e295ac 0f014818

No related branches found

No related tags found

2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!603Merge 12.1.6

Pipeline #8522 failed 6 years ago

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 41 additions, 29 deletions

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/services/PubmedParser.java 7 additions, 0 deletions

...java/lcsb/mapviewer/annotation/services/PubmedParser.java
frontend-js/src/main/js/ServerConnector.js 10 additions, 1 deletion

frontend-js/src/main/js/ServerConnector.js
frontend-js/src/main/js/map/data/MapModel.js 3 additions, 3 deletions

frontend-js/src/main/js/map/data/MapModel.js
frontend-js/src/main/js/map/window/AliasInfoWindow.js 1 addition, 1 deletion

frontend-js/src/main/js/map/window/AliasInfoWindow.js
frontend-js/src/main/js/minerva.js 3 additions, 0 deletions

frontend-js/src/main/js/minerva.js
frontend-js/src/test/js/map/data/MapModel-test.js 38 additions, 13 deletions

frontend-js/src/test/js/map/data/MapModel-test.js
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js 3 additions, 3 deletions

frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
rest-api/src/main/java/lcsb/mapviewer/api/BaseRestImpl.java 18 additions, 2 deletions

rest-api/src/main/java/lcsb/mapviewer/api/BaseRestImpl.java
rest-api/src/main/java/lcsb/mapviewer/api/files/FileRestImpl.java 0 additions, 4 deletions

.../src/main/java/lcsb/mapviewer/api/files/FileRestImpl.java
rest-api/src/test/java/lcsb/mapviewer/api/BaseRestImplTest.java 23 additions, 0 deletions

...pi/src/test/java/lcsb/mapviewer/api/BaseRestImplTest.java

with 147 additions and 56 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