1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-03 23:50:33 +02:00
Commit Graph

1593 Commits

Author SHA1 Message Date
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
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
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
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
bec91863e2 All: Fixes #3234: Sync would fail in some cases due to a database error 2020-05-19 23:17:56 +01:00
c568f5b33c Desktop: Resolves #3137: Switch to Font Awesome as icon library 2020-05-17 15:34:42 +01:00
d9601f3136 Desktop: Dev fix: Remove redundant handleHistory call. (#3216)
handleHistory calls have been moved out of the switch statement.
2020-05-16 13:42:27 +01:00
b3f32ffc59 Desktop: Resolves #2409: Add note history (back/forward buttons) (#2819) 2020-05-15 12:13:42 +01:00
ecc50790ed Desktop: Refactor: Minor refactoring following counter feature update in a09c7b72c7 2020-05-15 11:52:59 +01:00
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
7d767cf0c9 Mobile: Resolves #2327: Handle back button when sort popup is open (#3187) 2020-05-14 16:03:13 +01:00
3265fafd76 Cli: Improve handling of encrypted items 2020-05-13 16:28:54 +01:00
17fd8ee504 Mobile: Fixes #2685: Fix quick actions (#2796)
* Fix quick actions

* Receive quick actions when the app is cold-launched

* Force side menu close before creating quick note

* Fix react warning: Can't perform a react state update on an unmounted component

The warning was:
Warning: Can't perform a React state update on an unmounted component. This is a no-op, but it indicates a memory leak in your application. To fix, cancel all subscriptions and asynchronous tasks in the componentWillUnmount method.
    in NoteScreenComponent (created by Connect(NoteScreenComponent))
    in Connect(NoteScreenComponent) (at app-nav.js:74)

* Fix auto title generation for quick notes.

The previous version created a new provisional note but then while handling NAV_BACK at reduxSharedMiddleware:35 the list of provisional note ids was cleared so when NoteScreenComponent was being mounted later the note was no longer considered provisional and Joplin would not generate the note title from its contents.

* Check for quick action data to be present before processing.

For some reason sometimes it gets called with null.
2020-05-13 11:39:16 +01:00
dacf6377ae Desktop: WYSIWYG: Fixed UI translation issue for certain languages 2020-05-11 18:59:23 +01:00
41edae9719 All: Security: Fixes #3143: Filter SVG element event attributes to prevent XSS vulnerability 2020-05-10 16:51:15 +01:00
734f83470c Desktop, Mobile: Fixes #3109: Fixed background color on large Mermaid graphs (#3111) 2020-05-09 16:21:01 +01:00
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
06eb389b21 CLI: Made layout configurable (#3069) 2020-05-09 16:12:09 +01:00
17d2d6f959 Mobile: Fixed note title placeholder color (#3006)
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2020-05-09 16:07:47 +01:00
20e065a371 Mobile : Disabled the header items when no note is selected (#2988) 2020-05-09 16:01:39 +01:00
57cf826e2c All: Resolves #2915: Improve automatic title generation (#2955) 2020-05-09 15:55:00 +01:00
dbe8d3a68e Mobile: Fixed the switch background color on config screen (#2919) 2020-05-09 15:39:02 +01:00
5a174b2236 Mobile: Fixes #2875: Fixed notebook title text overflow (#2877)
* uses no_of_lines to fix the issue

* ellipsizeMode added
2020-05-09 15:33:06 +01:00