From 02dfcf09be2d323152890b1166f2e83f685d8dae Mon Sep 17 00:00:00 2001 From: yemkareems Date: Mon, 13 Oct 2025 12:11:26 +0530 Subject: [PATCH 01/29] fix: add note about change in behaviour of the job --- .../configuration_files/file_versioning.rst | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/admin_manual/configuration_files/file_versioning.rst b/admin_manual/configuration_files/file_versioning.rst index 273075a2a..c1d35de9e 100644 --- a/admin_manual/configuration_files/file_versioning.rst +++ b/admin_manual/configuration_files/file_versioning.rst @@ -54,4 +54,22 @@ Deactivate background job: ``occ config:app:set --value=no files_versions backgr Activate background job: ``occ config:app:delete files_versions background_job_expire_versions`` -Expire versions: ``occ versions:expire`` or ``occ versions:expire --quiet`` (without the progress bar) \ No newline at end of file +Expire versions: ``occ versions:expire`` or ``occ versions:expire --quiet`` (without the progress bar) + +.. note:: + +*Deviations in behavior: “job run” vs “auto-expiry”* + +The ``versions_retention_obligation`` setting behaves slightly differently +depending on whether version expiration is triggered by an *explicit job run* +(for example, via ``occ versions:expire`` or a scheduled background job) or by +*automatic expiry*. + +Explicit job-based expiration is *strict* and adheres closely to the configured +``versions_retention_obligation``. + +Auto-expiry follows the same retention principles but may apply them more flexibly, allowing minor deviations when +necessary to maintain adequate free storage space. + +This distinction can lead to different results depending on whether cleanup is +performed automatically or manually. \ No newline at end of file From 4917b8bbd0cd296f6678b5ed2f58b67bd67099af Mon Sep 17 00:00:00 2001 From: yemkareems Date: Thu, 23 Oct 2025 14:18:47 +0530 Subject: [PATCH 02/29] fix: added the paragraph above note --- .../configuration_files/file_versioning.rst | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/admin_manual/configuration_files/file_versioning.rst b/admin_manual/configuration_files/file_versioning.rst index c1d35de9e..72d947253 100644 --- a/admin_manual/configuration_files/file_versioning.rst +++ b/admin_manual/configuration_files/file_versioning.rst @@ -21,6 +21,20 @@ The Versions app never uses more than 50% of the user's currently available free space. If the stored versions exceed this limit, Nextcloud deletes the oldest file versions until it meets the disk space limit again. +The ``versions_retention_obligation`` setting behaves slightly differently +depending on whether version expiration is triggered by an *explicit job run* +(for example, via ``occ versions:expire`` or a scheduled background job) or by +*automatic expiry*. + +Explicit job-based expiration is *strict* and adheres closely to the configured +``versions_retention_obligation``. + +Auto-expiry follows the same retention principles but may apply them more flexibly, allowing minor deviations when +necessary to maintain adequate free storage space. + +This distinction can lead to different results depending on whether cleanup is +performed automatically or manually. + .. note:: Versions named by a user will never be deleted. You may alter the default pattern in ``config.php``. The default setting is @@ -30,12 +44,12 @@ You may alter the default pattern in ``config.php``. The default setting is Additional options are: -* ``D, auto`` - Keep versions at least for D days, apply expiration rules to all versions +* ``D, auto`` + Keep versions at least for D days, apply expiration rules to all versions that are older than D days -* ``auto, D`` - Delete all versions that are older than D days automatically, delete other +* ``auto, D`` + Delete all versions that are older than D days automatically, delete other versions according to expiration rules * ``D1, D2`` @@ -54,22 +68,4 @@ Deactivate background job: ``occ config:app:set --value=no files_versions backgr Activate background job: ``occ config:app:delete files_versions background_job_expire_versions`` -Expire versions: ``occ versions:expire`` or ``occ versions:expire --quiet`` (without the progress bar) - -.. note:: - -*Deviations in behavior: “job run” vs “auto-expiry”* - -The ``versions_retention_obligation`` setting behaves slightly differently -depending on whether version expiration is triggered by an *explicit job run* -(for example, via ``occ versions:expire`` or a scheduled background job) or by -*automatic expiry*. - -Explicit job-based expiration is *strict* and adheres closely to the configured -``versions_retention_obligation``. - -Auto-expiry follows the same retention principles but may apply them more flexibly, allowing minor deviations when -necessary to maintain adequate free storage space. - -This distinction can lead to different results depending on whether cleanup is -performed automatically or manually. \ No newline at end of file +Expire versions: ``occ versions:expire`` or ``occ versions:expire --quiet`` (without the progress bar) \ No newline at end of file From a58f16232eb403d0448cce7fcd21b7319ff989de Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 29 Oct 2025 08:59:45 +0100 Subject: [PATCH 03/29] fix(footer): Adjust footer Signed-off-by: Joas Schilling --- index.html | 118 ++++++++++++++++++++++-------------------- static/css/styles.css | 72 +++++++++++++++++--------- static/img/logo.svg | 108 +------------------------------------- 3 files changed, 110 insertions(+), 188 deletions(-) diff --git a/index.html b/index.html index d6e21a28c..39b676fd9 100644 --- a/index.html +++ b/index.html @@ -38,7 +38,7 @@ - + @@ -483,69 +483,75 @@