Merge branch 'main' into 2021_09_22_Consent_module

.eslintrc.json

@@ -47,6 +47,7 @@
         "tabWidth": 2,
         "ignoreComments": true
     }],
+    "indent": ["error", 2],
     "no-unexpected-multiline": "off",
     "no-unused-vars": "error",
     "no-useless-escape": "off",

.github/workflows/loristest.yml

@@ -11,7 +11,7 @@ jobs:
       EEG_VIS_ENABLED: 'true'
     runs-on: ubuntu-latest
     steps: 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install EEG package dependencies
       # We only need to install protobuf-compiler
@@ -36,13 +36,13 @@ jobs:
       - name: Create node_modules tarball
         run: tar cfvz node_modules.tar.gz node_modules
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload node_modules artifact
         with:
           name: node_modules
           path: node_modules.tar.gz
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload lorisjs.tar.gz artifact
         with:
           name: lorisjs
@@ -52,9 +52,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.3']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -83,7 +83,7 @@ jobs:
       - name: Create vendor tarball
         run: tar cfvz vendor-php${{matrix.php}}.tar.gz vendor
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         name: Upload vendor-php${{matrix.php}}.tar.gz artifact
         with:
           name: vendor-php${{matrix.php}}
@@ -104,33 +104,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.3']
         apiversion: ['v0.0.3', 'v0.0.4-dev']
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/download-artifact@v3
-      name: Download node_modules artifact
+    # Cache node_modules to avoid downloading dependencies if already cached
+    - name: Cache node_modules
+      uses: actions/cache@v3
       with:
-        name: node_modules
-        path: .
-
-    - uses: actions/download-artifact@v3
-      name: Download compiled LORIS javascript artifact
+        path: node_modules
+        key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    # Download and extract compiled LORIS JavaScript artifact (from build job)
+    - name: Download compiled LORIS javascript artifact
+      uses: actions/download-artifact@v4
       with:
         name: lorisjs
         path: .
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       name: Download PHP dependencies artifact
       with:
         name: vendor-php${{matrix.php}}
         path: .
 
 
-    - name: Extract node_modules
-      run: tar xfvz node_modules.tar.gz
-
     - name: Extract compiled JS
       run: tar xfvz lorisjs.tar.gz
 
@@ -209,28 +210,20 @@ jobs:
         fail-fast: false
         matrix:
             testsuite: ['integration']
-            php: ['8.1','8.2', '8.3']
+            php: ['8.3']
             ci_node_index: [0,1,2,3]
 
             include:
             # add a variable but do not display it in the job's name
             - ci_node_total: 4
 
-            - testsuite: 'static'
-              php: '8.1'
-            - testsuite: 'static'
-              php: '8.2'
             - testsuite: 'static'
               php: '8.3'
-            - testsuite: 'unit'
-              php: '8.1'
-            - testsuite: 'unit'
-              php: '8.2'
             - testsuite: 'unit'
               php: '8.3'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -8,7 +8,7 @@ core section.***
 - ***When possible please provide the number of the pull request(s) containing the 
 changes in the following format: PR #1234***
 
-## LORIS 26.0 (Release Date: ????-??-??)
+## LORIS 26.0 (Release Date: 2024-06-13)
 ### Core
 #### Features
 - Add OpenID Connect authorization support to LORIS (PR #8255)
@@ -26,7 +26,7 @@ changes in the following format: PR #1234***
 - While proposing a project or editing a project in publications module, prevent indefinite "File to upload" fields from being added if files are browsed then cancelled (PR #9179)
 - Conflict resolver fixed when Test_name is not equal to table name. This is done be replacing the "TableName" variable with "TestName" everywhere in resolved & unresolved conflicts tables as well as modules (PR #9270)
 
-## LORIS 25.0 (Release Date: ????-??-??)
+## LORIS 25.0 (Release Date: 2023-07-17)
 ### Core
 #### Features
 - Added new interface intended to be used for querying module data from PHP (PR #8215) 
@@ -54,6 +54,7 @@ changes in the following format: PR #1234***
   - a default project (default_project) used if createVisit or createCandidate is set to true, or for phantom scans
   - a default cohort (default_cohort) used if createVisit is set to true (PR #8384)
 - Help and help editor reactification (PR #8309)
+- In document repository: Add Upload / edit permission, add "Edit Categories" tab, create category permission (PR #7103)
 
 #### Bug Fixes
 - Fix a Fatal error on the Genomic Browser tabs (PR #8468)

README.md

@@ -10,7 +10,7 @@ LORIS (Longitudinal Online Research and Imaging System) is a self-hosted web app
 
 * Try the LORIS demo instance at https://demo.loris.ca.
 
-This Readme covers installation of LORIS version <b>25.0</b> on <b>Ubuntu</b>.
+This Readme covers installation of LORIS version <b>26.0</b> on <b>Ubuntu</b>.
 
 ([CentOS Readme also available](docs/wiki/00_SERVER_INSTALL_AND_CONFIGURATION/01_LORIS_Install/CentOS/README.md)).