Merge branch 'merge-13.1.2' into 'master' (273b19f4) · 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

273b19f4

Commit 273b19f4 authored 5 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge branch 'merge-13.1.2' into 'master'

Merge 13.1.2

See merge request !846

parents 8d8768e6 3cf9cbbb

No related branches found

No related tags found

1 merge request!846Merge 13.1.2

Pipeline #11969 passed 5 years ago

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 7 additions, 0 deletions

CHANGELOG
frontend-js/src/main/js/ServerConnector.js 13 additions, 0 deletions

frontend-js/src/main/js/ServerConnector.js
frontend-js/src/main/js/gui/admin/AddProjectDialog.js 7 additions, 2 deletions

frontend-js/src/main/js/gui/admin/AddProjectDialog.js
frontend-js/src/main/js/minerva.js 16 additions, 4 deletions

frontend-js/src/main/js/minerva.js
frontend-js/src/main/js/plugin/Plugin.js 15 additions, 0 deletions

frontend-js/src/main/js/plugin/Plugin.js
frontend-js/src/main/js/plugin/PluginManager.js 26 additions, 0 deletions

frontend-js/src/main/js/plugin/PluginManager.js
frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js 14 additions, 0 deletions

frontend-js/src/test/js/gui/admin/AddProjectDialog-test.js
frontend-js/src/test/js/plugin/PluginManager-test.js 18 additions, 0 deletions

frontend-js/src/test/js/plugin/PluginManager-test.js
frontend-js/testFiles/map/invalid-project.zip 0 additions, 0 deletions

frontend-js/testFiles/map/invalid-project.zip

with 116 additions and 6 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