6191 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	5f94de0f24	Fixed tests	2021-05-27 15:44:07 +02:00
Laurent Cozic	6811ea1eb9	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-05-27 15:34:12 +02:00
Laurent Cozic	7be59a7435	Doc: Update contributors	2021-05-27 15:33:51 +02:00
Laurent Cozic	c0683ca4c3	Doc: Added script to build Sponsors table	2021-05-27 15:24:56 +02:00
JackGruber	2b286410f6	Desktop: Fixes #4411: Count tags based on showCompletedTodos setting (#4957)	2021-05-27 12:44:58 +01:00
Laurent Cozic	907ac7c1f8	Doc: Updated link for Chrome extension development	2021-05-27 13:35:05 +02:00
Laurent Cozic	8bc27021db	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-05-26 20:05:30 +02:00
Laurent Cozic	41ed66d323	Server: Added signup pages	2021-05-26 19:55:43 +02:00
Laurent Cozic	0ef7e98479	Server: Add version number on website	2021-05-26 15:53:27 +02:00
Laurent Cozic	161c77cb48	Server v2.0.4	2021-05-25 20:35:49 +02:00
Laurent Cozic	50d17bfb36	Merge branch 'dev' into release-2.0	2021-05-25 20:30:36 +02:00
Laurent Cozic	ee0f23718b	Server: Fixed Item and Log page when using Postgres	2021-05-25 20:29:59 +02:00
Laurent Cozic	cfe4546a0b	Server v2.0.3	2021-05-25 20:09:18 +02:00
Laurent Cozic	f45e0d106f	Merge branch 'dev' into release-2.0	2021-05-25 20:05:29 +02:00
Laurent Cozic	12a66342db	Server: Fixed handling of request origin	2021-05-25 20:04:54 +02:00
Laurent Cozic	f2b17560e6	Fixed tests	2021-05-25 19:18:33 +02:00
Laurent Cozic	ba30dce6c8	server-v2.0.2	2021-05-25 19:17:42 +02:00
Laurent Cozic	f5984313be	package lock	2021-05-25 18:11:49 +02:00
Laurent Cozic	df058352a5	Merge branch 'dev' into release-2.0	2021-05-25 17:51:55 +02:00
Laurent Cozic	cde25fad92	Fixed tests and server build	2021-05-25 17:50:51 +02:00
Laurent Cozic	d89bbc5571	Merge branch 'dev' into release-2.0	2021-05-25 17:23:43 +02:00
Laurent Cozic	71a7fc015a	Server: Use external directory to store Postgres data in Docker-compose config	2021-05-25 17:20:22 +02:00
Laurent Cozic	83cef7a824	Server: Allow using a different domain for API, main website and user content	2021-05-25 16:42:21 +02:00
Laurent Cozic	f65de0c9eb	Merge branch 'dev' into release-2.0	2021-05-25 13:07:29 +02:00
Laurent Cozic	3edf74e6d2	Merge branch 'release-2.0' into dev	2021-05-25 13:06:36 +02:00
Laurent Cozic	b01aa7eb45	Server: Make it more difficult to delete all data	2021-05-25 12:33:19 +02:00
Laurent Cozic	e59e3aa7d1	Server: Defaults to enabling share when creating user from admin UI	2021-05-25 12:25:26 +02:00
Laurent Cozic	51051e0ee0	Server: Redirect to correct page when trying to access the root	2021-05-25 12:21:35 +02:00
Laurent Cozic	b20ab19f13	Desktop: Rename Joplin Server to Joplin Cloud in UI	2021-05-25 12:16:57 +02:00
Laurent Cozic	68e79f1573	Server: Allow setting the path to the SQLite database using SQLITE_DATABASE env variable	2021-05-25 12:13:35 +02:00
Laurent Cozic	ed8ee67048	Server: Add mailer service	2021-05-25 11:49:47 +02:00
Laurent Cozic	68b516998d	Update website	2021-05-24 01:16:43 +02:00
Laurent Cozic	0fa7a66fb6	Doc: Android doc title	2021-05-24 01:16:21 +02:00
Laurent Cozic	13f39b9bd5	Update website	2021-05-24 01:15:21 +02:00
albertopasqualetto	013d37bd09	All: Translation: Update it_IT.po (#5003)	2021-05-23 16:36:02 -04:00
mbalint	4760e5e8ba	Desktop: Fixes #4864: Fixes panels overflowing window (#4991)	2021-05-22 18:30:11 +01:00
Laurent Cozic	8930dac40e	Desktop release v2.0.2	2021-05-21 17:45:13 +02:00
Laurent Cozic	3f0586ef63	Desktop: Displays error info when Joplin Server fails	2021-05-21 17:42:32 +02:00
Laurent Cozic	e94503abbe	Tools: Fixed tests	2021-05-21 17:02:56 +02:00
Laurent Cozic	f8253cc2f0	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-05-21 15:17:51 +02:00
Laurent Cozic	2806aa1b19	Tools: Moved lib-specific tests under lib package	2021-05-21 15:17:21 +02:00
小骏	8f57e07279	All: Translation: Update zh_CN.po (#4993)	2021-05-21 00:48:05 -04:00
Laurent Cozic	6ff560f22f	Desktop: Fixes #4591: Prevent cursor from jumping to top of page when pasting image	2021-05-20 19:13:35 +02:00
Laurent Cozic	2226b79c46	Desktop: Fixed pasting HTML in Rich Text editor, and improved pasting plain text	2021-05-20 18:08:59 +02:00
Laurent Cozic	9e9bf63d70	Desktop: Regression: Pasting plain text in Rich Text editor was broken	2021-05-20 17:42:04 +02:00
Breno Baptista	5d9419be5d	Doc: Improved Linux notifications instruction (#4985)	2021-05-19 22:27:43 +01:00
Roman Musin	9f37aa96c6	Android: Fixes #4912, Fixes #4086, Fixes #4908: Fixed and improved alarm notifications (#4984)	2021-05-19 22:26:42 +01:00
JackGruber	eceb14ff9e	Desktop: Resolves #4433: Import linked local files when importing Markdown files (#4966)	2021-05-19 22:22:03 +01:00
Laurent Cozic	85211e8d5c	Mobile: Fixes #4494: Fixed opening URLs that contain non-alphabetical characters	2021-05-19 16:48:55 +02:00
Laurent Cozic	bd08041f53	Desktop: Pass custom CSS property to all export handlers and renderers	2021-05-19 15:00:16 +02:00