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

Gitlab will go in to maintenance on Friday 5:30pm since SIU is doing Isilon maintenance and we use isilon shares on the Gitlab

You are on a read-only GitLab instance.

af01620c

Commit af01620c authored 6 years ago by Piotr Gawron

Downloads
- Plain Diff

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

parents d84dff3b 5c8ed669

No related branches found

No related tags found

1 merge request!39112.0.4 into master

Pipeline #6358 passed 6 years ago

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 13 additions, 2 deletions

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

...a/lcsb/mapviewer/annotation/services/TaxonomyBackend.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/TairAnnotator.java 1 addition, 1 deletion

...pviewer/annotation/services/annotators/TairAnnotator.java
frontend-js/src/main/js/gui/admin/UsersAdminPanel.js 5 additions, 1 deletion

frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
persist/src/db/12.0.4/fix_db_20180830.sql 1 addition, 0 deletions

persist/src/db/12.0.4/fix_db_20180830.sql
rest-api/src/main/java/lcsb/mapviewer/api/BaseController.java 2 additions, 0 deletions

...-api/src/main/java/lcsb/mapviewer/api/BaseController.java
rest-api/src/main/java/lcsb/mapviewer/api/OperationNotAllowedException.java 39 additions, 0 deletions

...java/lcsb/mapviewer/api/OperationNotAllowedException.java
rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java 2 additions, 1 deletion

...ain/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java
rest-api/src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java 5 additions, 1 deletion

.../src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java

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