Skip to content

Merge 28 to main#10441

Merged
driusan merged 17 commits intoaces:mainfrom
driusan:Merge28ToMain
Apr 8, 2026
Merged

Merge 28 to main#10441
driusan merged 17 commits intoaces:mainfrom
driusan:Merge28ToMain

Conversation

@driusan
Copy link
Copy Markdown
Collaborator

@driusan driusan commented Apr 8, 2026

Push changes from the 28.0.1 release into the main loris branch.

cmadjar and others added 15 commits March 26, 2026 14:10
* remove buildWhere with the SQL injection

* remove buildWhere with the SQL injection
to escape the configured path.

Also wrap error message in htmlspecialchars.

Co-authored-by: Dave MacFarlane <dave.macfarlane@mcin.ca>
Co-authored-by: Dave MacFarlane <dave.macfarlane@mcin.ca>
The webpack config is incorrectly only copying one (production or dev)
version of react to htdocs. This causes the login page to stop loading
based on the sandbox flag, which may be trying to load one or the other.

The decision to copy or not in webpack is based on a NODE_ENV
environment variable which is not used or documented anywhere in LORIS,
and LORIS may dynamically choose one or the other based on the
configuration variable which can be changed without recompiling.

Go back to copying both so that LORIS will load regardless of the
sandbox flag.

Fixes aces#10425
Fixes aces#10400
* [security- document_repository] Adds BackEnd per site validation to match FrontEnd.

* Keeps 27 and 28 release compatibility.

---------

Co-authored-by: lorisadmin <rolando.acosta@mcin.ca>
* Fix help content output

* Set content-type: json to ajax help response

* Remove extra line

* Add file_exists check
* [security - publication] Takes loris URL from server side, not from the form POST.

* Takes out the reference to the direct link from templates.

---------

Co-authored-by: lorisadmin <rolando.acosta@mcin.ca>
* [media] Permissions fix

* Revert "Delete modules/media directory"

This reverts commit c009e9f8275db6f2777a8d3937d58e2d65e8b6f6.
* [media] Fix permissions on load

* Remove ability to see all files from FileUpload

* Fix download permission check and edit

* CandID conversion
Co-authored-by: Dave MacFarlane <dave.macfarlane@mcin.ca>
* login redirect fix

* url redirect - string and trim
@github-actions github-actions bot added Language: PHP PR or issue that update PHP code Language: Javascript PR or issue that update Javascript code Module: document_repository PR or issue related to documen_repository module Module: electrophysiology_uploader PR or issue related to electrophysiology_uploader Module: help_editor PR or issue related to help_editor module Module: login PR or issue related to login module Module: media PR or issue related to media module Module: publication PR or issue related to the publication module Module: survey_accounts PR or issue related to the survey_accounts module Multilingual Any tasks related to making LORIS multilingual labels Apr 8, 2026
Dave MacFarlane added 2 commits April 8, 2026 14:10
@driusan driusan merged commit a82b6fe into aces:main Apr 8, 2026
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Language: Javascript PR or issue that update Javascript code Language: PHP PR or issue that update PHP code Module: document_repository PR or issue related to documen_repository module Module: electrophysiology_uploader PR or issue related to electrophysiology_uploader Module: help_editor PR or issue related to help_editor module Module: login PR or issue related to login module Module: media PR or issue related to media module Module: publication PR or issue related to the publication module Module: survey_accounts PR or issue related to the survey_accounts module Multilingual Any tasks related to making LORIS multilingual

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants