sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,554 Commits
21 Branches
339 Tags
369 MiB
Commit Graph

7554 Commits (75d583e064b6765e6a88894b3072ef62cc349dba)
 

Author SHA1 Message Date
Elian Doran 5b30bae5b2
bin: Adapt copy-trilium to TypeScript changes 2024-07-13 21:11:03 +07:00
Elian Doran 947aaa6156
webpack: Switch to TypeScript-based config 2024-07-13 21:10:40 +07:00
Elian Doran 534fe87fb1
Merge pull request #200 from TriliumNext/feature/basic_ci 
Basic CI pipeline
 2024-07-13 20:21:23 +07:00
Elian Doran 1652a7a2ec
ci: Remove test branch 2024-07-13 20:04:00 +07:00
Elian Doran 7184c648ab
ci: Test Docker publishing 2024-07-13 19:39:56 +07:00
Elian Doran be239d2230
ci: Set up node environment & cache 2024-07-13 19:11:25 +07:00
Elian Doran 439bf410ac
ci: Use newer versions of actions 2024-07-13 19:05:39 +07:00
Elian Doran 5aadcb69f8
Merge branch 'feature/fix_docker_build' into feature/basic_ci 2024-07-13 19:02:57 +07:00
Elian Doran 543c29e539
server: Change build directory 2024-07-13 19:02:51 +07:00
Elian Doran 8bcff49198
ci: Install npm dependencies 2024-07-13 18:57:13 +07:00
Elian Doran c0cc1e3b52
ci: Run tsc & create server-package.json 2024-07-13 18:56:18 +07:00
Elian Doran 19550eec6a
ci: Set up Docker build in dev workflow 2024-07-13 18:51:46 +07:00
Elian Doran 45f2691053
ci: Disable original CI workflows 2024-07-13 18:47:53 +07:00
Elian Doran ba2931b854
Update package.json 2024-07-13 18:41:36 +07:00
Elian Doran d5c1bd1085
Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7 
; Conflicts:
;	package-lock.json
;	src/routes/api/files.ts
;	src/services/build.js
;	src/services/notes.ts
 2024-07-13 18:36:04 +07:00
Elian Doran 606490a611
server: Remove log and fix whitespace 2024-07-13 16:56:13 +07:00
Elian Doran d99cc11d8b
server: Fix import of notes with type=file 2024-07-13 16:52:31 +07:00
Elian Doran 1b0690ddfc
server: Fix note type import 
A regression caused by the port to TypeScript caused all note types to
be treated as a "text" instead of other types such as canvas. The MIME
type, however, was unaffected.
 2024-07-13 16:43:33 +07:00
Elian Doran ef92d17272
Revert change to tsconfig.json 2024-07-13 14:02:19 +07:00
Elian Doran 7fd63e8064
docker: Remove unneeded build directory 2024-07-13 11:45:20 +07:00
Elian Doran d18bfb9d69
docker: Fix build by generating artifacts 2024-07-13 11:40:52 +07:00
Elian Doran 60d134a89b
Revert "docker: Fix webpack" 
This reverts commit 0a7fcf399f.
 2024-07-13 11:32:02 +07:00
Elian Doran 9b88228be9
docker: Cache system dependencies installation 2024-07-13 11:14:32 +07:00
Elian Doran 0a7fcf399f
docker: Fix webpack 2024-07-13 11:06:45 +07:00
Elian Doran 408369fcac
docker: Add build directory to gitignore 2024-07-13 10:54:37 +07:00
Elian Doran c435b97e10
docker: Fix "Missing script: "rebuild"" 2024-07-13 10:54:29 +07:00
Elian Doran e7c3dab56f
Merge pull request #194 from TriliumNext/feature/disable_format_on_save 
Disable format on save temporarily
 2024-07-13 09:48:04 +07:00
Elian Doran 374b1f9bb2
Disable format on save for VS Code 2024-07-13 00:27:53 +07:00
MeIchthys 5f23a4e3c7
Fix TrilumRocks Link 2024-07-03 01:15:31 +07:00
meichthys 4e93209fbd - Update chat link to link to Matrix space instead of single room 
- Emphasize Awesome Trilium repo
- Remove Ukraine images
- Add note about links still referring to original repo
- Emojify all headings
- Add "Why TriliumNext" section
 2024-07-03 01:14:39 +07:00
meichthys 1cff016923 Revert "Update README.md (#171)" 
This reverts commit a80a857e46.
 2024-07-03 00:29:41 +07:00
MeIchthys a80a857e46
Update README.md (#171) 
* Emojify readme and remove original repo specific items (links, images, maintenance mode notice, etc)

* Update readme links to point to TriliumNext repo

* Add link to TriliumRocks
 2024-07-02 08:08:44 +07:00
perfectra1n 47c5f60a85
Merge pull request #179 from TriliumNext/perfectra1n-patch-1 
Add "unofficial" section, and add some fancier wording
 2024-06-17 17:57:24 +07:00
perfectra1n ec2e6f2507
Update README.md 2024-06-15 22:30:35 +07:00
perfectra1n 8eb1e803b5
Add "unofficial" section, and add some fancier wording around "discuss with us" 2024-06-15 22:28:30 +07:00
Alex 17fac31cd1 convert es6 tests to ts 2024-06-09 12:16:09 +07:00
Alex 615f15756b Merge branch 'develop' into feat/ts-unit-and-integration-tests 2024-06-09 11:36:52 +07:00
Alex d7f8cb4e38 remove rebuild 2024-06-09 11:35:48 +07:00
Elian Doran 44ad22ceea
Merge pull request #167 from TriliumNext/feat/chatroom-links 
Include links to chatrooms in readme
 2024-06-03 18:55:16 +07:00
alexpietsch 40dfc46250 add links to readme 2024-05-31 19:37:09 +07:00
Alex 9775a8b7c5
feat: Add prettier config (#165) 
* add prettier config

* format some files

* Revert "format some files"

This reverts commit 2c5681ba88.
 2024-05-31 12:04:42 +07:00
zadam 82a437f2a8 remove unnecessary debounce which caused missed changes 2024-05-30 06:55:45 +07:00
zadam a64a0e52ec Merge branch 'refs/heads/stable' 
# Conflicts:
#	package-lock.json
 2024-05-30 06:46:36 +07:00
zadam 88c4171031 lock file 2024-05-30 06:46:22 +07:00
zadam b6c7e2e48f error handling 2024-05-30 06:25:03 +07:00
zadam 305d28b5b3 remove warning about the relation map - trilium is sunsetting anyway, there's no point now in deprecating this feature, fixes #4779 2024-05-30 06:24:50 +07:00
zadam a88bf68eb6 verify that the uploaded modified file is temporary 
(cherry picked from commit a2711cfb7b)
 2024-05-30 06:10:30 +07:00
zadam 8ebebecd93
Merge pull request #4772 from gigamonster256/macos-arm64 
Support compiling native MacOS arm64 (Apple Silicon) builds
 2024-05-30 06:06:08 +07:00
Alex b88f81b718 feat: add temp formatter settings 2024-05-21 20:31:22 +07:00
Caleb Norton f0d30dbe49 Add macos arm64 to release script 2024-05-18 03:48:33 +07:00