Skip to content

Commit 3780487

Browse files
authored
Merge branch 'master' into tflidd-patch-1
2 parents 66356e3 + 9278fa5 commit 3780487

File tree

19 files changed

+407
-217
lines changed

19 files changed

+407
-217
lines changed

.codespellignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
SME
2-
te
1+
hasTable
32
jus
43
nin
4+
SME
5+
te

admin_manual/ai/app_context_chat.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Installation
5050
------------
5151

5252
1. Make sure the :ref:`Nextcloud Assistant app<ai-app-assistant>` is installed
53-
2. Setup a :ref:`Deploy Demon <ai-app_api>` in AppAPI Admin settings
53+
2. Setup a :ref:`Deploy Daemon <ai-app_api>` in AppAPI Admin settings. HaRP is not supported yet, please use Docker Socket Proxy (DSP).
5454
3. Install the *context_chat_backend* ExApp via the "Apps" page in Nextcloud, or by executing (checkout the readme at https://github.com/nextcloud/context_chat_backend for manual install steps)
5555

5656
.. code-block::

admin_manual/ai/app_live_transcription.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Installation
1313
------------
1414

1515
1. Make sure the `Nextcloud Talk app <https://apps.nextcloud.com/apps/spreed>`_ is installed.
16-
2. Make sure the High-Performance Backend is installed and configured in Nextcloud Talk settings. See the `Nextcloud Talk install manual <https://nextcloud-talk.readthedocs.io/en/latest/quick-install/>`_ for more information.
17-
3. Setup a :ref:`Deploy Demon <ai-app_api>` in AppAPI Admin settings.
16+
2. Make sure the High-Performance Backend (latest or released after September 2025) is installed and configured in Nextcloud Talk settings. See the `Nextcloud Talk install manual <https://nextcloud-talk.readthedocs.io/en/latest/quick-install/>`_ for more information.
17+
3. Setup a :ref:`Deploy Daemon <ai-app_api>` in AppAPI Admin settings.
1818
4. Install the **live_transcription** app via the "Apps" page in Nextcloud, or by executing
1919

2020
.. code-block::

admin_manual/configuration_files/file_versioning.rst

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,20 @@ The Versions app never uses more than 50% of the user's currently available
2121
free space. If the stored versions exceed this limit, Nextcloud deletes the
2222
oldest file versions until it meets the disk space limit again.
2323

24+
Nextcloud manages file versions using a combination of on-save pruning and scheduled cleanup. This ensures that versions are retained while respecting storage quotas.
25+
26+
During Version Creation
27+
-----------------------
28+
29+
Nextcloud automatically creates new file versions whenever a file is modified, allowing users to restore previous states when needed. After each new version is stored, the system automatically checks storage limits and retention rules. Versions are filtered according to the above pattern to keep representative versions and remove redundant ones. If the user’s quota is exceeded, auto-expiry is triggered.
30+
When storage space runs low, Nextcloud sorts all versions from oldest to newest and removes the oldest ones first, while always preserving at least the two most recent versions to free up space.
31+
32+
During the Regular Background Job
33+
---------------------------------
34+
35+
Nextcloud runs a background cleanup task that automatically removes old file versions for each user. During this process, the system checks the user's version storage folder and identifies versions that are older than the configured maximum retention period or whose original files no longer exist.
36+
When an outdated or orphaned version is found, it is safely deleted from both the filesystem and the version database to reclaim storage space and maintain consistency.
37+
2438
.. note:: Versions named by a user will never be deleted.
2539

2640
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
3044

3145
Additional options are:
3246

33-
* ``D, auto``
34-
Keep versions at least for D days, apply expiration rules to all versions
47+
* ``D, auto``
48+
Keep versions at least for D days, apply expiration rules to all versions
3549
that are older than D days
3650

37-
* ``auto, D``
38-
Delete all versions that are older than D days automatically, delete other
51+
* ``auto, D``
52+
Delete all versions that are older than D days automatically, delete other
3953
versions according to expiration rules
4054

4155
* ``D1, D2``

admin_manual/configuration_server/config_sample_php_parameters.rst

Lines changed: 69 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,26 @@ automatically by the installer. This example is for documentation only,
228228
and you should never use it because it will not work. A valid ``instanceid``
229229
is created when you install Nextcloud.
230230

231+
serverid
232+
^^^^^^^^
233+
234+
235+
::
236+
237+
'serverid' => -1,
238+
239+
This is a unique identifier for your server.
240+
241+
It is useful when your Nextcloud instance is using different PHP servers.
242+
Once it's set it shouldn't be changed.
243+
244+
Value must be an integer, comprised between 0 and 1023.
245+
246+
When config.php is shared between different servers, this value should be overriden with "NC_serverid=<int>" on each server.
247+
Note that it must be overriden for CLI and for your webserver.
248+
249+
Example for CLI: NC_serverid=42 occ config:list system
250+
231251
passwordsalt
232252
^^^^^^^^^^^^
233253

@@ -884,6 +904,35 @@ Whether the rate limit protection shipped with Nextcloud should be enabled or no
884904

885905
Defaults to ``true``
886906

907+
ratelimit_overwrite
908+
^^^^^^^^^^^^^^^^^^^
909+
910+
911+
::
912+
913+
'ratelimit_overwrite' => [
914+
'profile.profilepage.index' => [
915+
'user' => ['limit' => 300, 'period' => 3600],
916+
'anon' => ['limit' => 1, 'period' => 300],
917+
]
918+
],
919+
920+
Overwrite the individual rate limit for a specific route
921+
922+
From time to time it can be necessary to extend the rate limit of a specific route,
923+
depending on your usage pattern or when you script some actions.
924+
Instead of completely disabling the rate limit or excluding an IP address from the
925+
rate limit, the following config allows to overwrite the rate limit duration and period.
926+
927+
The first level key is the name of the route. You can find the route name from a URL
928+
using the ``occ router:list`` command of your server.
929+
930+
You can also specify different limits for logged-in users with the ``user`` key
931+
and not-logged-in users with the ``anon`` key. However, if there is no specific ``user`` limit,
932+
the ``anon`` limit is also applied for logged-in users.
933+
934+
Defaults to empty array ``[]``
935+
887936
security.ipv6_normalized_subnet_size
888937
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
889938

@@ -2405,15 +2454,16 @@ enabledPreviewProviders
24052454
::
24062455

24072456
'enabledPreviewProviders' => [
2408-
'OC\Preview\BMP',
2409-
'OC\Preview\GIF',
2457+
'OC\Preview\PNG',
24102458
'OC\Preview\JPEG',
2459+
'OC\Preview\GIF',
2460+
'OC\Preview\BMP',
2461+
'OC\Preview\XBitmap',
24112462
'OC\Preview\Krita',
2463+
'OC\Preview\WebP',
24122464
'OC\Preview\MarkDown',
2413-
'OC\Preview\OpenDocument',
2414-
'OC\Preview\PNG',
24152465
'OC\Preview\TXT',
2416-
'OC\Preview\XBitmap',
2466+
'OC\Preview\OpenDocument',
24172467
],
24182468

24192469
Only register providers that have been explicitly enabled
@@ -2425,29 +2475,36 @@ concerns:
24252475
- ``OC\Preview\Font``
24262476
- ``OC\Preview\HEIC``
24272477
- ``OC\Preview\Illustrator``
2478+
- ``OC\Preview\Movie``
24282479
- ``OC\Preview\MP3``
24292480
- ``OC\Preview\MSOffice2003``
24302481
- ``OC\Preview\MSOffice2007``
24312482
- ``OC\Preview\MSOfficeDoc``
2432-
- ``OC\Preview\Movie``
24332483
- ``OC\Preview\PDF``
24342484
- ``OC\Preview\Photoshop``
24352485
- ``OC\Preview\Postscript``
2436-
- ``OC\Preview\SVG``
2486+
- ``OC\Preview\SGI``
24372487
- ``OC\Preview\StarOffice``
2488+
- ``OC\Preview\SVG``
2489+
- ``OC\Preview\TGA``
24382490
- ``OC\Preview\TIFF``
24392491

2492+
The following providers are disabled by default, because they provide an alternative to the built-in providers:
2493+
- ``OC\Preview\Imaginary``
2494+
- ``OC\Preview\ImaginaryPDF``
2495+
24402496
Defaults to the following providers:
24412497

2442-
- ``OC\Preview\BMP``
2443-
- ``OC\Preview\GIF``
2498+
- ``OC\Preview\PNG``
24442499
- ``OC\Preview\JPEG``
2500+
- ``OC\Preview\GIF``
2501+
- ``OC\Preview\BMP``
2502+
- ``OC\Preview\XBitmap``
24452503
- ``OC\Preview\Krita``
2504+
- ``OC\Preview\WebP``
24462505
- ``OC\Preview\MarkDown``
2447-
- ``OC\Preview\OpenDocument``
2448-
- ``OC\Preview\PNG``
24492506
- ``OC\Preview\TXT``
2450-
- ``OC\Preview\XBitmap``
2507+
- ``OC\Preview\OpenDocument``
24512508

24522509
metadata_max_filesize
24532510
^^^^^^^^^^^^^^^^^^^^^

admin_manual/groupware/calendar.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Run the following command to disable creating new federated calendar shares for
149149

150150
sudo -E -u www-data php occ config:app:set dav enableCalendarFederation --type=bool --value=false
151151

152-
Note that existing shares will not be deleted when the feature is disabled.
152+
Note that existing shares will be deleted when the feature is disabled as they will fail to sync.
153153

154154
Trash bin
155155
---------

admin_manual/installation/system_requirements.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ For best performance, stability and functionality we have documented some recomm
4040

4141
See :doc:`source_installation` for minimum PHP-modules and additional software for installing Nextcloud.
4242

43+
To ensure the full functionality of your Nextcloud, please make sure that the server can reach the :ref:`required remote systems<connections_to_remote_servers>`.
44+
4345
CPU Architecture and OS
4446
^^^^^^^^^^^^^^^^^^^^^^^
4547
A 64-bit CPU, OS and PHP is required for Nextcloud to run well.

admin_manual/occ_command.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ occ command Directory
4646
* :ref:`system_tags_commands_label`
4747
* :ref:`antivirus_commands_label`
4848
* :ref:`setupchecks_commands_label`
49+
* :ref:`snowflakes_commands_label`
4950
* :ref:`share_operations_label`
5051
* `Debugging`_
5152

@@ -2273,6 +2274,28 @@ Example output::
22732274
✓ Internet connectivity
22742275
...
22752276

2277+
.. _snowflakes_commands_label:
2278+
2279+
Snowflake IDs
2280+
-------------
2281+
2282+
You can decode Snowflake IDs with occ::
2283+
2284+
sudo -E -u www-data php occ decode-snowflake <snowflake_id>
2285+
2286+
Example output::
2287+
2288+
+--------------------+-------------------------+
2289+
| Snowflake ID | 6768789079123765868 |
2290+
| Seconds | 1575981518 |
2291+
| Milliseconds | 50 |
2292+
| Created from CLI | no |
2293+
| Server ID | 441 |
2294+
| Sequence ID | 2668 |
2295+
| Creation timestamp | 3335258318.050 |
2296+
| Creation date | 2075-09-09 12:38:38.050 |
2297+
+--------------------+-------------------------+
2298+
22762299
.. _share_operations_label:
22772300

22782301
Share operations

admin_manual/release_notes/upgrade_to_33.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,15 @@ Previews
1515

1616
The preview provider for MP3 files, which reads cover images embedded in the files, is disabled by default for performance and stability reasons.
1717
See :doc:`../configuration_files/previews_configuration` for details on how to enable or disable the preview provider.
18+
19+
Snowflake IDs
20+
-------------
21+
22+
This version of Nextcloud ships with `Snowflake IDs <https://en.wikipedia.org/wiki/Snowflake_ID>`_. Those IDs include the creation time of object, a sequence ID and a server ID.
23+
The server ID should now be configured in your config.php file or using environment variables. See :doc:`../configuration_server/config_sample_php_parameters` for more information.
24+
25+
26+
Default user agent for outgoing requests changed
27+
------------------------------------------------
28+
29+
Starting with this release, the default user agent for requests done by the instance was changed from ``Nextcloud Server Crawler`` to ``Nextcloud-Server-Crawler/X.Y.Z``, where ``X.Y.Z`` is the current server version.

developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_33.rst

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,25 @@ Removed APIs
2525

2626
- The global ``md5`` implementation is removed. It was deprecated since Nextcloud 20 and not used by Nextcloud anymore.
2727
If you still need a ``md5`` implementation you can just use some external package like `crypto-browserify <https://www.npmjs.com/package/crypto-browserify>`_.
28+
- ``OC.AppConfig`` was deprecated since Nextcloud 16 and was now removed. Instead use ``OCP.AppConfig``.
2829
- The ``OC.SystemTags`` api was removed. If you need to get the list of system tags, check `this merge request <https://github.com/nextcloud/files_retention/pull/855>`_ for how to fetch the tags directly.
29-
- The `OCA.Sharing.ExternalLinkActions` API was deprecated in Nextcloud 23 and is now removed.
30-
It was replaced with `OCA.Sharing.ExternalShareAction` which now have a proper API by using `registerSidebarAction` from `@nextcloud/sharing` instead.
30+
- ``OC.set`` and ``OC.get`` were removed. Both are deprecated since Nextcloud 19.
31+
For ``get``, if really needed, use `lodash get <https://lodash.com/docs#get>`_.
32+
And for ``set``, use `lodash set <https://lodash.com/docs#set>`_.
33+
- ``OC.redirect`` and ``OC.reload`` were removed. Both were deprecated since Nextcloud 17.
34+
To replace ``OC.redirect`` directly use ``window.location``.
35+
To replace ``OC.reload`` directly use ``window.location.reload``.
36+
- ``OC.fileIsBlacklisted`` was removed. It was deprecated since Nextcloud 18.
37+
The replacement is to use ``validateFilename`` from the `@nextcloud/files <https://www.npmjs.com/package/@nextcloud/files>`_ package.
38+
- The deprecated host methods from `OC` were deprecated since Nextcloud 17 and are now removed
39+
40+
- To replace ``OC.getHost`` use ``window.location.host``.
41+
- To replace ``OC.getHostName`` use ``window.location.hostname``.
42+
- To replace ``OC.getPort`` use ``window.location.port``.
43+
- To replace ``OC.getProtocol`` use ``window.location.protocol``.
44+
45+
- The ``OCA.Sharing.ExternalLinkActions`` API was deprecated in Nextcloud 23 and is now removed.
46+
It was replaced with ``OCA.Sharing.ExternalShareAction`` which now have a proper API by using ``registerSidebarAction`` from `@nextcloud/sharing <https://www.npmjs.com/package/@nextcloud/sharing>`_ instead.
3147

3248
Back-end changes
3349
----------------
@@ -59,6 +75,11 @@ In this release support for PHP 8.1 was removed. Follow the steps below to make
5975
6076
3. If you have :ref:`continuous integration <app-ci>` set up, remove PHP 8.1 from the matrices of tests and linters.
6177

78+
Default user agent for outgoing requests changed
79+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
80+
81+
Starting with this release, the default user agent for requests done by the instance was changed from ``Nextcloud Server Crawler`` to ``Nextcloud-Server-Crawler/X.Y.Z``, where ``X.Y.Z`` is the current server version.
82+
6283
Added Events
6384
^^^^^^^^^^^^
6485

0 commit comments

Comments
 (0)