1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Commit Graph

4540 Commits

Author SHA1 Message Date
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 ()
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 
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
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) ()
* 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 ()
Translation added, error fixed & expression improved.
2020-05-27 21:00:09 -04:00
Helmut K. C. Tessarek
9eed42cea0
Update website 2020-05-27 20:46:53 -04:00
Helmut K. C. Tessarek
be24cbed2d
clarify, which install methods are supported/unsupported 2020-05-27 20:46:32 -04:00
Helmut K. C. Tessarek
aef3e0aead
Update website 2020-05-27 20:35:57 -04:00
Helmut K. C. Tessarek
7a06a41502
update section: install terminal application 2020-05-27 20:33:56 -04:00
Laurent Cozic
03948d185d Merge branch 'master' of github.com:laurent22/joplin 2020-05-27 17:22:13 +01:00
Laurent Cozic
40d39d6268
Desktop: Resolves : Add way to manually order notes by dragging them ()
* 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
Anjula Karunarathne
66f1506429
Documentation: Fixed some typos in COTRIBUTING.md ()
Fixes some typos and a broken anchor link in `CONTRIBUTING.md` file
2020-05-27 16:54:34 +01:00
j-krl
f19f148297 word choice 2020-05-25 20:18:13 -06:00
j-krl
79c6eb5503 Added to docs and rewrote LinkSelector as ts file 2020-05-25 20:14:38 -06:00
j-krl
1204bed80a Merge branch 'cli-shortcuts-ts' of https://github.com/j-krl/joplin into cli-shortcuts-ts 2020-05-25 20:10:04 -06:00
j-krl
dc91b1f7d6 Added to docs and rewrote LinkSelector as ts file 2020-05-25 20:09:53 -06:00
j-krl
66dc2b33de Added to docs and rewrote LinkSelector as ts file 2020-05-25 20:00:16 -06:00
Laurent Cozic
c97c337c79 Desktop: Fixed date popup dialog overflow issue inside info dialog 2020-05-25 17:37:37 +01:00
Laurent Cozic
0f7deeeac1 Desktp: Put back Edit in External Editor button 2020-05-25 11:37:45 +01:00
Laurent Cozic
8c338675d2 Desktop: Fixes : Fixed issue with invalid image paths when config path contains spaces 2020-05-25 09:52:10 +01:00
Laurent Cozic
b126c761cd Desktop: Fixed portable app issue with resource paths 2020-05-25 00:30:29 +01:00
Chillu1
d02513bb70
All: Translation: Update pl_PL.po () 2020-05-24 16:13:40 -04:00
Laurent Cozic
68e8d69d04 Tools: Trying to use "npm run dist" on CI 2020-05-24 15:27:30 +01:00
Laurent Cozic
4eb680d675 Electron release v1.0.216 2020-05-24 15:06:48 +01:00
Laurent Cozic
068dbfffd8 Revert "Desktop: Fixes : Fixed image loading issue in WYSIWYG on portable app"
This reverts commit 2c115cd074.

Reason: Fixed is not right and needs further testing on portable release
2020-05-24 15:05:38 +01:00
Laurent Cozic
d9ec2efa4b Merge branch 'master' of github.com:laurent22/joplin 2020-05-24 15:05:08 +01:00
Laurent Cozic
1c90e9dd7d Electron release v1.0.215 2020-05-24 15:04:33 +01:00
j-krl
811942d45e Merge branch 'cli-shortcuts' of https://github.com/j-krl/joplin into cli-shortcuts 2020-05-24 03:20:44 -06:00
j-krl
dbde239a25 formatting 2020-05-24 03:20:05 -06:00
j-krl
ab3ba3e2ca formatting 2020-05-24 03:11:45 -06:00
j-krl
79e77b5a10 removed personal comments 2020-05-24 02:44:24 -06:00
j-krl
c3395133c9 automatic page scrolling, docs updated 2020-05-24 02:38:14 -06:00
j-krl
b1d073cdeb next/prev link index is buggy on page change 2020-05-23 21:09:22 -06:00
Laurent Cozic
2c115cd074 Desktop: Fixes : Fixed image loading issue in WYSIWYG on portable app 2020-05-23 23:30:18 +01:00
Laurent Cozic
c99bd27e4d Desktop: Fixes : Fixed inserting templates into existing notes 2020-05-23 23:06:08 +01:00
j-krl
25d723b373 switched to class based implementation 2020-05-23 07:23:55 -06:00
Laurent Cozic
0cfceab151 Desktop: Fix undo issue when loading new note 2020-05-23 00:14:26 +01:00