Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit c8924e3
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 12:14:12 2023 +0800

    :art: fix siyuan-note#9409

commit 879fdd8
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:56:16 2023 +0800

    :lipstick: dragover

commit 9978827
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:34:42 2023 +0800

    :art: 数据库块适配外观和宽度调整

commit a20ffeb
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:20:17 2023 +0800

    :lipstick: fix siyuan-note#9412

commit f2075fa
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:04:23 2023 +0800

    :art: siyuan-note#9419

commit 5e2910a
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:00:46 2023 +0800

    :art: siyuan-note#9419

commit ac7f8d3
Merge: 9ae8400 d78a020
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:56:40 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 9ae8400
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:56:21 2023 +0800

    :art: siyuan-note#9419

commit d78a020
Author: Daniel <[email protected]>
Date:   Sat Oct 14 10:51:46 2023 +0800

    :art: Database table view breadcrumb

commit 6b1a292
Merge: 25109b9 9766020
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:49:46 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 25109b9
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:49:35 2023 +0800

    :art: 数据库块适配外观和宽度调整

commit 9766020
Author: Daniel <[email protected]>
Date:   Sat Oct 14 10:08:57 2023 +0800

    :art: Update text

commit ab67389
Merge: 7d6f9bb 39c5744
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:01:57 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 7d6f9bb
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:01:42 2023 +0800

    :art: 数据库不能设置布局

commit 39c5744
Author: Daniel <[email protected]>
Date:   Sat Oct 14 09:46:29 2023 +0800

    :bug: Database table view export does not display select content Fix siyuan-note#9428

commit 87ecb7f
Author: Daniel <[email protected]>
Date:   Sat Oct 14 09:37:47 2023 +0800

    :art: Update text

commit 69d8c93
Merge: 623f30b f6780c1
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 09:21:54 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 623f30b
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 09:21:44 2023 +0800

    :art: siyuan-note#9419

commit f6780c1
Author: Daniel <[email protected]>
Date:   Sat Oct 14 09:20:51 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit fd94e9d
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 00:04:16 2023 +0800

    :art:

commit 51f6687
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:50:31 2023 +0800

    :art: siyuan-note#9419

commit 49305b8
Merge: 2f0f563 8399aba
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:26:15 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 2f0f563
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:25:58 2023 +0800

    :art: siyuan-note#9419

commit 8399aba
Author: Daniel <[email protected]>
Date:   Fri Oct 13 23:22:17 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit 22efb3d
Merge: f95084e c3d1c04
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:07:13 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit f95084e
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:06:53 2023 +0800

    :art: siyuan-note#9419

commit c3d1c04
Author: Daniel <[email protected]>
Date:   Fri Oct 13 22:50:11 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit a11ea9c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 22:37:15 2023 +0800

    :lipstick:

commit 99ec5c1
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 22:32:17 2023 +0800

    :art: showHiddenFiles

commit 49426ac
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 22:15:20 2023 +0800

    :art: siyuan-note#9425

commit d445c54
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 21:54:35 2023 +0800

    :art: siyuan-note#9421

commit 0c4aee7
Merge: c34d84c daa9ddf
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 21:50:28 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit c34d84c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 21:50:14 2023 +0800

    :art: siyuan-note#9421

commit daa9ddf
Author: Daniel <[email protected]>
Date:   Fri Oct 13 14:43:43 2023 +0800

    :art: Don't load plugin when the user hasn't agreed to trust bazaar content yet Fix siyuan-note#9426

commit 01b19ea
Author: Daniel <[email protected]>
Date:   Fri Oct 13 14:03:41 2023 +0800

    :art: Fix database table view loading https://ld246.com/article/1697168944677

commit 7a9a85e
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 13:55:27 2023 +0800

    :art: siyuan-note#9417

commit 1815ec1
Merge: 73edee5 00ed190
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 13:37:45 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 73edee5
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 13:37:32 2023 +0800

    :art: siyuan-note#9417

