Merge branch 'feature/samples' into develop

fikipollo · Oct 31, 2017 · 3c825e4 · 3c825e4
2 parents af2253a + 6083415
commit 3c825e4
Show file tree

Hide file tree

Showing 39 changed files with 1,577 additions and 78,418 deletions.
diff --git a/dist/stategraems.war b/dist/stategraems.war
diff --git a/src/java/bdManager/DAO/samples/BioCondition_JDBCDAO.java b/src/java/bdManager/DAO/samples/BioCondition_JDBCDAO.java
diff --git a/src/java/classes/Experiment.java b/src/java/classes/Experiment.java
diff --git a/src/java/classes/samples/BioCondition.java b/src/java/classes/samples/BioCondition.java
diff --git a/src/java/resources/extensions/owncloud4j.jar b/src/java/resources/extensions/owncloud4j.jar
diff --git a/src/java/resources/extensions/owncloud_server.jar b/src/java/resources/extensions/owncloud_server.jar
diff --git a/src/java/servlets/File_servlets.java b/src/java/servlets/File_servlets.java
diff --git a/src/java/servlets/Samples_servlets.java b/src/java/servlets/Samples_servlets.java
diff --git a/src/java/sql_scripts/extensions/external_sources/baobab_lims.json b/src/java/sql_scripts/extensions/external_sources/baobab_lims.json
diff --git a/src/java/sql_scripts/extensions/external_sources/openspecimen.json b/src/java/sql_scripts/extensions/external_sources/openspecimen.json
diff --git a/src/java/sql_scripts/update_scripts/0.9.sql b/src/java/sql_scripts/update_scripts/0.9.sql
diff --git a/stategraems_extensions/owncloud_server/jackrabbit.log_IS_UNDEFINED b/stategraems_extensions/owncloud_server/jackrabbit.log_IS_UNDEFINED
diff --git a/stategraems_extensions/owncloud_server/src/owncloud4j.jar b/stategraems_extensions/owncloud_server/src/owncloud4j.jar
diff --git a/stategraems_extensions/owncloud_server/src/owncloud_server.java b/stategraems_extensions/owncloud_server/src/owncloud_server.java
diff --git a/stategraems_extensions/owncloud_server/test/Tests.java b/stategraems_extensions/owncloud_server/test/Tests.java
diff --git a/stategraems_extensions/owncloud_server/test/Tests2.java b/stategraems_extensions/owncloud_server/test/Tests2.java
diff --git a/web/app/analysis/analysis-form.tpl.html b/web/app/analysis/analysis-form.tpl.html
diff --git a/web/app/analysis/externalsource-form.tpl.html b/web/app/analysis/externalsource-form.tpl.html
diff --git a/web/app/analysis/intermediatedata-form.tpl.html b/web/app/analysis/intermediatedata-form.tpl.html
diff --git a/web/app/analysis/processeddata-form.tpl.html b/web/app/analysis/processeddata-form.tpl.html
diff --git a/web/app/analysis/rawdata-form.tpl.html b/web/app/analysis/rawdata-form.tpl.html
diff --git a/web/app/analysis/send-step-dialog.tpl.html b/web/app/analysis/send-step-dialog.tpl.html
diff --git a/web/app/app.js b/web/app/app.js
diff --git a/web/app/experiments/experiment-form.tpl.html b/web/app/experiments/experiment-form.tpl.html
diff --git a/web/app/files/credentials-input.tpl.html b/web/app/files/credentials-input.tpl.html
diff --git a/web/app/files/directories-browser-dialog.tpl.html b/web/app/files/directories-browser-dialog.tpl.html
diff --git a/web/app/files/file-controller.js b/web/app/files/file-controller.js
diff --git a/web/app/files/file-list-dir.js b/web/app/files/file-list-dir.js
diff --git a/web/app/files/file-upload.tpl.html b/web/app/files/file-upload.tpl.html
diff --git a/web/app/samples/biocondition-form.tpl.html b/web/app/samples/biocondition-form.tpl.html
diff --git a/web/app/samples/external-sample-details-form.tpl.html b/web/app/samples/external-sample-details-form.tpl.html
diff --git a/...app/samples/external-sample-form.tpl.html → .../samples/external-sample-form.tpl_ol.html b/...app/samples/external-sample-form.tpl.html → .../samples/external-sample-form.tpl_ol.html
diff --git a/web/app/samples/external-sample-register-form.tpl.html b/web/app/samples/external-sample-register-form.tpl.html
diff --git a/web/app/samples/sample-controller.js b/web/app/samples/sample-controller.js
diff --git a/web/app/samples/sample-dir.js b/web/app/samples/sample-dir.js
diff --git a/web/app/samples/sample-list.tpl.html b/web/app/samples/sample-list.tpl.html
diff --git a/web/app/users/credentials-input-dialog.tpl.html b/web/app/users/credentials-input-dialog.tpl.html
diff --git a/web/data/help/helpTips.js b/web/data/help/helpTips.js
diff --git a/web/data/templates/experiment-form.json b/web/data/templates/experiment-form.json