1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-24 23:26:50 +02:00
Commit Graph

1940 Commits

Author SHA1 Message Date
b81b6135f6 Clean up unused optional parameter 2020-06-08 09:05:03 +01:00
583ac7960b Mobile: Dev fix: Add missing key 2020-06-08 09:02:14 +01:00
b749bb60fc Merge branch 'master' of github.com:laurent22/joplin 2020-06-08 09:02:04 +01:00
2c6a298758 Android: Fixes #3010: Request permissions if needed when exporting profile (#3202) 2020-06-08 09:01:11 +01:00
42544cc63b Mobile: Reduce side menu edge hit width
Due to this bug:

https://github.com/react-native-community/react-native-side-menu/issues/153

After rotating the device, the edge hit area is too large, more than 50%
of the note in some cases, which makes it difficult to scroll the note
or zoom.
2020-06-08 08:49:24 +01:00
d2b81d221b Mobile: Fixes #3343: Fixed issue when creating note then switching notebook (#3347) 2020-06-08 08:40:52 +01:00
618d8723d1 Android release v1.0.331 2020-06-08 07:53:49 +01:00
8058d3f728 Removed debug code 2020-06-08 07:43:09 +01:00
0bc10acf02 Mobile: Fixes #3344: Fixed regression that would cause links in notes to open within app itself 2020-06-08 07:41:04 +01:00
e5866e8aa6 ios-v10.0.48 2020-06-07 14:54:34 +01:00
b4e907ae77 Android release v1.0.330 2020-06-07 14:24:21 +01:00
ac0d01b724 Doc: Fixes #3330: Fixed various links in doc 2020-06-07 13:02:58 +01:00
40adbc5e9e Desktop: Resolves #3333: Improved escaping of Markdown titles in links 2020-06-07 12:55:40 +01:00
f36e0c2513 All: Fixes #3334: Prevent notebook to be the parent of itself 2020-06-07 12:47:43 +01:00
a8c8539e7a Desktop: Add option to choose Code Mirror as code editor (#3284) 2020-06-06 16:00:20 +01:00
334da21a3b Tools: Apply linter 2020-06-06 10:21:21 +01:00
0f4a781df0 Mobile: Fixes #3240: Fix geolocation
Co-authored-by: Roman Musin <musinrr@gmail.com>

Squashed commit of the following:

commit c3916ee544d2b59e6b0c760366a9a2b5f821b029
Author: Laurent Cozic <laurent@cozic.net>
Date:   Fri Jun 5 00:01:18 2020 +0100

    Fixed for iOS

commit 959a8b59d1
Author: Roman Musin <musinrr@gmail.com>
Date:   Thu Jun 4 21:56:43 2020 +0100

    Initialize keychain service when starting mobile app

commit 2b322352ed
Author: Roman Musin <musinrr@gmail.com>
Date:   Thu Jun 4 21:32:40 2020 +0100

    Mobile: fix geolocation
2020-06-05 00:08:09 +01:00
33ad0dce15 Android: Resolves #2896: Enable sharing to Joplin on Android (#2870) 2020-06-04 18:40:44 +01:00
a1364a621a Tools: Apply linter rules 2020-06-04 18:24:11 +01:00
d9c266e3f1 Merge branch 'master' of github.com:laurent22/joplin 2020-06-04 07:55:13 +01:00
4fd20b1c5a Merge branch 'master' of github.com:laurent22/joplin 2020-06-03 23:55:29 +01:00
0d5586b379 Desktop: Fixes #3227: Fix styling of note title in exported PDF and print 2020-06-03 23:55:08 +01:00
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
cfe1911723 All: Resolves #173: Upload attachments > 4 MB when using OneDrive (#3195) 2020-06-03 14:29:47 +01:00
560db37025 Tools: Added prefer-default-export eslint rule 2020-06-02 20:13:15 +00:00
dd557f66a5 Desktop: Create new notes with minimum set of properties to prevent a few minor bugs 2020-06-02 22:27:36 +01:00
0603f179cc Update translations 2020-06-02 19:40:28 +00:00
794c8dd051 Update translations 2020-06-02 18:36:22 +00:00
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
bfec890632 Update AsyncActionQueue.ts 2020-06-02 22:35:41 +01:00
bdbf2fe583 Refactoring and handle conflicts from edit watcher 2020-05-31 17:43:51 +01:00
36776cd615 Handle resource conflicts 2020-05-31 16:57:16 +01:00
1852d9291d Handle sync when resource has been edited 2020-05-31 00:31:29 +01:00
0e5a0fdbe5 Delete temp files and stop watching when switching notes 2020-05-30 17:49:29 +01:00
7e59c40091 Add delay before saving resource 2020-05-30 17:10:25 +01:00
53eba3f062 Fixed handling of resource paths 2020-05-30 15:28:42 +01:00
e43e3c198a Add support for editable resources 2020-05-30 13:25:05 +01:00
097d4d5735 Update translations 2020-05-27 21:06:33 -04:00
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
8c338675d2 Desktop: Fixes #3267: Fixed issue with invalid image paths when config path contains spaces 2020-05-25 09:52:10 +01:00
b126c761cd Desktop: Fixed portable app issue with resource paths 2020-05-25 00:30:29 +01:00
068dbfffd8 Revert "Desktop: Fixes #3260: 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
2c115cd074 Desktop: Fixes #3260: Fixed image loading issue in WYSIWYG on portable app 2020-05-23 23:30:18 +01:00
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
49451dba20 Desktop: Resolves #2665: Add support for system theme auto-switching 2020-05-21 00:47:38 +01:00
9f7eeb0510 Mobile: Resolves #2669: When attaching a file insert it at the current cursor position (#3189)
* When attaching an image/resource insert it at the current cursor position

* Correct argument order

* Address code review comments

* Another code review comment

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2020-05-20 17:46:01 +01:00
58396ea5ce Mobile: Dev fix: Added remove-markdown package 2020-05-20 17:40:38 +01:00
0b6f5581f0 Tools: Added eslint rule arrow-parens 2020-05-20 17:16:43 +01:00
01e0c0c21f Desktop: Made Markdown editor default again 2020-05-20 00:59:12 +01:00