Commit Graph

11056 Commits

Author SHA1 Message Date
Elian Doran 569ed0868d Merge pull request #1195 from dousha/bugfix-unsharing-hoisted
Allow removing weak branches even if it's hoisted
2025-02-16 15:05:17 +02:00
Elian Doran 324233be50 Merge pull request #1201 from TriliumNext/chore_fix-copy-dist-log
chore(copy-dist): "unpack" log messages before printing
2025-02-16 15:00:41 +02:00
Elian Doran 135f3d913a Merge pull request #1191 from TriliumNext/chore_npm-scripts-namescape
chore: npm scripts namespacing
2025-02-16 14:58:29 +02:00
Elian Doran 952ec516ee feat(test): add test for code block mpapings 2025-02-16 11:43:20 +02:00
Elian Doran a8f9403990 feat(code_block): map a few more themes 2025-02-16 11:43:12 +02:00
Panagiotis Papadopoulos dd4f8a8c27 chore(copy-dist): "unpack" log messages before printing
previously it was printin all messages as part of an array, i.e.
["message"]
After spreading the array, we get the desired out
"message"
2025-02-15 13:08:13 +01:00
Panagiotis Papadopoulos 11a9dfd693 Merge branch 'develop' into chore_npm-scripts-namescape 2025-02-15 09:02:23 +01:00
Elian Doran fc77f56516 chore(in_app_help): update docs 2025-02-15 01:05:37 +02:00
Elian Doran ecb2c53c6f feat(in_app_help): support webviews 2025-02-15 01:02:24 +02:00
Elian Doran 9299f90b85 feat(docs): internal API docs 2025-02-15 00:33:12 +02:00
Elian Doran 81d5d16e1a chore(bin): convert generate-openapi to typescript 2025-02-15 00:02:00 +02:00
Elian Doran 2fe6881d73 Merge pull request #1192 from FliegendeWurst/openapi-docs-2
More OpenAPI docs
2025-02-14 23:57:39 +02:00
Elian Doran 552f87e2b3 Merge pull request #1194 from TriliumNext/test-unskip-tests
test: fix and enable ex-flaky tests in `services/search.spec.ts`
2025-02-14 23:43:01 +02:00
Elian Doran 689af591d1 Merge pull request #1190 from TriliumNext/deps_jasmine-types
deps: remove leftover @types/jasmine
2025-02-14 23:41:45 +02:00
Elian Doran ab2a7a6c4a Merge pull request #1187 from TriliumNext/renovate/webpack-5.x
chore(deps): update dependency webpack to v5.98.0
2025-02-14 23:41:16 +02:00
Elian Doran a716d97e83 Merge pull request #1188 from TriliumNext/renovate/node-22.x
chore(deps): update node.js to v22.14.0
2025-02-14 23:40:32 +02:00
Elian Doran 9f18eb55cb Merge pull request #1185 from TriliumNext/renovate/prettier-3.x
chore(deps): update dependency prettier to v3.5.1
2025-02-14 23:39:59 +02:00
Elian Doran 2cb27d4b03 Merge pull request #1186 from TriliumNext/renovate/electron-34.x
chore(deps): update dependency electron to v34.2.0
2025-02-14 23:38:17 +02:00
dousha 9d7f1a2d71 Allow removing weak branches even if it's hoisted 2025-02-15 01:52:07 +08:00
Panagiotis Papadopoulos 84429e6e90 test: use integration-tests/db as data dir for tests
we have an initialized DB there, so that "integration like" tests that depend on the DB are not failing
2025-02-14 17:47:24 +01:00
Elian Doran 70d6d375f9 chore(i18n/ro): fix translation for landscape 2025-02-14 11:04:28 +02:00
FliegendeWurst a115214070 Document some note, branch, tree routes 2025-02-14 09:40:38 +01:00
Panagiotis Papadopoulos 0e18c405d8 test: "unskip" skipped tests 2025-02-14 09:17:57 +01:00
Panagiotis Papadopoulos e89d1b2413 chore(scripts): fix electron:switch in docs 2025-02-14 09:11:35 +01:00
Panagiotis Papadopoulos 21d18b1bdf chore(scripts): add generate-* to namespace "chore:*" 2025-02-14 09:00:42 +01:00
Panagiotis Papadopoulos 0cace7f3f9 chore(scripts): add integration test servers to namespace "test:*" 2025-02-14 08:57:03 +01:00
Panagiotis Papadopoulos 218a889725 chore(scripts): namespace "dev:*" 2025-02-14 08:54:05 +01:00
Panagiotis Papadopoulos ae41555b51 chore(scripts): namespace "test:*" 2025-02-14 08:50:43 +01:00
Panagiotis Papadopoulos 5f5d7b5432 chore(scripts): namespace "electron-forge:*" 2025-02-14 08:48:14 +01:00
Panagiotis Papadopoulos d23734dd3f chore(scripts): add some line breaks for better separation 2025-02-14 08:44:25 +01:00
Panagiotis Papadopoulos 4f6085a1a4 chore(scripts): namespace "build:prepare-dist" 2025-02-14 08:43:41 +01:00
Panagiotis Papadopoulos 9cddb1deac chore(scripts): namespace "build:webpack" 2025-02-14 08:41:34 +01:00
Panagiotis Papadopoulos 47002aa95a chore(scripts): namespace "chore:update-build-info" 2025-02-14 08:38:18 +01:00
Panagiotis Papadopoulos d2e8f946a0 chore(scripts): namespace "chore:ci-update-nightly-version" 2025-02-14 08:35:46 +01:00
Panagiotis Papadopoulos 688eb4d93f chore(scripts): namespace "docs:" 2025-02-14 08:31:07 +01:00
Panagiotis Papadopoulos 58eaf5eb5b test(etapi): mark as TODO for now
fixes typescript build for now
(not even sure, why we are building the tests as well)
2025-02-14 08:01:30 +01:00
Panagiotis Papadopoulos a30d361b1d deps: remove leftover @types/jasmine 2025-02-14 07:52:34 +01:00
Panagiotis Papadopoulos 0145636fc5 chore(scripts): namespace "electron:"
reorder entries
2025-02-14 07:39:01 +01:00
Panagiotis Papadopoulos 06890585d2 chore(scripts): namespace "electron:" 2025-02-14 07:36:49 +01:00
renovate[bot] 3d320308c9 chore(deps): update node.js to v22.14.0 2025-02-14 02:12:50 +00:00
renovate[bot] 325431f050 chore(deps): update dependency webpack to v5.98.0 2025-02-14 02:12:39 +00:00
renovate[bot] 35f9af15e5 chore(deps): update dependency electron to v34.2.0 2025-02-14 02:12:30 +00:00
renovate[bot] 4dfce746e9 chore(deps): update dependency prettier to v3.5.1 2025-02-14 02:12:18 +00:00
FliegendeWurst 0f0ebed78a Document sync push/pull 2025-02-13 23:51:42 +01:00
Panagiotis Papadopoulos 469519f5df chore(scripts): namespace electron:start 2025-02-13 23:25:38 +01:00
Panagiotis Papadopoulos 7b062badf0 chore(scripts): namespace server
server:switch
2025-02-13 23:18:57 +01:00
Panagiotis Papadopoulos f3dda940ec chore(scripts): namespace server
server:start-safe
server:start-no-dir
server:start-test
server:qstart
2025-02-13 23:00:53 +01:00
Panagiotis Papadopoulos 786f3e8d40 chore(scripts): namespace server:start 2025-02-13 22:53:40 +01:00
Elian Doran e347cdda36 chore(client/ts): port book_properties 2025-02-13 22:45:48 +02:00
Elian Doran 283482caa5 Merge pull request #1163 from TriliumNext/feat_erasure-timeout-ui
feat: friendly number handling for note erasure timeouts
2025-02-13 22:22:27 +02:00