Merge branch 'master' into battery_manager_2018_10_16

aces · Feb 4, 2020 · f6849b8 · f6849b8
2 parents 0e8b1c9 + d4dafd1
commit f6849b8
Show file tree

Hide file tree

Showing 73 changed files with 1,646 additions and 481 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ changes in the following format: PR #1234***
 
 #### Core
 - Menus are now maintained by modules and no longer in the SQL database (PR #5839)
+- Very old instrument relying on QuickForm may have issues due to code changes (PR #4928)
 
 #### Modules 
 ##### module1
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,16 @@
+LORIS is primarily developed at [McGill University](https://www.mcgill.ca/) within the [McGill Centre For Integrative Neuroscience](http://mcin.ca/). As such, we are governed by the McGill Faculty of Medicine's [code of conduct](https://www.mcgill.ca/medicine/about/our-vision-mission-values/code-conduct).
+
+The LORIS project also pushes certain philosophies such as:
+
+1) An environment of inclusion
+
+2) A respectful manner of discourse and disagreement
+
+3) A strong commitment to timely resolution of issues
+
+4) An open and free environment to voice opinions and suggestions
+
+5) Having the goal of transparency and clarity
+
+As open source software we encourage contributions from other sources, and as such we need to allow for heterogeneous ideas. When interacting within the LORIS community keep in mind that we are a diverse community incorporating people of many different backgrounds, and it is expected that everyone be treated with respect.
+
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 <img src="./htdocs/images/LORIS_logo.svg" width="35%">
 
-[![Build Status](https://travis-ci.org/aces/Loris.svg?branch=master)](https://travis-ci.org/aces/Loris) [![Documentation Status](https://readthedocs.org/projects/acesloris/badge/?version=latest)](https://acesloris.readthedocs.io/en/latest/?badge=latest)
+[![Build Status](https://travis-ci.org/aces/Loris.svg?branch=master)](https://travis-ci.org/aces/Loris) 
+[![Minimum PHP Version](https://img.shields.io/travis/php-v/aces/loris/master?color=787CB5)](https://php.net/)
 
 # LORIS Neuroimaging Platform
 

diff --git a/SQL/0000-00-01-Permission.sql b/SQL/0000-00-01-Permission.sql
@@ -101,7 +101,8 @@ INSERT INTO `permissions` VALUES
     (53,'instrument_manager_write', 'Instrument Manager: Install new instruments via file upload', 2),
     (54,'publication_view', 'Publication - Access to module', 2),
     (55,'publication_propose', 'Publication - Propose a project', 2),
-    (56,'publication_approve', 'Publication - Approve or reject proposed publication projects', 2);
+    (56,'publication_approve', 'Publication - Approve or reject proposed publication projects', 2),
+    (57, 'candidate_dob_edit', 'Edit dates of birth', 2);
 
 
 INSERT INTO `user_perm_rel` (userID, permID)

diff --git a/SQL/New_patches/2019_07_02_Add_Edit_DoB_Permissions.sql b/SQL/New_patches/2019_07_02_Add_Edit_DoB_Permissions.sql
@@ -0,0 +1,5 @@
+INSERT INTO permissions (code, description, categoryID) VALUES
+    ("candidate_dob_edit","Edit dates of birth",2);
+
+INSERT INTO user_perm_rel VALUES
+    (1, (SELECT permID FROM permissions WHERE code='candidate_dob_edit'));
diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
         "phpunit/phpunit" : "7.0.0",
         "facebook/webdriver" : "dev-master",
         "phan/phan": ">=2.3.0",
-        "phpmd/phpmd": "~2.8"
+        "phpmd/phpmd": "~2.8",
+        "phpstan/phpstan": "^0.12"
     },
     "scripts": {
       "pre-install-cmd": "mkdir -p project/libraries"