Commit Graph

8089 Commits

Author SHA1 Message Date
Andelf
4e1b7dd2c1 fix(sync): code start base of diff-merge 2023-06-27 12:09:55 +08:00
Tienson Qin
eb49128f4b fix: disable hiccup export for heading/footer/etc when paste
Also, removes ending `-` when converting html to text
2023-06-26 19:56:22 +08:00
Junyi Du
da97d7620e fix: ast->diff-block pre-block meta raw-body 2023-06-26 19:20:04 +08:00
Andelf
a59ecb370d chore(deps): bump diff-merge to 0.1.0 2023-06-26 19:20:04 +08:00
Andelf
2c41d4a20d chore: cleanup debug print 2023-06-26 19:20:04 +08:00
rcmerci
e11b72a7c3 fix txid update when remote->local failed, add retry-count to remote->local-full-sync 2023-06-26 19:20:04 +08:00
Andelf
94ba175cd7 refactor: rewrite merge logic 2023-06-26 19:20:04 +08:00
Andelf
4c527f5c6d fix: wrong diff compare rules 2023-06-26 19:20:04 +08:00
Andelf
f5c95dee6d fix(diff-merge): org mode handling 2023-06-26 19:20:04 +08:00
Andelf
fd493bde0d fix(diff-merge): multi-line blocks format 2023-06-26 19:20:04 +08:00
Junyi Du
fb4e23bb95 fix: handle multi-line blocks spaces correctly 2023-06-26 19:20:04 +08:00
Andelf
5037483b25 fix(diff-merge): handle multi-line blocks for md 2023-06-26 19:20:04 +08:00
Andelf
9349f1a994 chore(deps): update rsapi 2023-06-26 19:20:04 +08:00
Andelf
2e9e771387 enhance(sync): deletion handling 2023-06-26 19:20:04 +08:00
Andelf
1cc9bb72aa feat(sync): impl 2-stage merge for mobile 2023-06-26 19:20:04 +08:00
Andelf
1c6fe4be82 enhance(sync): add merge step to update local 2023-06-26 19:20:04 +08:00
Gabriel Horner
4949a19b19 Tweak word to describe feature accurately 2023-06-23 15:39:51 -04:00
Bad3r
0b322b0f08 chore: replace 'presentation' with 'View as slide' 2023-06-23 15:39:51 -04:00
queeup
cd28f94b43 i18n: update Turkish translation 2023-06-23 10:35:56 -04:00
Gabriel Horner
43df7dfd9a Translate two translations that weren't usable by all langs
See #9716. Position matters for some langs like Turkish
2023-06-23 09:51:33 -04:00
Tienson Qin
31a0ed40bc fix: missing parameter 2023-06-22 12:51:43 +08:00
Tienson Qin
d95ae3a93f fix: disable content selection when blocks have been selected 2023-06-22 12:51:43 +08:00
Gabriel Horner
b1ee33d0f2 Fix git/version-control tab title from #9711
This changes the title from "Git" to "Version control" which makes the title
consistent like all other titles. It also makes it translatable like
other setting titles
2023-06-21 15:20:01 -04:00
greatbody
4cb80bad85 trans: add translations for Chinese zh-CN 2023-06-21 15:15:35 -04:00
greatbody
c91e116889 fix: Switch to: does not use i18n translation 2023-06-21 15:15:35 -04:00
greatbody
11cb2d151f fix: setting title does not use i18n translation 2023-06-21 15:15:35 -04:00
Tienson Qin
00822dcf10 Merge branch 'master' into feat/slash-command-for-code-block 2023-06-21 13:40:14 +08:00
charlie
7cc1c5aa5c enhance(plugin): support right sidebar item type as string 2023-06-21 13:06:34 +08:00
Gabriel Horner
1b0403bbaf Revert 3 titles that don't need translation from last PR
See https://github.com/logseq/logseq/pull/9680#discussion_r1235470813
for context
2023-06-20 16:19:23 -04:00
Mikhail Smelov
1d932f07c4 Enhance: Convert more of the UI to be translatable - settings, onboarding, bug-report, whiteboard, flashcards and search (#9680)
* Enhance: add translation strings

* Add search/command-palette strings

* add translation strings quick_tour

* FIX

* Add translation strings tour-whiteboard

* add translation strings settings-page

* add translation strings settings-page/git

* FIX

* add translation strings settings-page/sync

* FIX

* Add translation strings Flashcards

* FIX

* FIX: Add [frontend.context.i18n :refer [t]]

* Add translation strings :on-boarding/importing

* Add translation strings :on-boarding and FIX :on-boarding/importing

* Add translation strings :bug-report

* fix

* Fix link to flashcard documentation

---------

Co-authored-by: Gabriel Horner <gabriel@logseq.com>
2023-06-20 12:20:36 -04:00
Gabriel Horner
2432230c22 Some more query cleanup
Remove unused query-triggered atom, remove duplicative state in result
ns and rename query maps to query-m as query being used to refer to
multiple concepts - the query map and the :query inside a query map
2023-06-20 11:53:22 -04:00
Gabriel Horner
f82bbb5275 Refactored hairy block component by breaking out logical fns 2023-06-20 11:53:22 -04:00
Gabriel Horner
cb29fb6eae Revert change so that query functions can still work
Also add some docstring and slightly alter command name to reflect query
functions increased ability introduced with the related #9563
2023-06-20 11:53:22 -04:00
Tienson Qin
8ab497cb8a fix: reactive queries
Each block should have its own :query-result atom
2023-06-20 11:53:22 -04:00
Konstantinos Kaloutas
d277031918 fix: select all while editing blocks 2023-06-20 09:09:10 -04:00
Konstantinos Kaloutas
4f00e326ff feat: snap to grip 2023-06-20 09:09:10 -04:00
Gabriel Horner
028db2e7f2 Merge branch 'master' into feat/slash-command-for-code-block 2023-06-19 15:25:09 -04:00
queeup
083f5f69fc i18n: update Turkish translation 2023-06-19 13:27:50 -04:00
Charlie
741edecc57 Enhance(UX): marketplace (#9609)
* fix(ui): hidden proxy label for the default system proxy network mode

* improve(plugin): support option to enable/disable the auto-check the installed plugins

* fix(revert): codes

* improve(ux): add the auto-check updates switcher to the toolbar plugins manager

* improve(i18n): plugin-related i18n

* enhance(plugin): add Github proxy server for the plugin updates

* enhance(plugin): add Github proxy server for the plugin updates

* fix(ui): warning

* fix: typo

* fix(ui): hidden proxy label for the default system proxy network mode

* improve(plugin): support option to enable/disable the auto-check the installed plugins

* fix(revert): codes

* improve(ux): add the auto-check updates switcher to the toolbar plugins manager

* improve(i18n): plugin-related i18n

* enhance(plugin): add Github proxy server for the plugin updates

* enhance(plugin): add Github proxy server for the plugin updates

* fix(ui): warning

* fix: typo
2023-06-19 12:51:40 +08:00
Mikhail Smelov
6a22870d49 Enhance: Improve Russian (ru) translations (#9645)
* Enhance: Improve Russian (ru) translations

* Improved tutorial-ru.md and dummy-notes-ru.md

* Fix: :relaunch-confirm-to-work and :page/created(updated)-at

* FIX: whiteboard

* FIX

* add strings
2023-06-16 09:54:55 -04:00
Tienson Qin
327d0abdb3 fix: wrong position when editing a block from sidebar or whiteboard 2023-06-16 12:29:20 +08:00
Taylor Hoffmann
87c4667d95 chore: updated pt-BR translations (#9655)
* chore: language pt-br

* fix: removed lang duplications

* fix: added duplicated entries for "pt-br" and "en"
2023-06-15 14:40:09 -04:00
charlie
52c3278a5d fix(ui): polish the plugin settings modal 2023-06-16 00:30:41 +08:00
Gabriel Horner
144fc5196f Fix block hidden editable properties with user properties
Fixes
https://github.com/logseq/logseq/issues/9489#issuecomment-1590974141 .
Moved logic to util ns to simplify hairy component and test it
2023-06-16 00:11:06 +08:00
hasecilu
d34073c3b1 Fix translations 2023-06-15 11:45:27 -04:00
hasecilu
e826c83ebd Update Spanish translations 2023-06-15 11:45:27 -04:00
Tienson Qin
2d0f67429a enhance: pub-event! returns a promise (#9671)
enhance: pub-event! returns a promise

fix: typing 1.  sometimes can result in 1. 1.
2023-06-15 23:45:13 +08:00
Mikhail Smelov
eafca05387 Enhance: add translation strings to electron context menu; Settings (#9658)
* enhance: add translation strings to electron context menu

* Add translation strings to General settings

* FIX: :electron.context-menu/

* Add Tips

* Remove translations that can't be translated yet

---------

Co-authored-by: Gabriel Horner <gabriel@logseq.com>
2023-06-15 10:54:15 -04:00
Charlie
1696081bed Enhance(UX): polish details for the plugin fenced code block (#9590)
Add the ability for real-time rendering of fenced code block.
2023-06-14 21:49:00 +08:00
charlie
3e7bdda4bf fix(editor): incorrect behavior for the code editor of file page 2023-06-14 21:09:07 +08:00