Merge branch 'devel_12.2.x' into merge-12.2.2 (0008c14d) · 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

0008c14d

Commit 0008c14d authored 6 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'devel_12.2.x' into merge-12.2.2

parents 0f4dab95 d78cd97a

No related branches found

No related tags found

1 merge request!744Merge 12.2.2

Checking pipeline status

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 3 additions, 0 deletions

CHANGELOG
annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java 1 addition, 1 deletion

...ewer/annotation/services/annotators/EnsemblAnnotator.java
frontend-js/package.json 2 additions, 1 deletion

frontend-js/package.json
frontend-js/scripts/deploy.js 1 addition, 0 deletions

frontend-js/scripts/deploy.js
frontend-js/src/main/js/BrowserCheck.js 42 additions, 0 deletions

frontend-js/src/main/js/BrowserCheck.js
frontend-js/src/main/js/Functions.js 0 additions, 37 deletions

frontend-js/src/main/js/Functions.js
frontend-js/src/main/js/minerva.js 0 additions, 21 deletions

frontend-js/src/main/js/minerva.js
frontend-js/src/test/js/BrowserCheck-test.js 56 additions, 0 deletions

frontend-js/src/test/js/BrowserCheck-test.js
frontend-js/src/test/js/Functions-test.js 0 additions, 32 deletions

frontend-js/src/test/js/Functions-test.js
web/.gitignore 3 additions, 3 deletions

web/.gitignore
web/src/main/webapp/index.xhtml 2 additions, 0 deletions

web/src/main/webapp/index.xhtml

with 110 additions and 95 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