commit 00ed190
Author: Daniel <[email protected]>
Date:   Fri Oct 13 13:21:53 2023 +0800

    :art: Fix database table view loading https://ld246.com/article/1697168944677

commit 48e871c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 12:33:29 2023 +0800

    :art: siyuan-note#9417

commit 3554333
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:55:51 2023 +0800

    :art: siyuan-note#9417

commit af810b2
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:34:19 2023 +0800

    :art: fix siyuan-note#9423

commit 673c952
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:30:44 2023 +0800

    :art: fix siyuan-note#9423

commit 3b87a0d
Merge: ed31305 3de7781
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:09:07 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit ed31305
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:08:56 2023 +0800

    :art: siyuan-note#9421

commit 3de7781
Author: Daniel <[email protected]>
Date:   Fri Oct 13 10:44:29 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit 2304921
Author: Daniel <[email protected]>
Date:   Fri Oct 13 10:42:51 2023 +0800

    :art: Update flashcard user guide

commit 55fb8b1
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 10:14:11 2023 +0800

    :art: fix siyuan-note#9420

commit 8998de9
Merge: 5b38e79 df9b55c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 09:37:35 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 5b38e79
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 09:37:24 2023 +0800

    :art: fix siyuan-note#9420

commit df9b55c
Author: Daniel <[email protected]>
Date:   Fri Oct 13 08:46:29 2023 +0800

    :art: Database template columns support sort

commit 3da9f0f
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:40:09 2023 +0800

    :bug: 新增行后弹出的输入框

commit 79a88df
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:23:18 2023 +0800

    :rotating_light:

commit 40a1e6d
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:21:53 2023 +0800

    :lipstick: database loading

commit 2872dab
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:11:59 2023 +0800

    :lipstick: fix siyuan-note#9418

commit 025a8ea
Merge: 02ec0f6 0ea9b8f
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:04:13 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 02ec0f6
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:04:01 2023 +0800

    :lipstick: fix siyuan-note#9418

commit 0ea9b8f
Author: Daniel <[email protected]>
Date:   Thu Oct 12 19:58:32 2023 +0800

    :art: Database block loading animation siyuan-note#9416

commit 1590913
Author: Daniel <[email protected]>
Date:   Thu Oct 12 19:55:57 2023 +0800

    :art: Update attr panel for av

commit d257caf
Author: Daniel <[email protected]>
Date:   Thu Oct 12 19:38:37 2023 +0800

    :art: Database block loading animation siyuan-note#9416

commit fdaf8d7
Merge: 70e82cd 238609f
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:34:36 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 70e82cd
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:34:19 2023 +0800

    :lipstick: fix siyuan-note#9416

commit 238609f
Author: Daniel <[email protected]>
Date:   Thu Oct 12 17:33:23 2023 +0800

    :zap: Improve performance of loading database table view

commit 2dd558b
Merge: fe0b1e8 8fb35f5
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:16:45 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit fe0b1e8
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:16:31 2023 +0800

    :lipstick: fix siyuan-note#9415

commit 8fb35f5
Author: Daniel <[email protected]>
Date:   Thu Oct 12 17:15:36 2023 +0800

    :art: Database template columns support number filter Fix siyuan-note#9414

commit 01670f2
Merge: f792d14 ffcdb5d
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:07:48 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit f792d14
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:07:09 2023 +0800

    :art: siyuan-note#9408

commit ffcdb5d
Author: Daniel <[email protected]>
Date:   Thu Oct 12 16:37:09 2023 +0800

    :bug: SVG images cannot be displayed on some systems siyuan-note#9413

commit fb1f80c
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:22:55 2023 +0800

    :lipstick: fix siyuan-note#9406

commit da51ade
Merge: a4bcae8 09ef5fd
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:11:42 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit a4bcae8
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:11:29 2023 +0800

    :bug: 数据库数字填0无效

