1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Commit Graph

1278 Commits

Author SHA1 Message Date
Laurent Cozic
4fd20b1c5a Merge branch 'master' of github.com:laurent22/joplin 2020-06-03 23:55:29 +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
Laurent Cozic
0603f179cc Update translations 2020-06-02 19:40:28 +00:00
Laurent Cozic
794c8dd051 Update translations 2020-06-02 18:36:22 +00:00
Laurent Cozic
79c45af0d5 Merge branch 'master' into editable_resources 2020-06-02 17:32:21 +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
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
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
53eba3f062 Fixed handling of resource paths 2020-05-30 15:28:42 +01:00
Helmut K. C. Tessarek
097d4d5735
Update translations 2020-05-27 21:06:33 -04:00
Ivan Fadila Putra
89224c8f88
All: Translation : Add bahasa indonesia (id_ID.po) (#3246)
* Translation : translate to bahasa indonesia

* fix(translation) : change to one letter

* fix(translation) : consistency N -> T

* rm(unused) : remove unused files
2020-05-27 21:04:27 -04:00
yaozeye
22c0a219aa
All: Translation: Update zh_CN.po (#3288)
Translation added, error fixed & expression improved.
2020-05-27 21:00:09 -04:00
Laurent Cozic
40d39d6268
Desktop: Resolves #51: Add way to manually order notes by dragging them (#3235)
* Allow custom sorting

* Implement UI

* Set order from message box

* Fixed mistake

* Update NoteListItem.tsx

* Desktop: Fixed date popup dialog overflow issue inside info dialog
2020-05-27 17:21:46 +01:00
Laurent Cozic
8c338675d2 Desktop: Fixes #3267: Fixed issue with invalid image paths when config path contains spaces 2020-05-25 09:52:10 +01:00
Chillu1
d02513bb70
All: Translation: Update pl_PL.po (#3268) 2020-05-24 16:13:40 -04:00
Eike
b27a215c7f
All: Translation: Update de_DE.po (#3243)
* Updated German translation
 - Changed translation for Fail-safe from Störsicher to Fehlersicher

* Shorter WYSIWYG compatibility hint as per #3244
2020-05-22 17:49:54 -04:00
Laurent Cozic
a96734f5be Revert "Tools: Added eslint rule arrow-parens"
This reverts commit 0b6f5581f0.

It causes too many conflicts with pull requests.
2020-05-21 09:14:33 +01:00
Laurent Cozic
b1bb470b0a CLI: Disable support for HTML export for now as it does not work 2020-05-20 17:31:41 +01:00
Laurent Cozic
0b6f5581f0 Tools: Added eslint rule arrow-parens 2020-05-20 17:16:43 +01:00
Laurent Cozic
bec91863e2 All: Fixes #3234: Sync would fail in some cases due to a database error 2020-05-19 23:17:56 +01:00
Naveen M V
b3f32ffc59
Desktop: Resolves #2409: Add note history (back/forward buttons) (#2819) 2020-05-15 12:13:42 +01:00
Laurent Cozic
ecc50790ed Desktop: Refactor: Minor refactoring following counter feature update in a09c7b72c7 2020-05-15 11:52:59 +01:00
RedDocMD
a09c7b72c7
Desktop: Fixes #3009: Word/character counter includes Markdown syntax and HTML tags (#3037)
* Updated commit

* Update package.json

* Update package.json

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2020-05-15 11:28:31 +01:00
zawnk
91ec0dce37
Minor type in German translation (#3208) 2020-05-13 17:33:27 +01:00
Laurent Cozic
1aa2786ba0 CLI v1.0.164 2020-05-13 16:32:15 +01:00
Laurent Cozic
3265fafd76 Cli: Improve handling of encrypted items 2020-05-13 16:28:54 +01:00
Laurent Cozic
172327613f Doc: Clarify ID format 2020-05-10 17:52:53 +01:00
Siddhant Sehgal
0f8f7aeb14
Desktop: Fixes #3052: Fixed order of notebooks in "Move to notebook" dialog (#3084)
* Added Folder::sortFolderTree

* Added unit tests
2020-05-09 16:19:30 +01:00
Yuvaraj J
06eb389b21
CLI: Made layout configurable (#3069) 2020-05-09 16:12:09 +01:00
anirudh murali
57cf826e2c
All: Resolves #2915: Improve automatic title generation (#2955) 2020-05-09 15:55:00 +01:00
AlphaJack
7152344fe1
All: Translation: Update it_IT.po (#3172) 2020-05-07 00:32:51 -04:00
Renato Rosa
e06dd9c69f
Update locale pt_BR to add latest strings. (#3159) 2020-05-05 19:09:19 +01:00
Laurent Cozic
ec8ccc94aa Revert "Tests: Fix random failures (#2777)"
This reverts commit d1cab4b7f5.
Part of this revert: d2582f4fdf

For rationale see https://github.com/laurent22/joplin/pull/2819#issuecomment-616148984
2020-05-02 16:45:25 +01:00
mic704b
125fa8647a
All: Fix format of geolocation data (#2673)
* Maintain geolocation data format through serialization.

* Add test.
2020-04-30 16:56:47 +01:00
Xaris Ar
a5ec1be7d1
All: Translation: Update el_GR.po (#3128) 2020-04-25 16:09:12 -04:00
espinosa
f9f884a7f3
All: Translation: Update fr_FR.po (#3123)
* Partial translation in French

* Remplacé "décryptage" par "déchiffrage"
2020-04-25 13:12:20 -04:00
Helmut K. C. Tessarek
ac2635a363
Update translations 2020-04-21 08:03:29 -04:00
Arda Kılıçdağı
2496e6e738
All: Translation: Update tr_TR.po (#3104) 2020-04-21 07:41:31 -04:00
Gen Neko
b4b36c6f22
All: Translation: Update ja_JP.po (#3105) 2020-04-21 07:39:45 -04:00
mic704b
d1cab4b7f5
Tests: Fix random failures (#2777)
* Update new feature tests following test harness fixes.

* Fix lint errors.
2020-04-20 11:32:42 +01:00
Laurent Cozic
d2582f4fdf Revert "Restored note history feature by Naveen M V <naveenmv7@gmail.com>"
This reverts commit 61d3582357.

For rational see https://github.com/laurent22/joplin/pull/2819#issuecomment-616148984
2020-04-19 17:14:57 +01:00
Helmut K. C. Tessarek
381d757525
Update translations 2020-04-18 19:20:09 -04:00
Helmut K. C. Tessarek
d54c59cf74
fix nl_BE.po - for some reason the CI did not catch this 2020-04-18 19:19:22 -04:00