Skip to content

Commit

Permalink
Merge pull request #12558 from nextcloud/bugfix/noid/add-marker
Browse files Browse the repository at this point in the history
fix: Add marker to positions that need adjusting on branch off
  • Loading branch information
nickvergessen authored Jan 31, 2025
2 parents b4e3327 + d47918e commit fffe3bd
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ to the actual file on the Nextcloud servers temporary directory. It is recommend
the size of your temp directory accordingly and also ensure that request timeouts are high
enough for PHP, webservers or any load balancers involved.

.. TODO ON RELEASE: Update version number above on release
.. tip:: In more recent versions of Nextcloud Server, when uploading to S3 in *Primary Storage* mode, we use S3 `MultipartUpload`. This allows chunked upload streaming of the chunks directly to S3 so that the final MOVE request no longer needs to assemble the final file on the Nextcloud server. This requires your ``memcache.distributed`` to be set to use Redis (or Memcached), otherwise we fall back on the prior behavior which consumes space on the Nextcloud Server for file assembly (as described above).

Federated Cloud Sharing
Expand Down
2 changes: 2 additions & 0 deletions admin_manual/installation/harden_server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ Depending on your server setup, these are the possible connections:
.. _optional (config): https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#has-internet-connection
.. _detailed field list : https://github.com/nextcloud/survey_client

.. TODO ON RELEASE: Update version number above on release
Setup fail2ban
--------------
Expand Down
1 change: 1 addition & 0 deletions admin_manual/occ_command.rst
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ While setting a configuration value, multiple options are available:

.. _Appconfig Concepts: https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/config/appconfig.html#concept-overview

.. TODO ON RELEASE: Update version number above on release
You can list all configuration values with one command::

Expand Down
2 changes: 2 additions & 0 deletions admin_manual/webhook_listeners/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ Listening to events

You can use the OCS API to add webhooks for specific events: https://docs.nextcloud.com/server/latest/developer_manual/_static/openapi.html#/operations/webhook_listeners-webhooks-index

.. TODO ON RELEASE: Update version number above on release
Note: When authenticating with the OCS API to register webhooks the account you authenticate as must have administrator rights or delegated administrator rights.

Filters
Expand Down
2 changes: 2 additions & 0 deletions admin_manual/windmill_workflows/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ If you are not using the ExApp-packaged windmill install then you will have to r
webhooks for your workflows manually via the webhook_listeners API:
see https://docs.nextcloud.com/server/latest/developer_manual/_static/openapi.html#/operations/webhook_listeners-webhooks-index

.. TODO ON RELEASE: Update version number above on release
The magic listener script
~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
4 changes: 3 additions & 1 deletion developer_manual/client_apis/OCS/ocs-taskprocessing-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ OCS TaskProcessing API

The OCS Task processing API allows you to run task processing tasks, like prompting large language models implemented by apps using :ref:`the backend Task Processing API<task_processing>`.

See the relevant `OpenAPI docs <https://docs.nextcloud.com/server/latest/developer_manual/_static/openapi.html#/operations/core-task_processing_api-schedule>`_.
See the relevant `OpenAPI docs <https://docs.nextcloud.com/server/latest/developer_manual/_static/openapi.html#/operations/core-task_processing_api-schedule>`_.

.. TODO ON RELEASE: Update version number above on release
2 changes: 2 additions & 0 deletions developer_manual/exapp_development/faq/DockerSocketProxy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ AppAPI automatically creates the default Deploy daemon configuration for Nextclo

See `Nextcloud in Docker AIO (all-in-one) <https://docs.nextcloud.com/server/latest/admin_manual/exapps_management/DeployConfigurations.html#nextcloud-in-docker-aio-all-in-one>`_ for more details.

.. TODO ON RELEASE: Update version number above on release
.. note::

Nextcloud AIO is not limited to its default Deploy daemon.
Expand Down
2 changes: 2 additions & 0 deletions developer_manual/exapp_development/faq/Troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ ExApp deployment issues
The deployment issues questions are covered in the `Test Deploy <https://docs.nextcloud.com/server/latest/admin_manual/exapps_management/TestDeploy.html>`_ section of the administration guide.
Generally speaking, there are three steps to find the proper error message to understand the problem:

.. TODO ON RELEASE: Update version number above on release
1. Check Nextcloud logs
2. Check ExApp container logs (available only if ExApp container is created and/or running)
3. Check Deploy daemon host logs (``journalctl -u docker.service``)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ For the ``manual-install`` type, an administrator will have to manually extract
(e.g. ``/path/to/apps-writable/<appid>/l10n/*.(js|json)``).
This will allow the server to access the ExApp's strings with translations.

.. TODO ON RELEASE: Update version number above on release
.. note::

Only the ``l10n`` folder must be present on the server side; ``appinfo/info.xml`` could lead to misdetection by the server as a PHP app folder.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ Request data
The possible values of ``log_lvl`` are described here: `Nextcloud Log level <https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/logging_configuration.html#log-level>`_

.. TODO ON RELEASE: Update version number above on release
Response data
*************

Expand Down
2 changes: 2 additions & 0 deletions user_manual/desktop/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ You can find additional information here:

.. _`Admin manual`: https://docs.nextcloud.com/server/latest/admin_manual/desktop/index.html
.. _`Developer manual`: https://docs.nextcloud.com/server/latest/developer_manual/desktop/index.html

.. TODO ON RELEASE: Update version number above on release

0 comments on commit fffe3bd

Please sign in to comment.