commit 09ef5fd
Author: Daniel <[email protected]>
Date:   Thu Oct 12 12:01:53 2023 +0800

    :art: Database template columns support calculations siyuan-note#9408

commit 1b595d0
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:01:53 2023 +0800

    :art: siyuan-note#9408

commit 21d1a05
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 11:54:15 2023 +0800

    :lipstick: 编辑后表头不固定

commit c5206f7
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 11:14:29 2023 +0800

    :bug: fix siyuan-note#9405

commit f0f55d3
Merge: 0194124 92151f7
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 10:54:19 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 0194124
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 10:54:09 2023 +0800

    :lipstick: fix siyuan-note#9403

commit 92151f7
Author: Daniel <[email protected]>
Date:   Thu Oct 12 10:12:44 2023 +0800

    :art: Change database template column custom attribute action Fix siyuan-note#9401

commit b8e8aa0
Author: Daniel <[email protected]>
Date:   Wed Oct 11 17:00:21 2023 +0800

    :hammer: Clean code

commit b17aff5
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 23:54:40 2023 +0800

    :bug:

commit 1117495
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 23:50:28 2023 +0800

    :bug: 预览模式下点击只读

commit 130884d
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 23:23:01 2023 +0800

    :art: fix siyuan-note#9404

commit 7486e1a
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 17:28:40 2023 +0800

    :art: fix siyuan-note#9402

commit eb93255
Author: Daniel <[email protected]>
Date:   Wed Oct 11 14:57:14 2023 +0800

    :hammer: Clean code

commit fd46593
Author: Daniel <[email protected]>
Date:   Wed Oct 11 14:55:06 2023 +0800

    :bookmark: Release v2.10.10

commit 337c795
Author: Daniel <[email protected]>
Date:   Wed Oct 11 11:59:25 2023 +0800

    :art: Improve install new version on Windows

commit f6f1148
Author: Daniel <[email protected]>
Date:   Wed Oct 11 11:08:44 2023 +0800

    :memo: Update changelogs

commit f0ad326
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:30:00 2023 +0800

    :art:

commit 2eb89f0
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:25:21 2023 +0800

    :rotating_light:

commit 0db516e
Merge: 23c3f9f e43cf4c
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:24:41 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 23c3f9f
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:24:29 2023 +0800

    :art: fix siyuan-note#9383

commit e43cf4c
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:52:10 2023 +0800

    :memo: Update changelogs

commit b30cb09
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:49:04 2023 +0800

    :memo: Update changelogs

commit d4a3226
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:48:40 2023 +0800

    :memo: Update changelogs

commit 65adab6
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:48:29 2023 +0800

    :art: Adding row overwriting data after enabling filter in database siyuan-note#9395

commit 210a3ac
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:04:39 2023 +0800

    :art: Improve handling of database column filters containing empty values Fix siyuan-note#9394

commit 37f950b
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:39:22 2023 +0800

    :lipstick: icon

commit 7b1c30b
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:30:13 2023 +0800

    :art: fix siyuan-note#9396

commit 6ef13ab
Merge: acd2eb1 e4907e7
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:18:43 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit acd2eb1
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:18:33 2023 +0800

    :art: fix siyuan-note#9396

commit e4907e7
Author: Daniel <[email protected]>
Date:   Wed Oct 11 09:16:57 2023 +0800

    :art: The block in the editor shows the database icon siyuan-note#8894

commit 6f249d7
Author: Daniel <[email protected]>
Date:   Wed Oct 11 09:15:03 2023 +0800

    :arrow_up: Upgrade kernel deps

commit bb04bf9
Author: Daniel <[email protected]>
Date:   Wed Oct 11 09:04:39 2023 +0800

    :art: Show notebooks in hpath of block ref search list results siyuan-note#9378

commit 30b0dd0
Merge: c1de5e1 ccb6545
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 08:58:55 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit c1de5e1
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 08:58:44 2023 +0800

    :lipstick: siyuan-note#8894

