Skip to content

Commit c8a3a25

Browse files
Merge branch 'master' into patch-1
2 parents 8601e61 + cdb31f2 commit c8a3a25

100 files changed

Lines changed: 1463 additions & 840 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions-lock.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: MIT
33
9f2b534bea27e8ec2dda7c1d772a664b block-merge-eol.yml
44
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
5-
d1821b8a816578070ed8fd018f321f6d pr-feedback.yml
6-
94c65e30a77686c079c6dfa54a008440 sync-workflow-templates.yml
5+
aaa395a26591445ccf4c8196d7f01ee7 pr-feedback.yml
6+
b47a9fe981a7435caea92db33f5ad121 sync-workflow-templates.yml

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ jobs:
251251
252252
- name: Set up Docker Buildx
253253
if: steps.changed.outputs.dockerfile_changed == 'true'
254-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
254+
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
255255

256256
- name: Login to GitHub Container Registry
257257
if: steps.changed.outputs.dockerfile_changed == 'true'

‎.github/workflows/docker-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2626

2727
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
28+
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
2929

3030
- name: Login to GitHub Container Registry
3131
if: github.event_name != 'pull_request'

‎.github/workflows/pr-feedback.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
blocklist=$(curl https://raw.githubusercontent.com/nextcloud/.github/master/non-community-usernames.txt | paste -s -d, -)
3737
echo "blocklist=$blocklist" >> "$GITHUB_OUTPUT"
3838
39-
- uses: nextcloud/pr-feedback-action@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1
39+
- uses: nextcloud-libraries/pr-feedback-action@5227c55be184087d0aef6338bee210d8620b6297 # v1.0.1
4040
with:
4141
feedback-message: |
4242
Hello there,

‎.github/workflows/sphinxbuild.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ jobs:
5858
# - mailto: links: These are not valid URLs and will always fail
5959
# - 404.html: This is not necessary
6060
# - latest/stable/xx links from the version selector
61+
# - links to a specific numbered version (e.g. docs.nextcloud.com/server/34/...): this
62+
# job only ever builds and stages the branch under test (e.g. "latest" for master), so
63+
# any other version's folder under stage/ doesn't exist here and can never be verified
64+
# locally. Content referencing an older/newer release intentionally links to a pinned
65+
# version and is checked against the live site instead, not this offline build.
6166
- name: Check for broken links with lychee
6267
uses: lycheeverse/lychee-action@e7477775783ea5526144ba13e8db5eec57747ce8 # v2.9.0
6368
with:
@@ -71,7 +76,8 @@ jobs:
7176
--remap "https://docs.nextcloud.com/server/ file://$(pwd)/stage/"
7277
--exclude 'go\.php' --exclude 'mailto:' --exclude-path '.*/404\.html' --exclude-path '.*/_static/.*'
7378
--exclude "/user_manual/" --include "/user_manual/en/"
74-
--exclude '^file://.*/stage/(latest|stable|[0-9]+)/(developer_manual|admin_manual|user_manual)/?$'
79+
--exclude '^file://.*/stage/(latest|stable)/(developer_manual|admin_manual|user_manual)/?$'
80+
--exclude '^file://.*/stage/[0-9]+/'
7581
'stage/${{ needs.build.outputs.branch_name }}/user_manual/en/**/*.html'
7682
'stage/${{ needs.build.outputs.branch_name }}/admin_manual/**/*.html'
7783
'stage/${{ needs.build.outputs.branch_name }}/developer_manual/**/*.html'

‎.github/workflows/sync-workflow-templates.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
matrix:
2727
branches:
2828
- ${{ github.event.repository.default_branch }}
29+
- 'stable35'
2930
- 'stable34'
3031
- 'stable33'
3132
- 'stable32'

‎_shared_assets/static/custom.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,23 @@ html[data-theme="dark"] .rst-content img {
164164
box-shadow: 0 2px 8px rgba(255, 255, 255, 0.15);
165165
}
166166

167+
/* Desktop synchronization status icons are UI glyphs, not screenshots. */
168+
.rst-content img.desktop-status-icon,
169+
html[data-theme="dark"] .rst-content img.desktop-status-icon {
170+
border-radius: 0;
171+
box-shadow: none;
172+
}
173+
174+
.rst-content table.desktop-status-icons th,
175+
.rst-content table.desktop-status-icons td {
176+
vertical-align: middle;
177+
}
178+
179+
.rst-content table.desktop-status-icons th:not(:first-child),
180+
.rst-content table.desktop-status-icons td:not(:first-child) {
181+
text-align: center;
182+
}
183+
167184
/* ICONS LIST */
168185
div#list-of-available-icons > blockquote {
169186
margin: 0;

‎admin_manual/ai/app_assistant.rst‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,33 @@ To enable/disable the text-to-image smart picker for all the users.
191191
192192
To enable/disable the speech-to-text smart picker for all the users.
193193

194+
5. Data folder
195+
196+
.. code-block::
197+
198+
occ config:app:set assistant default_data_folder --value="Assistant" --type=string
199+
200+
The assistant stores the content it generates, such as generated images and speech-to-text
201+
output, in a folder in the files of each user. This sets the name that folder is given when
202+
it is created. It defaults to ``Assistant``, and is also editable in the Assistant admin
203+
settings.
204+
205+
Users can choose their own name in their personal Assistant settings, which is stored per
206+
user and takes precedence over the server-wide default:
207+
208+
.. code-block::
209+
210+
occ user:setting $USER_ID assistant data_folder "Assistant"
211+
212+
Two things to keep in mind:
213+
214+
* Changing either value does not rename or move a folder that already exists. It only
215+
affects the name used the next time a folder has to be created, so existing generated
216+
content stays where it is.
217+
* A user who already has a folder under the built-in name ``Assistant``, from before a
218+
default was set, keeps using it. This avoids starting a second folder for them and
219+
leaving their earlier output behind.
220+
194221
Task processing
195222
~~~~~~~~~~~~~~~
196223

‎admin_manual/ai/app_context_chat.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Listed below are the major parts of the system that can be scaled independently
100100
3. The embedding model performance
101101

102102
| The embedding model performance can be scaled by using a hosted embedding service, locally or remotely hosted. It should be able to serve an OpenAI-compatible API.
103-
| The embedding service URL can be set using the environment variable ``CC_EM_BASE_URL`` during deployment in the "Deploy Options". Other options like the model name, api key, or username and password can be set using the environment variables ``CC_EM_MODEL_NAME``, ``CC_EM_API_KEY``, ``CC_EM_USERNAME``, and ``CC_EM_PASSWORD`` respectively.
103+
| The embedding service URL can be set using the environment variable ``CC_EM_BASE_URL`` during deployment in the "Deploy Options". Other options like the model name, api key, or username and password can be set using the environment variables ``CC_EM_MODEL_NAME``, ``CC_EM_APIKEY``, ``CC_EM_USERNAME``, and ``CC_EM_PASSWORD`` respectively.
104104
105105
.. warning::
106106

‎admin_manual/ai/overview.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Frontend apps
118118
~~~~~~~~~~~~~
119119

120120
* `Assistant <https://apps.nextcloud.com/apps/assistant>`_ for offering a graphical UI for the various tasks, a smart picker and "Chat with AI" functionality
121-
* `Mail <https://apps.nextcloud.com/apps/mail>`_ for summarizing mail threads (see :ref:`the Nextcloud Mail docs<mail_thread_summary>` for how to enable this)
121+
* `Mail <https://apps.nextcloud.com/apps/mail>`_ for summarizing mail threads (see :ref:`the Nextcloud Mail docs<mail_thread_summary>` for how to enable this). For smart replies. To active it - Administration settings > Groupware > Mail app > Enable text processing through LLMs
122122
* `Summary Bot <https://apps.nextcloud.com/apps/summary_bot>`_ for summarizing chat histories in `Talk <https://apps.nextcloud.com/apps/spreed>`_
123123
* `Talk <https://apps.nextcloud.com/apps/spreed>`_ for summarizing chat history (see `Nextcloud Talk docs <https://nextcloud-talk.readthedocs.io/en/latest/settings/#app-configuration>`_ for how to enable this)
124124
* `Text <https://apps.nextcloud.com/apps/text>`_ for offering an inline graphical UI for the various tasks
@@ -157,6 +157,7 @@ Frontend apps
157157
* `Collectives <https://apps.nextcloud.com/apps/collectives>`_ for offering a translation UI in the page content
158158
* `Whiteboard <https://apps.nextcloud.com/apps/whiteboard>`_ for offering a translation UI through the assistant
159159
* `Nextcloud Office <https://apps.nextcloud.com/apps/richdocuments>`_ for offering translation UI in the document content
160+
* `Mail <https://apps.nextcloud.com/apps/mail>`_ for offering translations for messages
160161

161162
Backend apps
162163
~~~~~~~~~~~~
@@ -252,7 +253,7 @@ Apps can integrate their content with Context Chat to make it available for quer
252253

253254
* *files*
254255
* `Analytics <https://apps.nextcloud.com/apps/analytics>`_
255-
* `Mail <https://apps.nextcloud.com/apps/mail>`_ (coming soon)
256+
* `Mail <https://apps.nextcloud.com/apps/mail>`_
256257
* `Bookmarks <https://apps.nextcloud.com/apps/bookmarks>`_
257258

258259
Context Chat Search

0 commit comments

Comments
 (0)