Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit e98954c

Browse files
committed
Merge branch 'develop' into feat/llm-tool-improvement
2 parents 87fd6af + 248f6d6 commit e98954c

File tree

253 files changed

+9544
-3963
lines changed

Some content is hidden

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

253 files changed

+9544
-3963
lines changed

.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- uses: nrwl/nx-set-shas@v4
4141
- name: Check affected
42-
run: pnpm nx affected --verbose -t typecheck build rebuild-deps
42+
run: pnpm nx affected --verbose -t typecheck build rebuild-deps test-build
4343

4444
test_dev:
4545
name: Test development

.github/workflows/nightly.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ on:
1111
pull_request:
1212
paths:
1313
- .github/actions/build-electron/*
14-
- forge.config.cjs
14+
- .github/workflows/nightly.yml
15+
- forge.config.ts
1516

1617
concurrency:
1718
group: ${{ github.workflow }}-${{ github.ref }}
@@ -76,7 +77,7 @@ jobs:
7677
WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
7778

7879
- name: Publish release
79-
uses: softprops/action-gh-release@v2.2.2
80+
uses: softprops/action-gh-release@v2.3.2
8081
if: ${{ github.event_name != 'pull_request' }}
8182
with:
8283
make_latest: false
@@ -116,7 +117,7 @@ jobs:
116117
arch: ${{ matrix.arch }}
117118

118119
- name: Publish release
119-
uses: softprops/action-gh-release@v2.2.2
120+
uses: softprops/action-gh-release@v2.3.2
120121
if: ${{ github.event_name != 'pull_request' }}
121122
with:
122123
make_latest: false

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
path: upload
115115

116116
- name: Publish stable release
117-
uses: softprops/action-gh-release@v2.2.2
117+
uses: softprops/action-gh-release@v2.3.2
118118
with:
119119
draft: false
120120
body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ upload
4545
.rollup.cache
4646
*.tsbuildinfo
4747

48-
/result
48+
/result
49+
.svelte-kit

.nxignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
_regroup
2-
_regroup_monorepo
3-
4-
# Asset copying respects .gitignore / .nxignore for some reason.
5-
# See https://github.com/nrwl/nx/issues/20309
6-
!dist
7-
!node_modules
2+
_regroup_monorepo

.vscode/extensions.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"redhat.vscode-yaml",
1010
"tobermory.es6-string-html",
1111
"vitest.explorer",
12-
"yzhang.markdown-all-in-one"
12+
"yzhang.markdown-all-in-one",
13+
"svelte.svelte-vscode",
14+
"bradlc.vscode-tailwindcss"
1315
]
1416
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for q
2222
* Seamless [note versioning](https://triliumnext.github.io/Docs/Wiki/note-revisions)
2323
* Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be used for note organization, querying and advanced [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
2424
* UI available in English, German, Spanish, French, Romanian, and Chinese (simplified and traditional)
25-
* Direct [OpenID and TOTP integration](.docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md") for more secure login
25+
* Direct [OpenID and TOTP integration](./docs/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/Multi-Factor%20Authentication.md) for more secure login
2626
* [Synchronization](https://triliumnext.github.io/Docs/Wiki/synchronization) with self-hosted sync server
2727
* there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
2828
* [Sharing](https://triliumnext.github.io/Docs/Wiki/sharing) (publishing) notes to public internet

_regroup/eslint.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export default tseslint.config(
4444
"dist/*",
4545
"docs/*",
4646
"demo/*",
47-
"libraries/*",
4847
"src/public/app-dist/*",
4948
"src/public/app/doc_notes/*"
5049
]

_regroup/eslint.format.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export default [
3838
"dist/*",
3939
"docs/*",
4040
"demo/*",
41-
"libraries/*",
4241
// TriliumNextTODO: check if we want to format packages here as well - for now skipping it
4342
"packages/*",
4443
"src/public/app-dist/*",

0 commit comments

Comments
 (0)