1497 Commits

Author	SHA1	Message	Date
Laurent Cozic	b24d060281	All: Got clock sync to work on mobile	2020-09-09 12:25:31 +01:00
Laurent Cozic	a014b9347e	Merge branch 'release-1.0' of github.com:laurent22/joplin into release-1.0	2020-09-09 11:39:57 +01:00
Laurent Cozic	582ab4ac13	All: Implemented more reliable way to sync device and server clocks that would work with filesystem sync too	2020-09-09 11:39:13 +01:00
Laurent Cozic	c9adccad4a	Get NTP time working on Android	2020-09-09 10:56:17 +01:00
Laurent Cozic	f41ba67e15	Improved ntp time	2020-09-09 00:34:27 +01:00
Laurent Cozic	1f70a76c7e	Desktop: Fixes #3729: Fix lock issue when device does not have the right time	2020-09-08 23:57:48 +01:00
Laurent Cozic	30b8f5e2aa	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-09-04 18:01:05 +01:00
Laurent Cozic	569355a318	Mobile: Add startup screen to show progress of db migration	2020-09-04 17:07:57 +01:00
Laurent Cozic	874c1e3e82	Fixing mermaid script	2020-09-02 22:51:16 +01:00
Laurent Cozic	2530ecfc86	All: Fixes #3664: Fixed Katex font rendering	2020-09-02 22:48:24 +01:00
Laurent Cozic	6b49f1dfcc	Desktop: Fixes #3618: Fix links within Mermaid documents	2020-09-02 22:44:24 +01:00
Laurent Cozic	bdfb6b97f5	Desktop: Fixes #3645: Improved handling of startup errors, and prevent window from being invisible when upgrading sync target	2020-09-01 22:25:23 +01:00
Laurent Cozic	11646d1c21	Desktop: Added more logging info to sync target upgrade process	2020-08-29 19:12:02 +01:00
jonath92	39bffd2790	Regression: Fixed OneDrive synchronisation (#3674)	2020-08-28 09:46:41 +01:00
Naveen M V	82e96840e9	All: When searching, weight notes using Okapi BM25 score (#3454)	2020-08-18 23:53:28 +01:00
Laurent Cozic	619fa1d607	Revert "Desktop, Mobile: Add support for media player for video and audio files" ... Reverted as it now attempts to render note links as images. See: https://discourse.joplinapp.org/t/joplin-for-windows-1-0-234-bug/10558?u=laurent This reverts commit 13280ce1b3.	2020-08-18 21:52:00 +01:00
Laurent Cozic	656615b571	Merge branch 'dev' of github.com:laurent22/joplin into dev	2020-08-08 00:35:55 +01:00
jonath92	799a9e810d	All: Resolves #1266: Add support for OneDrive for Business (#3433)	2020-08-08 00:35:30 +01:00
alexchee	8c7a24282c	All: Fixes #3591: Fixed sync fetching issue (#3599)	2020-08-08 00:30:11 +01:00
Naveen M V	f99f3f8a6d	All: Resolves #1877: Add search filters (#3213)	2020-08-08 00:13:21 +01:00
Laurent Cozic	29fbafdfff	Mobile: Fixed issue when creating new notebook and going back	2020-08-07 02:03:33 +00:00
Laurent Cozic	c19f8c8035	Mobile: Fixes #3597: Fixed regression when saving a new notebook	2020-08-05 00:07:55 +01:00
Laurent Cozic	5ade9ff2f6	Tools: Updated eslint and clarified comma-dangle rule	2020-08-04 23:00:11 +01:00
Laurent Cozic	ee358f70dd	Desktop: Add version info to error screen	2020-08-02 16:21:30 +01:00
Laurent Cozic	0718828d60	Merge branch 'master' into dev	2020-08-02 16:12:11 +01:00
Laurent Cozic	7565f1cada	Fixed mobile version build	2020-08-02 12:38:36 +01:00
Laurent	0c147236a3	All: Add mechanism to lock and upgrade sync targets (#3524)	2020-08-02 12:28:50 +01:00
Anjula Karunarathne	88f22fabf7	Desktop: Added KeymapService to manage keyboard shortcuts (#3252)	2020-08-02 12:26:55 +01:00
Thatcher Chamberlin	5f46d60c5e	Desktop, Cli, Update Katex to v0.12.0 (#3571)	2020-08-02 12:24:03 +01:00
Laurent Cozic	13280ce1b3	Desktop, Mobile: Add support for media player for video and audio files ... Co-authored-by: Bryan <bryan.r.gerlach@gmail.com>	2020-08-02 12:03:49 +01:00
Laurent Cozic	baea44cbd6	Fixed mobile version build	2020-08-01 18:56:56 +01:00
Laurent Cozic	ed82390a8d	Desktop: Fixed toolbar button state when going from setting screen to main screen	2020-08-01 15:11:14 +01:00
Laurent Cozic	7a1707d864	Finished reverting hierarchical tag feature	2020-07-28 19:09:50 +01:00
Laurent Cozic	64d7603eed	Revert "All: Added support for hierarchical/nested tags (#2572)" ... This reverts commit e11e57f1d8.	2020-07-28 18:50:34 +01:00
Laurent Cozic	89e6b680a6	Revert "Desktop: Regression: Fix sort tags alphabetically in side-menu (#3489)" ... This reverts commit 10ff43f4f0.	2020-07-28 18:49:34 +01:00
Laurent Cozic	d209d5036b	Desktop, Cli: Security: Fixed a path traversal vulnerability in clipper server API that could allow an attacker to read or write an arbitrary file (CVE-2020-15844)	2020-07-24 00:45:15 +00:00
Laurent Cozic	d6daa34e0a	Linter	2020-07-23 23:06:58 +00:00
Laurent Cozic	9cebbbe7cf	Desktop, Cli: Fixed attachments being out of order when importing Enex file	2020-07-23 18:43:01 +01:00
Laurent Cozic	71e5304298	Desktop: Fixes #3534: Undoing changes multiple time on an existing note could result in a blank note	2020-07-23 19:56:53 +00:00
Laurent Cozic	8f8d11c9b3	Desktop: Fixes #3510: Note links would be broken after saving a note in Rich Text editor	2020-07-23 19:38:42 +00:00
Laurent Cozic	1cd86fd3ea	Cli: Fixes #3548: Desktop-only scripts were incorrectly being loaded in CLI server tool	2020-07-23 19:04:04 +00:00
Laurent Cozic	7f1f5a8c3d	Desktop: Fixes #3503: Editor window was no longer being resized with the main window	2020-07-22 23:26:45 +01:00
Caleb John	44d3a4213f	Desktop: Enable searching in editor rather than the viewer for CodeMirror (#3360)	2020-07-22 23:13:23 +01:00
Laurent Cozic	4bef79cd71	Desktop: Fixes #3407: In some cases, changes made to an attachment would not be saved. Also added banner to show that an attachment is being edited	2020-07-22 19:03:31 +01:00
Vaidotas Šimkus	17e140ba56	Api: Fixes #3539: Fixes nested tag API to handle calls with no 'fields' query key	2020-07-22 10:38:49 +01:00
Helmut K. C. Tessarek	ca0197a319	fix linter error (#3518)	2020-07-20 00:19:08 +01:00
Roman Musin	3807317e66	Mobile: Increase max resource size to 100mb (#3431)	2020-07-15 18:29:16 +01:00
Vaidotas Šimkus	10ff43f4f0	Desktop: Regression: Fix sort tags alphabetically in side-menu (#3489)	2020-07-15 18:28:40 +01:00
alexchee	9a55afec01	All: Add support for AWS S3 synchronisation (Beta) (#2815)	2020-07-15 10:22:55 +01:00
Laurent Cozic	657cebfda9	Desktop: Improved GotoAnything speed and made it safer ... Previously we'd use the remove-markdown package to create the note preview however this function would freeze on certain notes, and was probably unsafe as it used regex to parse Markdown. Replaced this in favour of Markdown-it along with htmlparser2 to strip all markup from a note.	2020-07-14 23:27:45 +01:00