commit ccb6545
Author: Daniel <[email protected]>
Date:   Wed Oct 11 08:50:13 2023 +0800

    :art: Improve handling of database column filters containing empty values Fix siyuan-note#9394

commit 28e4e1e
Author: Daniel <[email protected]>
Date:   Tue Oct 10 22:31:46 2023 +0800

    :art: Rename the .sya annotation file when renaming a PDF asset siyuan-note#9390

commit 964c822
Author: Daniel <[email protected]>
Date:   Tue Oct 10 22:02:46 2023 +0800

    :art: Improve database created and updated column values siyuan-note#9391

commit f404d7f
Merge: ed7084c 301b6d9
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 22:00:57 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit ed7084c
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 22:00:43 2023 +0800

    :lipstick:

commit 301b6d9
Author: Daniel <[email protected]>
Date:   Tue Oct 10 21:55:43 2023 +0800

    :art: Improve database created and updated column values siyuan-note#9391

commit f62be47
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:50:36 2023 +0800

    :art: fix siyuan-note#9385

commit 8e2565f
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:39:57 2023 +0800

    :art: fix siyuan-note#9386

commit e54d8f1
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:31:20 2023 +0800

    :art: fix siyuan-note#9393

commit 1fb7187
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:23:29 2023 +0800

    :memo: fix siyuan-note#9392

commit ea00753
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:18:17 2023 +0800

    :art: fix siyuan-note#9392

commit 4318aa4
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:51:28 2023 +0800

    :art: fix siyuan-note#9376

commit f1d4f84
Merge: 3f4c00e 64df2ff
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:42:43 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 3f4c00e
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:42:14 2023 +0800

    :art: siyuan-note#9376

commit 64df2ff
Author: Daniel <[email protected]>
Date:   Tue Oct 10 20:37:51 2023 +0800

    :art: Rows in the database without bound blocks should not show created and updated Fix siyuan-note#9391

commit 691a0be
Merge: 0e5cae3 7e9243d
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:41:05 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 0e5cae3
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:40:38 2023 +0800

    :lipstick: fix siyuan-note#9206

commit 7e9243d
Author: Daniel <[email protected]>
Date:   Tue Oct 10 20:05:48 2023 +0800

    :art: Rows in the database without bound blocks should not show created and updated Fix siyuan-note#9391

commit 7aa4aac
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 17:30:10 2023 +0800

    :lipstick: fix siyuan-note#9206

commit d02381d
Merge: 449d2db 6e9099e
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 17:09:14 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 449d2db
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 17:09:03 2023 +0800

    :recycle: siyuan-note#9256

commit 6e9099e
Author: Daniel <[email protected]>
Date:   Tue Oct 10 16:52:40 2023 +0800

    :lock: Authenticate requests of assets other than 127.0.0.1 Fix siyuan-note#9388

