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

Commit cbf51ca

Browse files
adoriandoranadoriandoran
committed
Merge branch 'develop' of https://github.com/TriliumNext/Notes into style/next/restyle-ckeditor
2 parents 29df170 + ea8b513 commit cbf51ca

File tree

2,309 files changed

+94060
-224419
lines changed

Some content is hidden

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

2,309 files changed

+94060
-224419
lines changed

‎.dockerignore‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,44 @@
1-
.git
2-
.idea
1+
# ignored Files
2+
.dockerignore
3+
.editorconfig
4+
.git*
5+
.prettier*
6+
electron*
7+
entitlements.plist
8+
nodemon.json
9+
renovate.json
10+
trilium.iml
11+
Dockerfile
12+
Dockerfile.*
13+
npm-debug.log
14+
/src/**/*.spec.ts
15+
16+
# ignored folders
17+
/.cache
18+
/.git
19+
/.github
20+
/.idea
21+
/.vscode
322
/bin
23+
/build
424
/dist
525
/docs
6-
/npm-debug.log
7-
node_modules
26+
/dump-db
27+
/e2e
28+
/integration-tests
29+
/spec
30+
/test
31+
/test-etapi
32+
/node_modules
33+
34+
35+
# exceptions
36+
!/bin/copy-dist.ts
37+
!/bin/cleanupNodeModules.ts
838

9-
src/**/*.ts
10-
!src/services/asset_path.ts
39+
# temporary exception to make copy-dist inside Docker build not fail
40+
# TriliumNextTODO: make copy-dist *not* requiring to copy these file for builds other than electron-forge
41+
!forge.config.cjs
42+
!/bin/tpl
43+
!/bin/electron-forge/desktop.ejs
44+
!/bin/electron-forge/sign-windows.cjs

‎.gitattributes‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
package-lock.json linguist-generated=true
22
**/package-lock.json linguist-generated=true
3+
src/public/app/doc_notes/en/User[[:space:]]Guide/** linguist-generated=true
4+
src/public/app/doc_notes/en/User[[:space:]]Guide/**/*.md eol=lf
5+
6+
demo/**/*.html eol=lf
7+
demo/**/*.json eol=lf
8+
demo/**/*.svg eol=lf
9+
demo/**/*.txt eol=lf
10+
demo/**/*.js eol=lf
11+
demo/**/*.css eol=lf
12+
313
libraries/** linguist-vendored

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# These are supported funding model platforms
22

3-
github: [zadam]
4-
custom: ["https://paypal.me/za4am"]
3+
github: [eliandoran]
4+
custom: ["https://paypal.me/eliandoran"]

0 commit comments

Comments
 (0)