Merge branch 'release/v22.2.4'

uwcirg · Feb 4, 2022 · 87997ca · 87997ca
2 parents 6d7e2fa + 64d0489
commit 87997ca
Show file tree

Hide file tree

Showing 13 changed files with 5,528 additions and 3,811 deletions.
diff --git a/portal/config/eproms/Organization.json b/portal/config/eproms/Organization.json
@@ -2097,8 +2097,9 @@
         },
         {
           "research_protocols": [
-			{"name": "IRONMAN v3", "retired_as_of": "2020-08-14T06:00:00Z"},
-			{"name": "IRONMAN v5"}
+            {"name": "IRONMAN v3", "retired_as_of": "2020-08-14T06:00:00Z"},
+            {"name": "IRONMAN v5"},
+            {"name": "EMPRO v1"}
           ],
           "url": "http://us.truenth.org/identity-codes/research-protocol"
         }

diff --git a/portal/development_gulpfile.js b/portal/development_gulpfile.js
@@ -69,7 +69,7 @@ function replaceStd(fileName) {
         from: "../../$stdin",
         to: "",
     }).then(changes => {
-        console.log("Modified files: ", changes.join(", "));
+        console.log("Modified files: ", (changes.map(result=>result.file)).join(", "));
     }).catch(error => {
         console.log("Error occurred: ", error);
     });
@@ -290,6 +290,6 @@ const watchPsaTrackerLess = () => {
 exports.watchPsaTrackerLess = series(watchPsaTrackerLess);
 
 /*
- * compile all portal less files 
+ * compile all portal less files
  */
 exports.lessAll = series(parallel(epromsLess, portalLess, topnavLess, portalFooterLess, gilLess, psaTrackerLess, orgTreeViewLess, exerciseDietLess));