1326 Commits

Author	SHA1	Message	Date
Laurent Cozic	53b4d7af68	Server: Improve installation instructions	2021-07-25 12:03:23 +01:00
Laurent Cozic	3a3aa701ac	Desktop, Cli: Fixes #5232: Do not export share properties	2021-07-25 11:51:50 +01:00
Laurent Cozic	830712a3bb	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-25 11:15:54 +01:00
Laurent Cozic	dd1f90819c	Server: Fixes #5229: Published notes that contain non-alphabetical characters could end up being truncated	2021-07-25 11:13:27 +01:00
JackGruber	2ed8ac91a9	Server: Add Docker major, minor and beta version tags (#5237)	2021-07-25 10:38:36 +01:00
Helmut K. C. Tessarek	31c3093700	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-24 19:11:27 -04:00
Vaso3	769094f002	All: Translation: Update sr_RS.po (#5234) ... * Update sr_RS.po Added and improved translation in the first 3k lines of the file * Update sr_RS.po Added translation. * Update sr_RS.po Few minor changes and fixed broken string. * Update sr_RS.po Some more corrections * Update sr_RS.po * Update sr_RS.po	2021-07-24 19:10:34 -04:00
Helmut K. C. Tessarek	a60d9fa61f	All: Translation: Update pt_BR.po (thanks kuroppi)	2021-07-24 18:28:20 -04:00
Laurent Cozic	6499ca8e61	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-24 18:57:29 +01:00
Laurent Cozic	2b64b320fb	Fixed tests	2021-07-24 18:56:30 +01:00
Laurent Cozic	282f782d50	Server: Fixed certain URLs	2021-07-24 18:34:42 +01:00
Laurent Cozic	5fcf2e48b3	Server v2.2.8	2021-07-24 17:56:36 +01:00
Laurent Cozic	63d4ccdc61	Merge branch 'dev' into release-2.2	2021-07-24 17:55:41 +01:00
Laurent Cozic	19b45de298	Server: Added form tokens to prevent CSRF attacks	2021-07-24 17:45:30 +01:00
Laurent Cozic	b7e9848428	Server: Allow users to cancel Stripe subscription	2021-07-24 16:44:50 +01:00
Laurent Cozic	3f993af7fd	Server: Explain how to use Joplin Server with a Joplin app	2021-07-24 15:14:07 +01:00
Ahmad Mamdouh	d3c1edc3ee	Fix wrong variable name (#5235)	2021-07-24 10:41:39 +01:00
Vaso3	471c06b3fd	All: Translation: Update sr_RS.po (#5218) ... * Update sr_RS.po Added and improved translation in the first 3k lines of the file * Update sr_RS.po Added translation. * Update sr_RS.po Few minor changes and fixed broken string.	2021-07-23 15:51:51 -04:00
Laurent Cozic	e83ab93644	Server: Allow user to upgrade account	2021-07-23 20:34:30 +01:00
Laurent Cozic	75a421edb1	Server: Allow admin to change Stripe subscription	2021-07-23 17:03:49 +01:00
Laurent Cozic	07d2a60c75	Plugins: Add support for loading application chrome and note CSS from the plugin	2021-07-23 11:05:21 +01:00
Laurent Cozic	252d0695a4	Server: Handle Stripe webhook receiving multiple times the same event	2021-07-22 21:54:21 +01:00
Laurent Cozic	27c3cbdf8f	Server: Allow enabling or disabling a user. Handle cancelling subscription.	2021-07-22 17:32:10 +01:00
David Beale	52e1a05f4d	Tools: Remove es module entry points from Turndown packages, as they are not being included in the dist (#5226)	2021-07-22 10:51:19 +01:00
Ahmad Mamdouh	c89037b4a2	Plugins: Add ability to make dialogs fit the application window (#5219)	2021-07-22 10:21:57 +01:00
reportxx	f611d7734b	All: Translation: Update sv.po (#5221)	2021-07-21 14:27:50 -04:00
balmag	366ef025dc	All: Translation: Update hu_HU.po (#5215) ... Update Hungarian language file	2021-07-20 13:09:18 -04:00
Laurent Cozic	75cc73cc0c	Desktop, Cli: Fixes #5213: Import highlighted text from ENEX files	2021-07-20 10:39:20 +01:00
milotype	9ac56b3754	All: Translation: Update hr_HR.po (#5206)	2021-07-19 10:37:27 -04:00
Laurent Cozic	d4cdebafeb	Doc: Automatic generation of responsive images	2021-07-19 14:37:59 +01:00
Laurent Cozic	1194f6879f	Doc: Display Joplin Cloud links	2021-07-19 10:58:21 +01:00
Laurent Cozic	37ad6132b8	Desktop release v2.2.2	2021-07-19 10:45:30 +01:00
Laurent Cozic	2d92a0f1a0	Merge branch 'dev' into release-2.2	2021-07-19 10:45:03 +01:00
Laurent Cozic	d469ac174c	Merge branch 'release-2.1' into dev	2021-07-19 10:42:22 +01:00
Laurent Cozic	882d66383b	Desktop release v2.1.9	2021-07-19 10:40:12 +01:00
Laurent Cozic	cafaa9cac5	All: Ensure that timestamps are not changed when sharing or unsharing a note	2021-07-19 10:27:43 +01:00
Laurent Cozic	b2de27b6fc	Desktop: Make sure clipper authorisation notification is displayed, even when in config screen	2021-07-19 09:46:32 +01:00
小骏	73c75a8071	All: Translation: Update zh_CN.po (#5203) ... * update zh_CN.po * update zh_CN.po * update zh_CN.po * update zh_CN.po	2021-07-18 14:52:14 -04:00
balmag	d2df19ed0c	All: Translation: Update hu_HU.po (#5195)	2021-07-16 17:11:43 -04:00
Helmut K. C. Tessarek	62903874b5	Update translations	2021-07-16 14:18:48 -04:00
Laurent Cozic	4567b78f0c	Server: Clarify error message when user info cannot be saved	2021-07-16 17:05:15 +01:00
Laurent Cozic	92520e58fb	Server: Set default of env SUPPORT_EMAIL to "SUPPORT_EMAIL" to make it clear it needs to be set	2021-07-16 16:56:21 +01:00
Laurent Cozic	7245aead39	Server: Make sure email URLs are displayed as clickable links	2021-07-16 16:37:18 +01:00
Laurent Cozic	9823ac3379	Tools: Fixed server test user creation	2021-07-16 16:35:58 +01:00
Laurent Cozic	7a164b9b87	Fixing mobile build	2021-07-16 15:50:33 +01:00
Laurent Cozic	e125430748	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-16 14:32:09 +01:00
Laurent Cozic	ed8a928a8e	Fix mobile build	2021-07-16 14:30:52 +01:00
Roman Musin	7f709c210c	Remove unused condition in synchronizer (#5194)	2021-07-16 11:48:54 +01:00
Laurent	8e4be78013	Desktop: Make Markdown editor styling closer to view styling (#5174)	2021-07-16 11:32:29 +01:00
Laurent Cozic	58c4f9eded	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-16 11:13:50 +01:00
Xavi Ivars	2c525c2163	All: Translation: Update ca.po (#5193)	2021-07-15 13:29:02 -04:00
stephan11H	68f119efbd	All: Translation: Update de_DE.po (#5186) ... * update german translation file * update German translation file * changed translation for *full changelog* Co-authored-by: Stephan Hildebrand <stephan.hildebrand@rwth-aachen.de>	2021-07-15 12:51:33 -04:00
Elaborendum	e88753c609	All: Translation: Update es_ES.po (#5190)	2021-07-15 12:49:27 -04:00
Laurent Cozic	8395d5daa9	Mobile: Added new beta editor based on CodeMirror 6	2021-07-13 19:13:13 +01:00
Laurent Cozic	e01a17528a	Mobile: Removed old editor code	2021-07-12 14:00:51 +01:00
Laurent Cozic	b929a44bd5	Tools: Fixed iOS build for XCode 12 ... Ref: https://stackoverflow.com/a/67314652/561309	2021-07-12 13:51:23 +01:00
Laurent Cozic	4ceca9e44c	Doc: Clean up styling and bug fixes	2021-07-12 10:37:58 +01:00
Laurent Cozic	6a93cb289e	Server: Moved email templates to separate files	2021-07-11 22:11:20 +01:00
Laurent Cozic	952b2b3427	Server v2.2.7	2021-07-11 18:32:05 +01:00
Laurent Cozic	ff8f230555	Renamed "Share note" to "Publish note"	2021-07-11 18:08:42 +01:00
Laurent Cozic	1808367d78	comment	2021-07-11 18:05:51 +01:00
Laurent Cozic	89f4ca14e8	Server: Fixed mail queue as some emails were not being processed	2021-07-11 18:03:44 +01:00
Laurent Cozic	f761bad6bb	Tools: Jest slow threshold	2021-07-11 16:30:50 +01:00
Laurent Cozic	62b619865a	Server: Added support for resetting user password	2021-07-11 16:28:07 +01:00
Laurent Cozic	240cb35756	Server: Check password complexity	2021-07-11 15:04:01 +01:00
Laurent Cozic	f8d2c26c8e	Server: Disallow changing email address until a secure solution to change it is implemented	2021-07-11 11:35:49 +01:00
Laurent Cozic	67a000add9	Doc: Tweak welcome notes	2021-07-10 16:55:34 +01:00
Laurent Cozic	f0c3a7313c	Doc: Improved Welcome notes	2021-07-10 16:27:14 +01:00
Laurent Cozic	54130bb4af	Doc: Fixed download page on mobile and other tweaks	2021-07-10 12:40:48 +01:00
Laurent Cozic	e3db3871b6	Doc: Added cache buster timestamp to CSS and JS files	2021-07-10 11:29:18 +01:00
Laurent	5214da0a44	Doc: Added new website front page and moved doc under /help (#5169)	2021-07-10 11:16:13 +01:00
Laurent Cozic	4e0ff1f81f	Desktop release v2.2.1	2021-07-09 18:09:39 +01:00
Laurent Cozic	aa4f1146ca	Server v2.2.6	2021-07-09 16:58:19 +01:00
Laurent Cozic	5a27d4dc31	Server: Fixed change processing logic	2021-07-09 16:52:23 +01:00
Philipp Keck	bc97bb242a	Desktop: Add keyboard shortcuts for inserting lists in Rich Text editor (#5137)	2021-07-09 10:48:50 +01:00
Lee Matos	47b283a367	iOS: Fixed dark theme in iOS (#5165)	2021-07-09 10:44:35 +01:00
JackGruber	41f01dcc34	Server: Add Docker image labels (#5158)	2021-07-08 14:04:03 +01:00
Arda Kılıçdağı	ed7face070	Turkish Translations updated (#5156) ... Turkish translations updated for the last version	2021-07-06 14:03:46 +01:00
Philipp Keck	6f836b372d	Desktop: Fixes #4243: Fix double-paste also on Linux (#5143) ... See https://github.com/laurent22/joplin/issues/4243. Tested that it fixes the issue on Linux Mint with KDE.	2021-07-06 14:03:17 +01:00
Siddharth Magadum	6cfd868b44	Desktop: Fixes #4524: Empty note list panel does not scale with the note content panel (#5141)	2021-07-06 14:02:22 +01:00
John Freeman	3430f0bcae	Plugins: Fix type of PostMessageHandler (#5138)	2021-07-06 14:00:51 +01:00
mbalint	4ae5108717	Desktop: Fixes #5111: Joplin crashes when trying to Change application layout (#5134)	2021-07-06 13:57:48 +01:00
Laurent Cozic	bddbc0b54e	ios-v12.1.2	2021-07-06 11:32:25 +01:00
Laurent Cozic	af15b8359b	Doc: Updated website template	2021-07-04 18:14:32 +01:00
Laurent Cozic	6c1a6b0a61	Server: Fixed styling of shared note	2021-07-04 16:17:09 +01:00
Laurent Cozic	f3359158b9	Server v2.2.5	2021-07-03 22:40:48 +01:00
Laurent Cozic	e210926340	Server: Make app context immutable and derive the per-request context properties from it	2021-07-03 22:39:54 +01:00
Laurent Cozic	492c5851e3	Server v2.2.4	2021-07-03 22:11:29 +01:00
Laurent Cozic	238cc86590	Server: Fixed issue with user sessions being mixed up	2021-07-03 22:08:50 +01:00
Laurent Cozic	51d5e57b9f	Server v2.2.3	2021-07-03 20:38:51 +01:00
Laurent Cozic	264f36f257	Server: Fixed size of a database field	2021-07-03 20:37:27 +01:00
Laurent Cozic	082c8ffecb	Server v2.2.2	2021-07-03 19:28:47 +01:00
Laurent Cozic	c420ad4392	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-03 19:28:20 +01:00
Laurent Cozic	8883df24df	Server: Only emit "created" event when new user is saved	2021-07-03 19:24:23 +01:00
Laurent Cozic	d99c34f1dd	Server: Improved logging and reliability of cron tasks	2021-07-03 19:23:43 +01:00
Laurent Cozic	34a0b2abb7	Merge branch 'release-2.1' into dev	2021-07-03 17:06:43 +01:00
Laurent Cozic	ab8dbcc73d	Clipper release v2.1.3	2021-07-03 17:03:06 +01:00
Laurent Cozic	5258cc335a	Clipper: Fixes #5130: Clipper does not remember notebook	2021-07-03 17:01:36 +01:00
Laurent Cozic	7d9a222fbb	Server v2.2.1	2021-07-03 16:41:57 +01:00
Laurent Cozic	0bc892e40e	Setup version 2.2	2021-07-03 16:40:44 +01:00
Laurent Cozic	125af75b93	Server: Remove dangerous "Delete all" button for now	2021-07-03 16:30:40 +01:00
Laurent Cozic	3d18514c3c	Server: Display max size info in dashboard	2021-07-03 16:24:36 +01:00
Laurent Cozic	7447793e77	Server: Hide "Is Admin" from dashboard	2021-07-03 16:10:15 +01:00
Laurent Cozic	427218b1f4	Server: Normalize email addresses before saving them	2021-07-03 16:06:05 +01:00
Laurent Cozic	b507fbf837	Server: Add support for account max total size	2021-07-03 15:27:55 +01:00
Laurent Cozic	b0e9b0e042	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-03 15:27:14 +01:00
Laurent Cozic	a53a6e6f15	Merge branch 'release-2.1' into dev	2021-07-03 09:35:01 +01:00
Laurent Cozic	e08a909bdb	Android release v2.1.4	2021-07-03 09:31:15 +01:00
Laurent Cozic	bfa7ea7871	Server: Moved Joplin-specific context properties under its own namespace	2021-07-02 18:53:45 +01:00
Laurent Cozic	94ea177b76	Desktop release v2.1.8	2021-07-02 18:17:37 +01:00
Laurent Cozic	07ea79bb46	Desktop: Fixed issue where untitled notes where created after a note had been shared and synced	2021-07-02 18:17:08 +01:00
Laurent Cozic	f792fbb5fc	Desktop: Fixes #5133: Items keep being uploaded to Joplin Server after a note has been shared	2021-07-02 18:17:01 +01:00
Laurent Cozic	8e789ee2ee	Desktop: Fixed issue where untitled notes where created after a note had been shared and synced	2021-07-02 18:14:49 +01:00
Laurent Cozic	d34a92d581	Desktop: Fixes #5133: Items keep being uploaded to Joplin Server after a note has been shared	2021-07-02 17:53:36 +01:00
Gen Neko	5ee2ffe174	All: Translation: Update ja_JP.po (#5132)	2021-06-30 16:14:33 -04:00
小骏	1209cc6872	All: Translation: Update zh_CN.po (#5128) ... * update zh_CN.po * update zh_CN.po * update zh_CN.po	2021-06-28 14:24:36 -04:00
Laurent Cozic	ac800af9f8	Merge branch 'release-2.1' into dev	2021-06-28 13:22:18 +01:00
Laurent Cozic	7ed1a453e5	Clipper release v2.1.2	2021-06-28 11:40:53 +01:00
Laurent Cozic	55248ed08b	Clipper: Fixed auth mechanism when extension popup is closed before process is finished	2021-06-28 11:39:31 +01:00
Laurent Cozic	d5becfa0ae	Merge branch 'release-2.1' into dev	2021-06-27 16:55:50 +01:00
Laurent Cozic	1476cdf467	CLI v2.1.2	2021-06-27 16:52:03 +01:00
Laurent Cozic	6a5629391b	Merge branch 'release-2.1' into dev	2021-06-27 15:29:35 +01:00
Laurent Cozic	b77f9388b0	CLI v2.1.1	2021-06-27 15:08:54 +01:00
Laurent Cozic	c3f4f22a2c	Releasing sub-packages	2021-06-27 15:06:36 +01:00
Laurent Cozic	c9f7d6483f	Clipper release v2.1.1	2021-06-27 14:56:04 +01:00
Laurent Cozic	de9d7f747f	ios-v12.1.1	2021-06-27 14:43:07 +01:00
Laurent Cozic	a04e7b7d8d	Android release v2.1.3	2021-06-27 14:33:22 +01:00
Laurent Cozic	00b39e4671	Plugins: Add support for gotoAnything command so that it can be called from plugins	2021-06-27 14:14:11 +01:00
Laurent Cozic	04c4015c85	Desktop release v2.1.7	2021-06-26 10:20:22 +01:00
Laurent Cozic	3d03321328	All: Activate Joplin Server optimisations	2021-06-26 10:19:48 +01:00
Laurent Cozic	78f001eb9d	Desktop release v2.1.6	2021-06-26 09:13:18 +01:00
Laurent Cozic	8e35841d79	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-25 09:28:26 +01:00
JackGruber	8cbcb78ad1	All: Resolves #3871: Interpret only valid search filters (#5103)	2021-06-24 13:24:54 +01:00
Roman Musin	5047cf1027	Android: Disable backup to Google Drive (#5114) ... Ref: https://discourse.joplinapp.org/t/cant-do-a-clean-re-install-on-android-using-joplin-cloud	2021-06-24 13:24:03 +01:00
Laurent Cozic	5ecac211ae	All: Fixed search when the index contains non-existing notes	2021-06-24 13:22:35 +01:00
Laurent Cozic	65d87220de	Server v2.1.6	2021-06-24 11:01:59 +01:00
Laurent Cozic	f86879778b	Server: Fixed accessing main website (Regression)	2021-06-24 11:00:31 +01:00
Laurent Cozic	5390e100e6	Server v2.1.5	2021-06-24 09:26:53 +01:00
Laurent Cozic	51f3c0016e	All, Server: Add support for X-API-MIN-VERSION header	2021-06-24 09:25:58 +01:00
Laurent Cozic	752d118e5d	lock file	2021-06-24 08:59:05 +01:00
Laurent Cozic	c2cd1733cc	Server v2.1.4	2021-06-24 08:26:20 +01:00
Deun Lee	fe83491eab	All: Translation: Update ko.po (#5112)	2021-06-23 12:37:11 -04:00
Laurent Cozic	6cbdad0690	Tools: Exit with error code 1 when macOS notarization fails	2021-06-23 15:27:06 +01:00
Laurent Cozic	96931877cf	Desktop: Fix: Notes would appear to be in the wrong notebook after having been shared	2021-06-23 14:38:14 +01:00
Laurent Cozic	b92ab2b8cc	Desktop release v2.1.5	2021-06-23 14:01:15 +01:00
Laurent Cozic	e9f5ca817b	Desktop: Resolves #4905: Apply monospace font to code dialog in Rich Text editor	2021-06-23 12:35:37 +01:00
Laurent Cozic	dc9bb26c1a	Clipper: Resolves #4785: Updated Readability library to v0.4.1	2021-06-23 12:16:07 +01:00
Laurent Cozic	0019bd147a	Desktop, Cli: Fixes #4965: Handle special type of code block when importing ENEX files	2021-06-23 11:55:10 +01:00
Laurent Cozic	118a2f9f25	All: Also allow disabling TLS errors for Joplin Cloud to go around error UNABLE_TO_GET_ISSUER_CERT_LOCALLY	2021-06-23 11:37:50 +01:00
Laurent Cozic	46868e6b25	Desktop release v2.1.4	2021-06-22 19:57:50 +01:00
Laurent Cozic	67d9977489	Desktop, Clipper: Web Clipper now must request authorisation before accessing the application data	2021-06-22 19:57:04 +01:00
Laurent Cozic	8e712eacf5	Fixed tsc build	2021-06-21 21:32:05 +01:00
Laurent Cozic	7c92015fe6	Desktop: Fixes #4983: Fixed readability of links in notification banners	2021-06-21 19:30:20 +01:00
Laurent Cozic	0e757ad562	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-21 19:09:17 +01:00
Laurent Cozic	0c12c7f811	Server: Split permission to share note or folder	2021-06-21 19:06:44 +01:00
Helmut K. C. Tessarek	5ecb870ffd	Update translations	2021-06-21 11:26:49 -04:00
Helmut K. C. Tessarek	e58e2a3421	All: Translation: Update da_DK.po (thanks ERYpTION)	2021-06-21 11:21:41 -04:00
Abdallah Ahmed	2e7e1948f8	Docs: Fix a typo in JoplinViewsDialogs.ts comments (#5108) ... Just fixed a small typo in the comments.	2021-06-21 13:32:17 +01:00
Laurent Cozic	caabdbd815	Desktop: Fixed note history line count information (Regression)	2021-06-21 10:06:36 +01:00
Laurent Cozic	65e9268e83	Mobile: Fixed version number on config screen	2021-06-21 08:55:02 +01:00
Laurent Cozic	5ef5888bfb	Android release v2.1.2	2021-06-20 19:35:28 +01:00
Laurent Cozic	12aae48ce6	Server: Fixed transaction locking issue when a sub-transaction fails	2021-06-20 19:30:33 +01:00
Laurent Cozic	5bb68ba65d	All: Fixed issue when trying to sync an item associated with a share that no longer exists	2021-06-20 19:29:59 +01:00
Laurent Cozic	112157e33f	Server: Fixed handling of max item size for encrypted items	2021-06-20 16:29:35 +01:00
Laurent Cozic	9323caf2f1	Fixed revision issue for old revisions	2021-06-20 13:59:58 +01:00
Laurent Cozic	d13b1f96ba	fixed tests	2021-06-20 13:46:50 +01:00
Laurent Cozic	8e55fe31ee	fix tests	2021-06-20 12:30:45 +01:00
Laurent Cozic	50ecdc2ff1	Plugins: Add support for read and writing text, HTML and images from/to clipboard	2021-06-20 12:03:18 +01:00
Laurent Cozic	8a2ca0535d	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-20 11:20:51 +01:00
Laurent Cozic	097e49d797	All: Fixes #5051: Fixed error that could prevent a revision from being created, and that would prevent the revision service from processing the rest of the notes	2021-06-20 11:19:59 +01:00
Longhao.Chen	11ffbe7d66	Update zh_CN.po (#5101)	2021-06-20 09:50:43 +01:00
Laurent Cozic	8cc103a062	Android release v2.1.1	2021-06-19 17:42:08 +01:00
Laurent Cozic	7f05efb789	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-19 17:35:19 +01:00
Laurent Cozic	5b368e39ca	Mobile: Allow enabling and disabling feature flags	2021-06-19 17:32:36 +01:00
Laurent Cozic	b88bbc74a2	Desktop release v2.1.3	2021-06-19 16:26:39 +01:00
Laurent Cozic	fc132216cb	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-19 16:25:53 +01:00
Laurent Cozic	1dc49c7673	Desktop release v2.1.2	2021-06-19 16:25:19 +01:00
Laurent Cozic	ab9bbcbff2	Plugins: Fixed saving secure settings to the keychain, and added way to store plugin settings to settings.json	2021-06-19 15:56:37 +01:00
Laurent Cozic	b7b12f9369	Server v2.1.3	2021-06-19 15:15:25 +01:00
Laurent Cozic	d8752ab889	Tools: Fixed Docker image tagging for pre-releases	2021-06-19 15:14:19 +01:00
Laurent Cozic	372495afd3	Desktop release v2.1.1	2021-06-19 14:28:27 +01:00
Laurent Cozic	2320934853	Server v2.1.2	2021-06-19 14:25:15 +01:00
Laurent Cozic	326fef486c	All: Added feature flags to disable Joplin Server sync optimisations by default, so that it still work with server 2.0	2021-06-19 14:22:53 +01:00
Laurent Cozic	7aff6d271d	Cli: Added flag to disable local lock when synchronising	2021-06-19 11:41:36 +01:00
Laurent Cozic	a86a80b21c	Fixed column type for Postgres	2021-06-19 11:05:06 +01:00
Laurent Cozic	4dc1210eb5	All: Improved first sync speed when synchronising with Joplin Server	2021-06-19 10:34:44 +01:00
Laurent Cozic	0222c0f0a6	All: Allow uploading items in batch when synchronising with Joplin Server	2021-06-18 17:17:25 +01:00
Laurent Cozic	63f7349c17	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-06-18 17:15:01 +01:00
Laurent Cozic	3b9c02e92d	Server: Add support for uploading multiple items in one request	2021-06-18 11:50:06 +01:00
Helmut K. C. Tessarek	cef5834d73	All: Update Mermaid: 8.8.4 -> 8.10.2 (#5092)	2021-06-18 08:53:16 +01:00
Francisco Mora	b341caf287	All: Translation: Update es_ES.po (#5096)	2021-06-17 22:15:48 -04:00
小骏	fc063fe68e	All: Translation: Update zh_CN.po (#5079) ... * update zh_CN.po * update zh_CN.po	2021-06-17 20:36:11 +01:00
Laurent Cozic	d73eab6f82	Fixed tests	2021-06-17 18:32:52 +01:00
Laurent Cozic	d698ea0c12	Server v2.1.1	2021-06-17 18:27:54 +01:00
Laurent Cozic	e04133cfc6	Setup new release 2.1	2021-06-17 18:26:58 +01:00
Laurent Cozic	525ab01b9b	Mobile: Add version number to log	2021-06-17 18:19:32 +01:00
Laurent Cozic	0d33955fcd	All: Mask auth token and password in log	2021-06-17 18:17:23 +01:00
Laurent Cozic	7f0b3fd718	Server: Added account info to dashboard and title to pages	2021-06-17 18:04:35 +01:00
Laurent Cozic	65c3d01cc6	Server: Sort users by name, then email	2021-06-17 17:34:17 +01:00
Laurent Cozic	ac03c08f33	Server: Hide Reset Password button when creating new users	2021-06-17 17:30:45 +01:00