Merge branch 'devel_11.0.x' into devel_11.1.x (f3239d87) · 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

f3239d87

Commit f3239d87 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'devel_11.0.x' into devel_11.1.x

parents c9192e1c 1a00e9ce

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 12 additions, 5 deletions

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/services/TaxonomyBackend.java 1 addition, 2 deletions

...a/lcsb/mapviewer/annotation/services/TaxonomyBackend.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/TaxonomyBackendTest.java 309 additions, 308 deletions

...sb/mapviewer/annotation/services/TaxonomyBackendTest.java
frontend-js/src/main/js/ServerConnector.js 9 additions, 2 deletions

frontend-js/src/main/js/ServerConnector.js
frontend-js/src/main/js/map/AbstractCustomMap.js 6 additions, 4 deletions

frontend-js/src/main/js/map/AbstractCustomMap.js
frontend-js/src/main/js/map/CustomMap.js 6 additions, 4 deletions

frontend-js/src/main/js/map/CustomMap.js
frontend-js/src/main/js/map/surface/ReactionSurface.js 56 additions, 37 deletions

frontend-js/src/main/js/map/surface/ReactionSurface.js
frontend-js/src/test/js/map/data/MapModel-test.js 2 additions, 0 deletions

frontend-js/src/test/js/map/data/MapModel-test.js
frontend-js/src/test/js/map/surface/ReactionSurface-test.js 45 additions, 24 deletions

frontend-js/src/test/js/map/surface/ReactionSurface-test.js
persist/src/db/11.0.4/fix_db_20171109.sql 1 addition, 0 deletions

persist/src/db/11.0.4/fix_db_20171109.sql

with 447 additions and 386 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