Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
* master:
  changelog
  changelog for 5.1.13
  add -u nginx:nginx in docker exec commands for import
  changelog for 5.1.12
  changelog
  improve faq 21 CFR Part 11
  • Loading branch information
NicolasCARPi committed Jan 13, 2025
2 parents d9cf409 + 085b7d4 commit 0bd5234
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 5 deletions.
55 changes: 55 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,61 @@
Changelog
=========

Version 5.1.14
--------------

No changes in eLabFTW, this is a re-release with a missing commit in elabimg repository for the new ``USE_PERSISTENT_MYSQL_CONN`` parameter.


Version 5.1.13
--------------

* bug/medium: fix steps not imported from template
* bug/minor: import eln: actually use provided permissions

The user interface to import .eln files allow to set read and write
permissions, but they were not taken into account.
fix #5420
* feat: allow setting persistent mode for PDO. Set ``USE_PERSISTENT_MYSQL_CONN`` to ``false`` as an environment variable to disable persistent connections to MySQL. Currently the MySQL connections are persistent. This change was made to avoid the overhead of establishing a TCP connection for SQL requests, but it can cause resources exhaustion on big instances, and in rare cases some firewalls cause improper severance leading to issues for the PHP workers.




Version 5.1.12
--------------

* bug/medium: eln import: fix issue with resources categories import. fix #5356
* bug/minor: eln import: honor userid setting. fix #5382
* bug/minor: teamgroups: fix issue with comma in username. fix #5406
* bug/minor: templates: fix steps not being duplicated. fix #5404
* bug/minor: extra fields builder: fix number type field missing units (fix #5398)
* bug/minor: extra fields: fix issue with incorrect groups definition. fix #5369
* feat: minor: mask colon (:) for autocomplete searches (PR #5383 by Marcel Bolten) fix #5376
* chore: composer: upgrade league/commonmark. fix vuln https://github.com/elabftw/elabftw/security/dependabot/64
* chore: set min cross-spawn version to 7.0.5. fix for CVE-2024-21538


Version 5.1.11
--------------

* bug/medium: eln import: prevent duplication of resources categories. fix #5349. fix #5285
* bug/medium: eln import: fix status and categories for templates
The bug was that experiments never timestamped would have the condition
always evaluate to false because you can't compare NULL with something like
that. The feature is adding -t option to target specific teams. fix #5319
* bug/medium + feat: cli timestamp: fix and improve sql query
* bug/minor: admin panel: fix newcomer banner message not correctly displayed
* bug/minor: eln: make .eln valid ro-crate
* bug/minor: listing: improve behavior with always show owned parameter
* feat: tinymce image upload code revamp, add image plugin/upload-with-drop to templates (#5353)
* feat: uploads api: allow filtering archived uploads with api. fix #5323
* feat: import eln: display error instead of aborting if file shasum fails
* feat: import eln: display checksums of failed imported files
* feat: eln export: allow restricting users or resources categories when
exporting with export:eln, you can now add -u and -r to include only these
users and these resource categories id.


Version 5.1.10
--------------

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
# The short X.Y version.
version = '5.1'
# The full version, including alpha/beta/rc tags.
release = '5.1.10'
release = '5.1.14'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 4 additions & 4 deletions doc/import-export.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ If you wish to import a rather large `.eln` archive (such as a full team export)

.. code-block:: bash
docker exec -it elabftw bin/console import:eln -h
docker exec -it -u nginx:nginx elabftw bin/console import:eln -h
As you can see, there are two mandatory arguments, the path to the file, and the Team ID where the import will be performed. The first thing to do is to copy the file in the right place in the container. It must be in `/elabftw/exports` folder. Copy it with a command similar to this:

Expand All @@ -69,11 +69,11 @@ Figure out the Team ID by looking at the Team from the Sysconfig panel, where th
.. code-block:: bash
# import in team 12 and be verbose
docker exec -it elabftw bin/console import:eln -vv your.eln 12
docker exec -it -u nginx:nginx elabftw bin/console import:eln -vv your.eln 12
# import in team 25, force everything to be owned by user 5 and be extra verbose
docker exec -it elabftw bin/console import:eln -vvv your.eln 25 --userid 5
docker exec -it -u nginx:nginx elabftw bin/console import:eln -vvv your.eln 25 --userid 5
# import in team 42, force everything to be of type "Resources" with category "6"
docker exec -it elabftw bin/console import:eln --type items --category 6 your.eln 42
docker exec -it -u nginx:nginx elabftw bin/console import:eln --type items --category 6 your.eln 42
By default (if no ``--userid`` setting is provided), the ownership of the items will be
determined by comparing the email addresses of users between the export and import
Expand Down

0 comments on commit 0bd5234

Please sign in to comment.