Merge pull request #4692 from touhidurabir/i10960_patch_main

pkp/pkp-lib#10960 Submodule Update ##touhidurabir/i10960_patch_main##
pkp · Feb 26, 2025 · 2a223b5 · 2a223b5
2 parents a5ff04c + 0f621dc
commit 2a223b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cypress.config.js b/cypress.config.js
@@ -29,6 +29,7 @@ module.exports = defineConfig({
   },
   watchForFileChanges: false,
   defaultCommandTimeout: 10000,
+  pageLoadTimeout: 120000,
   video: false,
   numTestsKeptInMemory: 0,
   e2e: {

diff --git a/lib/pkp b/lib/pkp
+2 −2		api/v1/_submissions/PKPBackendSubmissionsController.php
+51 −2		classes/submission/Collector.php
+22 −22		classes/submission/DashboardView.php
+19 −6		classes/submission/Repository.php
+1 −1		cypress/support/commands.js
+5 −2		locale/en/submission.po
+6 −3		plugins/importexport/users/filter/PKPUserUserXmlFilter.php
+43 −23		plugins/importexport/users/filter/UserXmlPKPUserFilter.php