gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 0792714e45
         server: Fix regression in uploading images Elian Doran 2024-07-14 09:52:01 +03:00
  • 6ecbf1c528
         Merge pull request #198 from TriliumNext/bugfix/note_import_type Elian Doran 2024-07-14 00:51:04 +03:00
  • 5460359753
         Merge pull request #196 from TriliumNext/feature/fix_docker_build Elian Doran 2024-07-14 00:43:33 +03:00
  • 75ebe24abb
         ci: Remove temporary branch config Elian Doran 2024-07-14 00:43:04 +03:00
  • 3f5e5fd840
         ci: Set up Wine Elian Doran 2024-07-14 00:28:30 +03:00
  • 998db5ce95
         ci: Add build Windows Elian Doran 2024-07-13 23:23:37 +03:00
  • 7aed6d4ad4
         ci: Add build Linux Server Elian Doran 2024-07-13 23:16:00 +03:00
  • 99ea741275
         ci: Add build Linux Elian Doran 2024-07-13 22:52:28 +03:00
  • e6ff99198f
         ci: Fix docker build after macOS integration Elian Doran 2024-07-13 22:10:57 +03:00
  • 7c43a49046
         ci: Add workflow for building macOS x86_64 Elian Doran 2024-07-13 21:35:34 +03:00
  • 5b30bae5b2
         bin: Adapt copy-trilium to TypeScript changes Elian Doran 2024-07-13 21:11:03 +03:00
  • 947aaa6156
         webpack: Switch to TypeScript-based config Elian Doran 2024-07-13 21:10:40 +03:00
  • 534fe87fb1
         Merge pull request #200 from TriliumNext/feature/basic_ci Elian Doran 2024-07-13 20:21:23 +03:00
  • 1652a7a2ec
         ci: Remove test branch Elian Doran 2024-07-13 20:04:00 +03:00
  • 7184c648ab
         ci: Test Docker publishing Elian Doran 2024-07-13 19:37:30 +03:00
  • be239d2230
         ci: Set up node environment & cache Elian Doran 2024-07-13 19:08:48 +03:00
  • 439bf410ac
         ci: Use newer versions of actions Elian Doran 2024-07-13 19:05:39 +03:00
  • 5aadcb69f8
         Merge branch 'feature/fix_docker_build' into feature/basic_ci Elian Doran 2024-07-13 19:02:57 +03:00
  • 543c29e539
         server: Change build directory Elian Doran 2024-07-13 19:02:51 +03:00
  • 8bcff49198
         ci: Install npm dependencies Elian Doran 2024-07-13 18:57:13 +03:00
  • c0cc1e3b52
         ci: Run tsc & create server-package.json Elian Doran 2024-07-13 18:56:18 +03:00
  • 19550eec6a
         ci: Set up Docker build in dev workflow Elian Doran 2024-07-13 18:50:34 +03:00
  • 45f2691053
         ci: Disable original CI workflows Elian Doran 2024-07-13 18:47:53 +03:00
  • ba2931b854
         Update package.json Elian Doran 2024-07-13 18:41:36 +03:00
  • d5c1bd1085
         Merge remote-tracking branch 'upstream/master' into feature/port_0.63.7 Elian Doran 2024-07-13 18:36:04 +03:00
  • 606490a611
         server: Remove log and fix whitespace Elian Doran 2024-07-13 16:55:20 +03:00
  • d99cc11d8b
         server: Fix import of notes with type=file Elian Doran 2024-07-13 16:52:31 +03:00
  • 1b0690ddfc
         server: Fix note type import Elian Doran 2024-07-13 16:43:33 +03:00
  • ef92d17272
         Revert change to tsconfig.json Elian Doran 2024-07-13 14:02:19 +03:00
  • 7fd63e8064
         docker: Remove unneeded build directory Elian Doran 2024-07-13 11:45:20 +03:00
  • d18bfb9d69
         docker: Fix build by generating artifacts Elian Doran 2024-07-13 11:40:52 +03:00
  • 60d134a89b
         Revert "docker: Fix webpack" Elian Doran 2024-07-13 11:32:02 +03:00
  • 9b88228be9
         docker: Cache system dependencies installation Elian Doran 2024-07-13 11:14:32 +03:00
  • 0a7fcf399f
         docker: Fix webpack Elian Doran 2024-07-13 11:06:45 +03:00
  • 408369fcac
         docker: Add build directory to gitignore Elian Doran 2024-07-13 10:54:37 +03:00
  • c435b97e10
         docker: Fix "Missing script: "rebuild"" Elian Doran 2024-07-13 10:54:29 +03:00
  • e7c3dab56f
         Merge pull request #194 from TriliumNext/feature/disable_format_on_save Elian Doran 2024-07-13 09:48:04 +03:00
  • 374b1f9bb2
         Disable format on save for VS Code Elian Doran 2024-07-13 00:27:53 +03:00
  • 5f23a4e3c7
         Fix TrilumRocks Link MeIchthys 2024-07-03 01:15:31 -04:00
  • 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 meichthys 2024-07-03 01:14:39 -04:00
  • 1cff016923 Revert "Update README.md (#171)" meichthys 2024-07-03 00:29:41 -04:00
  • a80a857e46
         Update README.md (#171) MeIchthys 2024-07-02 08:08:44 -04:00
  • 51f78f77ec
         Merge 992faa1ef45f2c9848997c51ba850773926563b4 into 82a437f2a83fc10299f3205713f7dcb04e2d047c ngala 2024-06-25 22:26:44 +00:00
  • 992faa1ef4
         Merge branch 'zadam:master' into master ngala 2024-06-25 15:26:40 -07:00
  • 47c5f60a85
         Merge pull request #179 from TriliumNext/perfectra1n-patch-1 perfectra1n 2024-06-17 17:57:24 -07:00
  • ec2e6f2507
         Update README.md perfectra1n 2024-06-15 22:30:35 -07:00
  • 8eb1e803b5
         Add "unofficial" section, and add some fancier wording around "discuss with us" perfectra1n 2024-06-15 22:28:30 -07:00
  • 17fac31cd1 convert es6 tests to ts Alex 2024-06-09 12:16:09 +02:00
  • 615f15756b Merge branch 'develop' into feat/ts-unit-and-integration-tests Alex 2024-06-09 11:36:52 +02:00
  • d7f8cb4e38 remove rebuild Alex 2024-06-09 11:35:48 +02:00
  • 44ad22ceea
         Merge pull request #167 from TriliumNext/feat/chatroom-links Elian Doran 2024-06-03 18:55:16 +03:00
  • 40dfc46250 add links to readme alexpietsch 2024-05-31 19:37:09 +02:00
  • 9775a8b7c5
         feat: Add prettier config (#165) Alex 2024-05-31 18:04:42 +02:00
  • be78b725ec
         Merge 4b5294525b48e9cbeb2f7c5651eae3704e289d96 into 82a437f2a83fc10299f3205713f7dcb04e2d047c Khadisha Kudys 2024-05-30 13:49:18 +08:00
  • f165aba547
         Merge 0400ce9cdf9b787fa90d6a2e35a954846ea79581 into 82a437f2a83fc10299f3205713f7dcb04e2d047c Heyang Zhou 2024-05-30 13:49:10 +08:00
  • 78bd60493f
         Merge 9e9f49ba7af3d5849f32a9f2ae602909f7df2c31 into 82a437f2a83fc10299f3205713f7dcb04e2d047c dependabot[bot] 2024-05-30 13:48:59 +08:00
  • 5905960249
         Merge 5d6a63db49ebea67f672801f3110ed7c67c5ad92 into 82a437f2a83fc10299f3205713f7dcb04e2d047c dependabot[bot] 2024-05-30 13:48:58 +08:00
  • 9a55a44d4f
         Merge 76064fbed47fae1c38cedb1fc153906c70bea3c8 into 82a437f2a83fc10299f3205713f7dcb04e2d047c Arne Keller 2024-05-30 13:48:25 +08:00
  • 818019a603
         Merge c375ff339aa9b6c17ca6dbb1592755e90b55b965 into 82a437f2a83fc10299f3205713f7dcb04e2d047c Till Tomczak 2024-05-30 13:48:20 +08:00
  • d139c31513
         Merge 144bfe5f34793fd33d239e281f8ac05e126ded5b into 82a437f2a83fc10299f3205713f7dcb04e2d047c John Marsden 2024-05-30 13:48:16 +08:00
  • 51939b161c release 0.63.7 v0.63.7 stable zadam 2024-05-30 06:59:06 +02:00
  • 95d46b7ce7 backported upgrade to excalidraw 0.17.3 from master zadam 2024-05-30 06:58:33 +02:00
  • 82a437f2a8 remove unnecessary debounce which caused missed changes zadam 2024-05-30 06:55:45 +02:00
  • a64a0e52ec Merge branch 'refs/heads/stable' zadam 2024-05-30 06:46:36 +02:00
  • 88c4171031 lock file zadam 2024-05-30 06:46:22 +02:00
  • b6c7e2e48f error handling zadam 2024-05-30 06:25:03 +02:00
  • 305d28b5b3 remove warning about the relation map - trilium is sunsetting anyway, there's no point now in deprecating this feature, fixes #4779 zadam 2024-05-30 06:24:50 +02:00
  • a88bf68eb6 verify that the uploaded modified file is temporary zadam 2024-05-18 05:50:46 +02:00
  • 8ebebecd93
         Merge pull request #4772 from gigamonster256/macos-arm64 zadam 2024-05-30 06:06:08 +02:00
  • b88f81b718 feat: add temp formatter settings Alex 2024-05-21 20:31:22 +02:00
  • f0d30dbe49 Add macos arm64 to release script Caleb Norton 2024-05-18 03:48:33 -05:00
  • d142d3261d support compiling native arm64 macos builds Caleb Norton 2024-05-18 03:34:24 -05:00
  • 25b49e1ca2 release 0.63.6 v0.63.6 zadam 2024-05-18 06:17:21 +02:00
  • c7f19e04fa Merge remote-tracking branch 'origin/master' zadam 2024-05-18 05:50:53 +02:00
  • a2711cfb7b verify that the uploaded modified file is temporary zadam 2024-05-18 05:50:46 +02:00
  • fcb30f6319 feat: migrate jasmine tests to ts Alex 2024-05-08 23:59:11 +02:00
  • aa4960f1a5 Merge branch 'develop' into feat/ts-unit-and-integration-tests Alex 2024-05-08 21:17:29 +02:00
  • ade6d08ded
         Merge pull request #67 from TriliumNext/fix/EtapiError-prototype Elian Doran 2024-05-08 21:37:36 +03:00
  • 045f318612
         Merge pull request #60 from TriliumNext/fix/start-electron Elian Doran 2024-05-08 21:36:36 +03:00
  • 2d67abbc12
         Merge branch 'zadam:master' into develop Elian Doran 2024-05-07 20:44:45 +03:00
  • 25c9869cc8 Updated TOTP explination Brandon 2024-05-06 17:06:21 -07:00
  • b873e8b94a Merge branch 'zadam:master' into mfa chesspro13 2024-05-06 16:10:58 -07:00
  • f466cd0b5a Saving TOTP secret requires password verification Chesspro13 2024-05-06 12:22:25 -07:00
  • 5f539427a9 fix: set prototype Alex 2024-05-05 12:40:00 +02:00
  • f984b361ee
         Merge pull request #4717 from MatMasIt/italian-translation zadam 2024-05-05 05:13:26 +02:00
  • 18a2305c35 Added secret validation Brandon 2024-05-03 16:37:14 -07:00
  • f8d1d553df Added regenerate totp button to the click event for enabling totp Chesspro13 2024-05-03 15:22:19 -07:00
  • 4574b81caf TOTP fully working MVP Chesspro13 2024-05-03 14:54:32 -07:00
  • e7f11d6687 enable jasmine test runs Alex 2024-05-03 21:18:20 +02:00
  • fad51409a9 Continued integrating TOTP. Brandon 2024-05-03 08:05:35 -07:00
  • baca395c0a Started integrating totp into startup sequance Chesspro13 2024-05-02 16:06:54 -07:00
  • 3fb4d95fd7 Adding basic MFA in the form of TOTP Brandon 2024-05-02 10:16:45 -07:00
  • 3e82d30a32 fix: skipLibCheck Alex 2024-05-01 11:32:08 +02:00
  • d2604e91d4 feat: add ts script for cross plattform use alexpietsch 2024-05-01 00:05:24 +02:00
  • e2b4eaf9cc fix: copy only necessary modules Alex 2024-04-29 23:37:08 +02:00
  • 0a69ed91b6 fix: add postinstall step Alex 2024-04-29 14:58:16 +02:00
  • 8c0ce174b5 fix: script permissions Alex 2024-04-29 14:54:39 +02:00
  • c8adf2a685 fix: restore start-electron script functionality alexpietsch 2024-04-29 00:36:27 +02:00
  • 4902d66e63 Test adding an enum label type VeKo0o 2023-08-08 12:28:23 +02:00
  • a68b75f069
         Merge pull request #48 from TriliumNext/feature/typescript_backend_11 Elian Doran 2024-04-20 09:37:19 +03:00