Elian Doran
186650b1cf
ci: Add workflow to build macOS ARM64
2024-07-14 10:12:12 +03:00
Elian Doran
1dad4bc80f
Merge remote-tracking branch 'origin/develop' into feature/port_0.63.7
2024-07-14 09:58:37 +03:00
Elian Doran
d66a70f099
Merge pull request #201 from TriliumNext/feature/fix_build_scripts
...
Fix build scripts & add CI for running them
2024-07-14 09:58:00 +03:00
Elian Doran
6ecbf1c528
Merge pull request #198 from TriliumNext/bugfix/note_import_type
...
Fix import note type
2024-07-14 00:51:04 +03:00
Elian Doran
5460359753
Merge pull request #196 from TriliumNext/feature/fix_docker_build
...
Fix Docker build
2024-07-14 00:43:33 +03:00
Elian Doran
75ebe24abb
ci: Remove temporary branch config
2024-07-14 00:43:04 +03:00
Elian Doran
3f5e5fd840
ci: Set up Wine
2024-07-14 00:30:49 +03:00
Elian Doran
998db5ce95
ci: Add build Windows
2024-07-14 00:14:30 +03:00
Elian Doran
7aed6d4ad4
ci: Add build Linux Server
2024-07-13 23:16:35 +03:00
Elian Doran
99ea741275
ci: Add build Linux
2024-07-13 22:52:28 +03:00
Elian Doran
e6ff99198f
ci: Fix docker build after macOS integration
2024-07-13 22:10:57 +03:00
Elian Doran
7c43a49046
ci: Add workflow for building macOS x86_64
2024-07-13 21:39:22 +03:00
Elian Doran
5b30bae5b2
bin: Adapt copy-trilium to TypeScript changes
2024-07-13 21:11:03 +03:00
Elian Doran
947aaa6156
webpack: Switch to TypeScript-based config
2024-07-13 21:10:40 +03:00
Elian Doran
534fe87fb1
Merge pull request #200 from TriliumNext/feature/basic_ci
...
Basic CI pipeline
2024-07-13 20:21:23 +03:00
Elian Doran
1652a7a2ec
ci: Remove test branch
2024-07-13 20:04:00 +03:00
Elian Doran
7184c648ab
ci: Test Docker publishing
2024-07-13 19:39:56 +03:00
Elian Doran
be239d2230
ci: Set up node environment & cache
2024-07-13 19:11:25 +03:00
Elian Doran
439bf410ac
ci: Use newer versions of actions
2024-07-13 19:05:39 +03:00
Elian Doran
5aadcb69f8
Merge branch 'feature/fix_docker_build' into feature/basic_ci
2024-07-13 19:02:57 +03:00
Elian Doran
543c29e539
server: Change build directory
2024-07-13 19:02:51 +03:00
Elian Doran
8bcff49198
ci: Install npm dependencies
2024-07-13 18:57:13 +03:00
Elian Doran
c0cc1e3b52
ci: Run tsc & create server-package.json
2024-07-13 18:56:18 +03:00
Elian Doran
19550eec6a
ci: Set up Docker build in dev workflow
2024-07-13 18:51:46 +03:00
Elian Doran
45f2691053
ci: Disable original CI workflows
2024-07-13 18:47:53 +03:00
Elian Doran
ba2931b854
Update package.json
2024-07-13 18:41:36 +03: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 +03:00
Elian Doran
606490a611
server: Remove log and fix whitespace
2024-07-13 16:56:13 +03:00
Elian Doran
d99cc11d8b
server: Fix import of notes with type=file
2024-07-13 16:52:31 +03: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 +03:00
Elian Doran
ef92d17272
Revert change to tsconfig.json
2024-07-13 14:02:19 +03:00
Elian Doran
7fd63e8064
docker: Remove unneeded build directory
2024-07-13 11:45:20 +03:00
Elian Doran
d18bfb9d69
docker: Fix build by generating artifacts
2024-07-13 11:40:52 +03:00
Elian Doran
60d134a89b
Revert "docker: Fix webpack"
...
This reverts commit 0a7fcf399fb854a29c405d2d79f579d5a910bcc1.
2024-07-13 11:32:02 +03:00
Elian Doran
9b88228be9
docker: Cache system dependencies installation
2024-07-13 11:14:32 +03:00
Elian Doran
0a7fcf399f
docker: Fix webpack
2024-07-13 11:06:45 +03:00
Elian Doran
408369fcac
docker: Add build directory to gitignore
2024-07-13 10:54:37 +03:00
Elian Doran
c435b97e10
docker: Fix "Missing script: "rebuild""
2024-07-13 10:54:29 +03: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 +03:00
Elian Doran
374b1f9bb2
Disable format on save for VS Code
2024-07-13 00:27:53 +03:00
MeIchthys
5f23a4e3c7
Fix TrilumRocks Link
2024-07-03 01:15:31 -04: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 -04:00
meichthys
1cff016923
Revert "Update README.md ( #171 )"
...
This reverts commit a80a857e466204ef076588ac39be10d0190b24fc.
2024-07-03 00:29:41 -04: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 -04: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
Elian Doran
44ad22ceea
Merge pull request #167 from TriliumNext/feat/chatroom-links
...
Include links to chatrooms in readme
2024-06-03 18:55:16 +03:00
alexpietsch
40dfc46250
add links to readme
2024-05-31 19:37:09 +02:00
Alex
9775a8b7c5
feat: Add prettier config ( #165 )
...
* add prettier config
* format some files
* Revert "format some files"
This reverts commit 2c5681ba88c422a92737a9c109021aef8deff2f4.
2024-05-31 12:04:42 -04:00