commit 1178638
Author: Yingyi / 颖逸 <[email protected]>
Date:   Tue Oct 10 16:21:50 2023 +0800

    Improve event bus `open-siyuan-url-plugin` (siyuan-note#9256)

    * 🎨 Improve plugin event bus `open-siyuan-url-plugin`

    * 🐛 Avoid plug-in names with the same prefix

    * Update onGetConfig.ts

commit 2c36af7
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 16:15:24 2023 +0800

    :rotating_light:

commit b0e3efa
Author: Daniel <[email protected]>
Date:   Tue Oct 10 11:41:46 2023 +0800

    :bookmark: Release v2.10.9

commit d690475
Merge: c8a6f41 811bac9
Author: Daniel <[email protected]>
Date:   Tue Oct 10 10:58:46 2023 +0800

    Merge remote-tracking branch 'origin/master'

commit c8a6f41
Author: Daniel <[email protected]>
Date:   Tue Oct 10 10:18:57 2023 +0800

    :bookmark: Release v2.10.9

commit cdcec7e
Author: Daniel <[email protected]>
Date:   Mon Oct 9 23:29:25 2023 +0800

    :memo: Update changelogs

commit 1eccb8b
Merge: a3094fe 3827753
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 23:26:13 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit a3094fe
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 23:25:48 2023 +0800

    :bug: fix siyuan-note#9384

commit 3827753
Author: Daniel <[email protected]>
Date:   Mon Oct 9 23:07:34 2023 +0800

    :art: Upgrade Electron siyuan-note#9342

commit 567394a
Author: Daniel <[email protected]>
Date:   Mon Oct 9 22:42:39 2023 +0800

    :memo: Update changelogs

commit ff6220a
Author: Yingyi / 颖逸 <[email protected]>
Date:   Mon Oct 9 21:51:39 2023 +0800

    :art: add `@electron/remote` dependency (siyuan-note#9381)

commit da0fa08
Author: Daniel <[email protected]>
Date:   Mon Oct 9 21:45:36 2023 +0800

    :art: Replace non-breaking spaces with normal spaces when copying siyuan-note#9382

commit 0ed6884
Author: Daniel <[email protected]>
Date:   Mon Oct 9 21:09:35 2023 +0800

    :bug: Update av Fix siyuan-note#9380

commit 288eb24
Author: Daniel <[email protected]>
Date:   Mon Oct 9 17:30:19 2023 +0800

    :art: Show notebooks in hpath of block ref search list results siyuan-note#9378

commit 4965b7b
Merge: 803069d 9028491
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 17:18:28 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 803069d
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 17:18:17 2023 +0800

    :art: fix siyuan-note#9370

commit 9028491
Author: Daniel <[email protected]>
Date:   Mon Oct 9 17:17:40 2023 +0800

    :art: Add created and updated type column to database siyuan-note#9371

commit faadbf5
Author: Daniel <[email protected]>
Date:   Mon Oct 9 16:48:28 2023 +0800

    :art: Add created and updated type column to database siyuan-note#9371

commit 9ca1162
Merge: 43f06e5 644e031
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 16:45:06 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 43f06e5
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 16:44:46 2023 +0800

    :art: fix siyuan-note#9370

commit 811bac9
Author: Daniel <[email protected]>
Date:   Wed Oct 4 13:03:36 2023 +0800

    :art: Free disk space for docker image building GitHub Action

commit 66aa802
Author: Daniel <[email protected]>
Date:   Wed Oct 4 13:03:28 2023 +0800

    :art: Free disk space for docker image building GitHub Action
  • Loading branch information
@Zuoqiu-Yingyi
Zuoqiu-Yingyi committed Oct 14, 2023
1 parent 23bd6bc commit 063e8ab
Show file tree
Hide file tree
Showing 58 changed files with 1,609 additions and 512 deletions.
3 changes: 3 additions & 0 deletions app/appearance/icons/ant/icon.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/appearance/icons/ant/icon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"name": "ant",
"author": "Vanessa",
"url": "https://github.com/Vanessa219",
"version": "1.24.0"
"version": "1.25.0"
}
6 changes: 6 additions & 0 deletions app/appearance/icons/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
<body>
<h2>SiYuan</h2>
<div class="fn__clear">
<div>
<svg>
<use xlink:href="#iconKey"></use>
</svg>
iconKey
</div>
<div>
<svg>
<use xlink:href="#iconClock"></use>
Expand Down
3 changes: 3 additions & 0 deletions app/appearance/icons/material/icon.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/appearance/icons/material/icon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"name": "material",
"author": "Vanessa",
"url": "https://github.com/Vanessa219",
"version": "1.24.0"
"version": "1.25.0"
}
2 changes: 1 addition & 1 deletion app/appearance/langs/en_US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"date": "Date",
"select": "Select",
"multiSelect": "Multi-select",
"commandEmpty": "No command yet, click to go to the market to download more plugins",
"commandEmpty": "No command yet, click to go to the marketplace to install plugins",
"commandPanel": "Command Palette",
"cloudRegionNorthAmerica": "LiuYun (North America data center)",
"cloudRegionChina": "LianDi (Mainland China data center)",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/es_ES.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"fecha": "Fecha",
"seleccionar": "Seleccionar",
"multiSelect": "Selección múltiple",
"commandEmpty": "Sin comando todavía, haga clic para ir al mercado para descargar más complementos",
"commandEmpty": "Aún no hay ningún comando, haga clic para ir al mercado e instalar complementos",
"commandPanel": "Paleta de comandos",
"cloudRegionNorthAmerica": "LiuYun (Centro de datos de América del Norte)",
"cloudRegionChina": "LianDi (Centro de datos de China continental)",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/fr_FR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"date": "Date",
"select": "Sélectionner",
"multiSelect": "Multi-sélection",
"commandEmpty": "Aucune commande pour le moment, cliquez pour aller sur le marché pour télécharger plus de plugins",
"commandEmpty": "Pas de commande pour l'instant, cliquez pour aller sur la Marketplace pour installer les plugins",
"commandPanel": "Palette de commandes",
"cloudRegionNorthAmerica": "LiuYun (Centre de données d'Amérique du Nord)",
"cloudRegionChina": "LianDi (Centre de données de Chine continentale)",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/zh_CHT.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"date": "日期",
"select": "單選",
"multiSelect": "多選",
"commandEmpty": "暫無命令，點擊前往集市下載更多插件",
"commandEmpty": "暫無指令，點選前往市集安裝插件",
"commandPanel": "命令面板",
"cloudRegionNorthAmerica": "流雲（北美資料中心）",
"cloudRegionChina": "鏈滴（中國大陸資料中心）",
Expand Down
2 changes: 1 addition & 1 deletion app/appearance/langs/zh_CN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"date": "日期",
"select": "单选",
"multiSelect": "多选",
"commandEmpty": "暂无命令，点击前往集市下载更多插件",
"commandEmpty": "暂无命令，点击前往集市安装插件",
"commandPanel": "命令面板",
"cloudRegionNorthAmerica": "流云（北美数据中心）",
"cloudRegionChina": "链滴（中国大陆数据中心）",
Expand Down
2 changes: 1 addition & 1 deletion app/appx/AppxManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- use single quotes to avoid double quotes escaping in the publisher value -->
<Identity Name="89C2A984.SiYuan"
ProcessorArchitecture="x64"
Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
Version="2.10.10.0"/>
<Properties>
<DisplayName>SiYuan</DisplayName>
Expand Down
5 changes: 3 additions & 2 deletions app/electron/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,9 +695,10 @@ app.whenReady().then(() => {
return;
}
const ids = decodeURIComponent(new URL(item.webContents.getURL()).hash.substring(1)).split("\u200b");
if (ids.includes(data.options.rootID) || ids.includes(data.options.assetPath)) {
const options = JSON.parse(data.options);
if (ids.includes(options.rootID) || ids.includes(options.assetPath)) {
item.focus();
item.webContents.send("siyuan-open-file", data.options);
item.webContents.send("siyuan-open-file", options);
hasMatch = true;
return true;
}
Expand Down
38 changes: 33 additions & 5 deletions ...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20221223221636-ms2b4w9.sy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"Properties": {
"id": "20221223221636-ms2b4w9",
"title": "Flashcards",
"updated": "20230820185231"
"updated": "20231013104018"
},
"Children": [
{
Expand Down Expand Up @@ -87,7 +87,7 @@
"ListData": {},
"Properties": {
"id": "20230219092249-yzjjb1o",
"updated": "20230219092854"
"updated": "20231013104018"
},
"Children": [
{
Expand Down Expand Up @@ -132,20 +132,20 @@
},
"Properties": {
"id": "20230219092249-xdxmusm",
"updated": "20230219092407"
"updated": "20231013103949"
},
"Children": [
{
"ID": "20230219092249-04pxvxk",
"Type": "NodeParagraph",
"Properties": {
"id": "20230219092249-04pxvxk",
"updated": "20230219092407"
"updated": "20231013103949"
},
"Children": [
{
"Type": "NodeText",
"Data": "If the super block is set as a flashcard, the first sub-block of the super block will be regarded as a question, and the rest of the sub-blocks will be regarded as an answer"
"Data": "If a super block is set as a flashcard, the first sub-block of the super block will be regarded as a question, and the rest of the sub-blocks will be regarded as an answer"
}
]
}
Expand Down Expand Up @@ -178,6 +178,34 @@
]
}
]
},
{
"ID": "20231013103926-u4hxd38",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20231013103926-u4hxd38",
"updated": "20231013104018"
},
"Children": [
{
"ID": "20231013103926-o3y1n5a",
"Type": "NodeParagraph",
"Properties": {
"id": "20231013103926-o3y1n5a",
"updated": "20231013104018"
},
"Children": [
{
"Type": "NodeText",
"Data": "If a heading block is set as an flashcard, the heading block will be treated as a question and the blocks below it will be treated answers"
}
]
}
]
}
]
},
Expand Down
10 changes: 5 additions & 5 deletions app/guide/20210808180117-6v0mkxr/20230405172236-pg3l9eu.sy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"icon": "1f680",
"id": "20230405172236-pg3l9eu",
"title": "Performance Optimization",
"updated": "20230406155736"
"updated": "20231014100732"
},
"Children": [
{
Expand Down Expand Up @@ -393,7 +393,7 @@
"ListData": {},
"Properties": {
"id": "20230405172238-ba6rydi",
"updated": "20230405172238"
"updated": "20231014100732"
},
"Children": [
{
Expand Down Expand Up @@ -489,20 +489,20 @@
},
"Properties": {
"id": "20230405172238-2jjuvev",
"updated": "20230405172238"
"updated": "20231014100732"
},
"Children": [
{
"ID": "20230405172238-qnz5kn9",
"Type": "NodeParagraph",
"Properties": {
"id": "20230405172238-qnz5kn9",
"updated": "20230405172238"
"updated": "20231014100732"
},
"Children": [
{
"Type": "NodeText",
"Data": "Pictures and charts: Pictures and charts mainly affect the performance of the editor. If the document contains a large number of pictures and charts, the editor may freeze"
"Data": "Formulas, images and charts: Formulas, images and charts mainly affect the performance of the editor. If the document contains a large number of formulas, images and charts, the editor may freeze"
}
]
}
Expand Down
38 changes: 31 additions & 7 deletions ...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20221223215557-o6gfsoy.sy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"Properties": {
"id": "20221223215557-o6gfsoy",
"title": "闪卡",
"updated": "20230820185147"
"updated": "20231013103850"
},
"Children": [
{
Expand Down Expand Up @@ -87,7 +87,7 @@
"ListData": {},
"Properties": {
"id": "20230219085658-xnrf7rf",
"updated": "20230219092140"
"updated": "20231013103850"
},
"Children": [
{
Expand All @@ -112,11 +112,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "内容块"
},
{
"Type": "NodeText",
"Data": "中的 "
"Data": "内容块中的 "
},
{
"Type": "NodeTextMark",
Expand Down Expand Up @@ -186,6 +182,34 @@
]
}
]
},
{
"ID": "20231013103816-b0k440b",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20231013103816-b0k440b",
"updated": "20231013103850"
},
"Children": [
{
"ID": "20231013103816-sx34w1r",
"Type": "NodeParagraph",
"Properties": {
"id": "20231013103816-sx34w1r",
"updated": "20231013103850"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果将标题块设置为上卡，则该标题块会被视作问题，其下方块会被视作答案"
}
]
}
]
}
]
},
Expand Down
Loading

0 comments on commit 063e8ab

Please sign in to comment.