clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-21 19:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,353 Commits 76 Branches 197 Tags
f0b1d94de55a9ef2e4db6d634fa48c2041e1b4e9
Commit Graph

12353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyi Du
53e85ddffc ux: diff-merge switch & fix 2023-06-28 00:45:00 +08:00
Andelf
79093a8bb7 enhance(sync): add feature switch to diff-merge 2023-06-28 00:45:00 +08:00
Tienson Qin
38fc05278c fix: keyboard shortcut UI 2023-06-27 23:49:18 +08:00
Konstantinos Kaloutas
d5c53a4ac0 Merge branch 'master' into feat/pdf-shape 2023-06-27 11:53:30 +03:00
Mega Yu
4cbfb92432 add test 2023-06-27 14:14:13 +08:00
Mega Yu
690715cb80 fix paste text over a selected formatted link 2023-06-27 14:14:13 +08:00
Andelf
4e1b7dd2c1 fix(sync): code start base of diff-merge 2023-06-27 12:09:55 +08:00
Konstantinos Kaloutas
0b2304202b fix: dnd pdf ref 2023-06-26 21:48:14 +03:00
Konstantinos Kaloutas
db95712534 switch to simple pdf embed 2023-06-26 15:54:27 +03: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
Konstantinos Kaloutas
fcfd547ca0 Merge branch 'master' into feat/pdf-shape 2023-06-26 14:25:04 +03: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
Andelf
5a8e340db9 chore(ios): bump version 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
2d4017064f chore(deps/mldoc): update mldoc to fix heading :level issue 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
Junyi Du
59136312ad fix: upgrade diff-merge ver 2023-06-26 19:20:04 +08:00
Andelf
9349f1a994 chore(deps): update rsapi 2023-06-26 19:20:04 +08:00
Andelf
2374c0bfc2 fix(ios): watcher rel path handling 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
2cd8630f6b chore(deps): update rsapi, 2 stage merge 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
Konstantinos Kaloutas
aa39e5f6da Merge branch 'master' into feat/pdf-shape 2023-06-23 17:47:42 +03:00
queeup
cd28f94b43 i18n: update Turkish translation 2023-06-23 10:35:56 -04:00
Allan Chain
6d0033e645 chore: include katex resources from npm 2023-06-23 10:05:45 -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
Konstantinos Kaloutas
08f70c979e fix: preserve aspect ratio 2023-06-22 12:02:32 -04:00
Konstantinos Kaloutas
c4b44c9321 Merge branch 'master' into feat/pdf-shape 2023-06-22 16:09:28 +03: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
Gabriel Horner
299e2660a9 Merge pull request #9553 from logseq/feat/slash-command-for-code-block 
feat: add slash command for the code block
 2023-06-21 12:10:51 -04:00
Konstantinos Kaloutas
d3113a35c8 fix: drag n drop pdf ref 2023-06-21 13:24:49 +03:00
Konstantinos Kaloutas
afd31ce7b6 fix: preserve aspect ratio on resize 2023-06-21 11:22:11 +03:00
Konstantinos Kaloutas
340a037b3a Merge branch 'master' into feat/pdf-shape 2023-06-21 11:13:44 +03:00
Tienson Qin
00822dcf10 Merge branch 'master' into feat/slash-command-for-code-block 2023-06-21 13:40:14 +08:00
Bad3r
392ddf971f fix: test intermediate failure 2023-06-21 13:39:41 +08:00