1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Commit Graph

1318 Commits

Author SHA1 Message Date
Laurent Cozic
3fbfba2c03 Merge branch 'master' of github.com:laurent22/joplin 2020-07-12 19:20:32 +01:00
Laurent Cozic
8a5e6875f0 Desktop, Cli: Fixes #3473: Fix filename when exporting notebook as Markdown 2020-07-12 19:13:08 +01:00
Vaidotas Šimkus
e11e57f1d8
All: Added support for hierarchical/nested tags (#2572)
The implementation uses / symbol as a nesting separator. I.e. tag/subtag is a nested tag, where tag is the parent tag and subtag is its child. Creating a tag named tag/subtag/subsubtag creates three tags, one for each level. The tags are associated using parent_id field.

In the app, viewing notes with a tag will also show all notes that are associated with any of the tag's descendant tags (same for the note count). Deleting a tag will also delete all its descendant tags.

In the desktop app the tags are shown nested just like the notebooks.
2020-07-12 18:09:07 +01:00
Laurent Cozic
e0a87d6253 Revert "All: Add support for sync target lock"
This reverts commit 51235f191d.

Not ready yet, moving to a branch
2020-07-12 16:38:54 +01:00
Laurent Cozic
51235f191d All: Add support for sync target lock
The goal is to allow locking a sync target so that maintenance
operations, such as upgrading the target to a more efficient format,
can be done. For now, only the lock mechanism is in place, as a way to
evaluate it, and to see if it can cause any issue.
2020-07-10 23:42:03 +01:00
Laurent Cozic
003ead2511 Clean up 2020-07-10 19:54:29 +01:00
Laurent Cozic
8dc8527fdc CLI v1.0.165 2020-07-10 19:52:58 +01:00
WhiredPlanck
4063cdba11
All: Translation: Update zh_CN.po (#3451)
* branch off from master

* fix typo and improve translations
2020-07-07 15:14:52 -04:00
WhiredPlanck
c96c591fa9
All: Translation: Update zh_TW.po (#3450)
* Update zh_TW.po

* fix typo and improve translations
2020-07-07 15:14:27 -04:00
Damien MASCRÉ
e092eaef6f
Updates to the french translation (#3466)
* Update french translation.

* Update french translation.
2020-07-07 15:09:30 +01:00
Laurent Cozic
77a03599de Desktop: WYSIWYG: Fixed inserting date time and other content inside header 2020-07-04 12:17:30 +01:00
Laurent Cozic
6046f40e45 Tools: Fixed tests following highlight.js upgrade (changed in HTML escape mode) 2020-07-03 22:30:33 +01:00
WhiredPlanck
a9390affaa
All: Translation: Update zh_CN.po (#3430)
* Update zh_CN.po

* Correct typo

* Correct typo: NextCloud --> Nextcloud; Improved translation

* Improved translation (2)
2020-06-30 10:30:09 -04:00
Laurent Cozic
acf1ff6d1d Desktop, Cli: Fixes #3402: Fixed import of checkboxes in ENEX files 2020-06-28 18:55:47 +01:00
Laurent Cozic
05acc51054 Desktop, Mobile: Fixes #3281: Prevent code highlighting from freezing the app in some cases 2020-06-28 18:31:43 +01:00
Laurent Cozic
eb8841379c Desktop, Cli: Fixes #2331: Only de-duplicate imported notebook titles when needed 2020-06-28 18:00:51 +01:00
Arda Kılıçdağı
0d2f253218
All: Translation: Update tr_TR.po (#3415) 2020-06-25 22:29:35 -04:00
rnbastos
349d020da2
All: Translation: Update pt_BR.po (#3408) 2020-06-25 22:28:28 -04:00
Gen Neko
f61c4c1374
All: Translation: Update ja_JP.po (#3394) 2020-06-21 12:14:59 -04:00
Helmut K. C. Tessarek
13417d15b7
Update en_US.po 2020-06-20 18:22:01 -04:00
Helmut K. C. Tessarek
9fe1f6acfc
Update translations 2020-06-20 18:21:11 -04:00
Derviš T
e796968ec0
All: Translation: Update bs_BA.po (#3390)
Finished translating new strings. Corrected the old ones that have changed since the last translation update.
2020-06-20 18:11:25 -04:00
rnbastos
a9cdecf599
Update pt_BR.po (#3382) 2020-06-20 12:21:05 +01:00
yaozeye
c6b5a5c328
Update zh_CN.po (#3387) 2020-06-20 12:20:40 +01:00
Laurent Cozic
e7f3aa3764 Updated British spelling 2020-06-20 12:18:41 +01:00
Laurent Cozic
fcd00b3212 Desktop, Cli: Fixed various bugs related to the import of ENEX files as HTML 2020-06-15 17:10:51 +01:00
Laurent Cozic
6a41d6e85a Cli: Allow importing ENEX files as HTML 2020-06-14 16:45:17 +00:00
Helmut K. C. Tessarek
c9c371b297
Update translations 2020-06-13 18:18:30 -04:00
Helmut K. C. Tessarek
d4f794920e
update de_DE.po 2020-06-13 18:17:07 -04:00
Helmut K. C. Tessarek
13b5ef36d7
Update translations 2020-06-13 17:47:15 -04:00
Laurent Cozic
9a9cfbd130 Mobile: Resolves #2595: Add undo/redo support 2020-06-13 16:20:18 +01:00
Rodgco
341c9ba64b
All: Translation: Update pt_BR.po (#3358) 2020-06-10 22:08:07 -04:00
Laurent Cozic
b7f5f848f2 All: Refactored themes to allow using the same ones in both desktop and mobile version
Will also allow using them when exporting HTML or PDF from CLI.
2020-06-10 22:08:59 +01:00
Laurent Cozic
faabd17fc6 Desktop: Fixed issue with setting filename for edited attachments 2020-06-09 19:15:43 +00:00
Laurent Cozic
be1895a080 Clipper: Fixes #3241: Handle certain special cases of ordered lists 2020-06-08 18:44:13 +01:00
Laurent Cozic
f36e0c2513 All: Fixes #3334: Prevent notebook to be the parent of itself 2020-06-07 12:47:43 +01:00
叡山电车
4a7c1f54d2
update zh_cn translation (#3332) 2020-06-06 10:10:41 +01:00
Naveen M V
643b06ffa7
Tools: Rewrite randomly failing test (#3328) 2020-06-05 16:05:47 +01:00
Arda Kılıçdağı
48098b5c06
Update tr_TR.po (#3327) 2020-06-04 18:34:30 +01:00
Laurent Cozic
afcfb0e341 Tools: Disabled tests that are randomly failing 2020-06-04 18:26:42 +01:00
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