Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

openbis
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

8a6df71f

Commit 8a6df71f authored 6 years ago by felmer

Downloads
- Plain Diff

Merge branch 'master' of sissource.ethz.ch:sispub/openbis

parents 2c530304 aa550896

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js 2 additions, 2 deletions

...ims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js 12 additions, 1 deletion

.../eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js 55 additions, 12 deletions

...as/webapps/eln-lims/html/js/controllers/MainController.js
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js 2 additions, 2 deletions

...webapps/eln-lims/html/js/views/Inventory/InventoryView.js
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormController.js 1 addition, 1 deletion

...lims/html/js/views/SettingsForm/SettingsFormController.js
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SettingsForm/SettingsFormView.js 2 additions, 2 deletions

...s/eln-lims/html/js/views/SettingsForm/SettingsFormView.js

with 74 additions and 20 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