self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-27 10:32:58 +02:00
Code Issues Releases Activity
4,675 Commits 244 Branches 1,267 Tags 543 MiB
88ac57d7f3
Commit Graph

4675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Musin
386d11f51a
Doc: Fix iOS log file name format is not rendered to html (#3326) 2020-06-04 11:02:01 +01:00
Laurent Cozic
39a506ad52 Desktop: Fixes #3324: Attaching an image, then cancelling the resize dialog, would crash the app 2020-06-04 09:08:13 +01:00
Laurent Cozic
d9c266e3f1 Merge branch 'master' of github.com:laurent22/joplin 2020-06-04 07:55:13 +01:00
Laurent Cozic
f4092c0824 Desktop: Dev fix: Only disable editor toolbar in preview mode 
Reverts 468261906a

Disabling the toolbar when the editor is not in focus means it
was disabled when trying to click on one of the button, because
the editor loses focus before the click event is processed.
 2020-06-03 23:59:45 +01:00
Laurent Cozic
4fd20b1c5a Merge branch 'master' of github.com:laurent22/joplin 2020-06-03 23:55:29 +01:00
Laurent Cozic
0d5586b379 Desktop: Fixes #3227: Fix styling of note title in exported PDF and print 2020-06-03 23:55:08 +01:00
Laurent Cozic
da77de0a08 Desktop: Fixes #3287: Disable middle-clicking external URLs, as they would open inside the application 2020-06-03 18:34:00 +01:00
叡山电车
dd34b155b4
Desktop: Fixes #3170: Always make the first item selected in Goto Anything (#3181) 2020-06-03 18:01:17 +01:00
Laurent Cozic
26ce102113
Desktop: Resolves #2773: Add support for system keychain to save sensitive settings (#3207) 2020-06-03 17:07:50 +01:00
叡山电车
5082181c49
Desktop: Fixes #3153: Make GotoAnyting work with East Asian charactors (#3180) 2020-06-03 17:06:14 +01:00
Laurent Cozic
0ee370303c Update geolocalisation info on French translation 2020-06-03 16:54:56 +01:00
jtagcat
720494d870
Doc: install_and_update: document --silent (#3262) 2020-06-03 16:43:47 +01:00
TheOnlyTrueJonathanHeard
cfe1911723
All: Resolves #173: Upload attachments > 4 MB when using OneDrive (#3195) 2020-06-03 14:29:47 +01:00
lscolombo
b2318b1f9f
Doc: Changed favicon.ico for latest Joplin logo (#3321) 
Co-authored-by: lscolombo <lucianasoclolombo@gmail.com>
 2020-06-03 14:25:00 +01:00
Laurent Cozic
560db37025 Tools: Added prefer-default-export eslint rule 2020-06-02 20:13:15 +00:00
Laurent Cozic
dd557f66a5 Desktop: Create new notes with minimum set of properties to prevent a few minor bugs 2020-06-02 22:27:36 +01:00
Laurent Cozic
0603f179cc Update translations 2020-06-02 19:40:28 +00:00
Laurent Cozic
21fcaf621d Tools: Improve how translations are built to make sure no translation is missed 2020-06-02 19:33:08 +00:00
Laurent Cozic
794c8dd051 Update translations 2020-06-02 18:36:22 +00:00
Laurent Cozic
f020b571da Update website 2020-06-03 11:41:02 +01:00
Laurent Cozic
071ea5854f
Desktop: Resolves #279: Add support for editable resources (#3305) 
* Add support for editable resources

* Fixed handling of resource paths

* Add delay before saving resource

* Delete temp files and stop watching when switching notes

* Handle sync when resource has been edited

* Handle resource conflicts

* Refactoring and handle conflicts from edit watcher

* Added test unit for conflict handling when deleting resource

* Trying to fix Travis-ci test units

* Fixed typo

* Update TinyMCE.tsx

* Update AsyncActionQueue.ts
 2020-06-02 22:43:06 +01:00
Laurent Cozic
bfec890632
Update AsyncActionQueue.ts 2020-06-02 22:35:41 +01:00
Laurent Cozic
3bb9d2efd6
Update TinyMCE.tsx 2020-06-02 22:35:05 +01:00
Laurent Cozic
e117b6f732 Fixed typo 2020-06-02 17:50:43 +01:00
Laurent Cozic
710026c8ac Fixed typo 2020-06-02 17:50:24 +01:00
Laurent Cozic
79c45af0d5 Merge branch 'master' into editable_resources 2020-06-02 17:32:21 +01:00
Laurent Cozic
a75db94da5 Desktop: Fixes #3302: Prevent drag and dropping of text in editor as it can lead to data loss 2020-06-01 21:30:51 +00:00
Laurent Cozic
468261906a Desktop: Fixes #3298: Fixed shortcut to focus Note List when editor is in focus 2020-06-01 21:24:14 +00:00
Laurent Cozic
3f1c9c989b Desktop: Fixes #3286: Disable editor toolbar when editor is not in focus 2020-06-01 21:01:10 +00:00
叡山电车
3b40de1962
Desktop: Fixes #3171: Fixed issue with accentuated letters in GotoAnything (#3183) 
* fix #3171

* fix problem when searching with diacritics
 2020-06-02 16:57:24 +01:00
lscolombo
2dda1c82c5
All: Translation: Update es_ES.po (#3316) 
Added translations  and corrected others marked as 'Needs work'

Co-authored-by: lscolombo <lucianasoclolombo@gmail.com>
 2020-06-01 23:47:30 -04:00
dsp77
4bc4d41728
All: Translation: Update de_DE.po (#3315) 
* Added German translations

- Added missing translations
- Motified a few translations
- There is the question whether to translate the English "theme" to a
German word or keep its English version.

* Adjusted translation
 2020-06-01 23:45:46 -04:00
Gen Neko
c8c160d912
All: Translation: Update ja_JP.po (#3314) 
* All: Translation: Update ja_JP

* Translate new strings

* Explicitly specify an access key for menu items

* Fix an error in the previous commit
 2020-06-01 23:43:37 -04:00
Fathy AR
99354f7dbe
All: Translation: Update id_ID.po (#3309) 2020-06-01 23:43:02 -04:00
Laurent Cozic
279310f9a5
Tools: Fixed Linux build issue due to icon error (#3311) 2020-06-01 10:19:16 +01:00
Laurent Cozic
d0de79bffa Trying to fix Travis-ci test units 2020-05-31 21:07:24 +01:00
Laurent Cozic
fbd42726c0 Added test unit for conflict handling when deleting resource 2020-05-31 20:22:55 +01:00
Laurent Cozic
dfe02fbe96 macOS: Improved appearance of application icon 2020-05-31 17:50:41 +01:00
Laurent Cozic
a8cffb9ac8 Revert "macOS: Improved appearance of application icon" 
This reverts commit 334347abcf.
 2020-05-31 17:46:19 +01:00
Laurent Cozic
bdbf2fe583 Refactoring and handle conflicts from edit watcher 2020-05-31 17:43:51 +01:00
Laurent Cozic
36776cd615 Handle resource conflicts 2020-05-31 16:57:16 +01:00
Laurent Cozic
1852d9291d Handle sync when resource has been edited 2020-05-31 00:31:29 +01:00
Laurent Cozic
0e5a0fdbe5 Delete temp files and stop watching when switching notes 2020-05-30 17:49:29 +01:00
Laurent Cozic
7e59c40091 Add delay before saving resource 2020-05-30 17:10:25 +01:00
Laurent Cozic
53eba3f062 Fixed handling of resource paths 2020-05-30 15:28:42 +01:00
Laurent Cozic
334347abcf macOS: Improved appearance of application icon 2020-05-30 15:12:32 +01:00
Laurent Cozic
e43e3c198a Add support for editable resources 2020-05-30 13:25:05 +01:00
Ron Alleva
a8b8da4732
Doc: Update the faq for VSCode and Sublime (#3295) 
This updates the sublime text and VSCode commands to add options which
make them wait before closing. This is borrowed from how you set a
different editor for git commit messages, described by github here:
https://help.github.com/en/github/using-git/associating-text-editors-with-git

This should address #2425
 2020-05-29 10:04:44 +01:00
Helmut K. C. Tessarek
ea57f5655c
Update website 2020-05-28 22:31:55 -04:00
Helmut K. C. Tessarek
68496bd1a1
terminal.md: clarify install methods 2020-05-28 22:30:55 -04:00