self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity
6,041 Commits 244 Branches 1,275 Tags 551 MiB
ce02a30441
Commit Graph

896 Commits

Author SHA1 Message Date
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
cde25fad92 Fixed tests and server build 2021-05-25 17:50:51 +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
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
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
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
Laurent Cozic
77b284f01f Server: Added API end points to manage users 2021-05-18 17:11:50 +02:00
Laurent Cozic
daaaa133ab Server: Allow enabling or disabling the sharing feature per user 2021-05-18 15:53:56 +02:00
Laurent Cozic
e6c4eb7cdf Server: Renamed users.item_max_size => users.max_item_size 2021-05-18 15:11:03 +02:00
Andre Jilderda
f3e03d48bb
Desktop: Add classnames to DOM elements for theming purposes (#4933) 2021-05-17 19:33:44 +01:00
Laurent Cozic
6577f4f35d Desktop: Regression: It was no longer possible to add list items in an empty note 2021-05-17 20:30:48 +02:00
Laurent Cozic
d29624c816 Desktop: Handle too large items for Joplin Server 2021-05-17 18:55:39 +02:00
Laurent Cozic
6afde54bda Server: Add support for item size limit 2021-05-17 18:35:01 +02:00
Laurent Cozic
ec7f0f479a Server: Improved log table too and made it sortable 2021-05-17 17:29:21 +02:00
Laurent Cozic
7f05420fda Server: Improved Items table and added item size to it 2021-05-17 17:02:15 +02:00
Laurent Cozic
a3f8cd4850 Merge branch 'release-2.0' into dev 2021-05-16 19:40:08 +02:00
Laurent Cozic
01ccf5170a Tools: Changelog for Android version 2021-05-16 19:38:36 +02:00
Laurent Cozic
6ddb69e1ea Server: Fixed bug when unsharing a notebook that has no recipients 2021-05-16 18:55:07 +02:00
Laurent Cozic
b01f82bb33 Android release v2.0.1 2021-05-16 17:54:13 +02:00
Laurent Cozic
b6c9edba21 Tools: Make sure branch has been pushed before releasing Android version 2021-05-16 17:50:50 +02:00
Laurent Cozic
f7d164be6e Desktop: Allow unsharing a note 2021-05-16 17:28:49 +02:00
Laurent Cozic
6f2f24171d Desktop: Add Share Notebook menu item 2021-05-16 15:21:55 +02:00
Laurent Cozic
12cc64008b typo 2021-05-16 12:49:05 +02:00
Laurent Cozic
b9955f58d3 Server: Refactor ShareType 2021-05-16 12:46:58 +02:00
Laurent Cozic
489995daef Server: Fixed deleting a note that has been shared 2021-05-16 12:42:58 +02:00
Laurent Cozic
e156ee1b58 Server: Generate only one share link per note 2021-05-16 12:33:36 +02:00
Laurent Cozic
a24b0091ad Server: Go back to home page when there is an error and user is logged in 2021-05-16 12:19:18 +02:00
Laurent Cozic
2655b6deee Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-16 11:48:15 +02:00
Laurent Cozic
45c40f7395 Server: Fixed log page 2021-05-16 11:46:16 +02:00
Woosuk Park
ecb0eee355
All: Translation: Update ko.po (#4976) 
* Some Translated. and some modified

* ko.po Update
 2021-05-16 02:39:43 -04:00
suixinio
4916f4cc92
All: Translation: Update zh_CN.po (#4969) 
This PR updates zh_CN.po, with just a minor translation fix.
 2021-05-15 15:58:48 -04:00
Laurent Cozic
15fe119256 Desktop: Made sync more reliable by making it skip items that time out, and improved sync status screen 2021-05-15 20:56:49 +02:00
Laurent Cozic
0b46880a00 Desktop: Fixes #4926: Fixed issue with empty panels being created by plugins 2021-05-15 17:30:56 +02:00
Laurent Cozic
deaa731983 Update translations 2021-05-15 16:15:55 +02:00
Laurent Cozic
d061bb1a4f typo 2021-05-15 16:06:24 +02:00
Laurent Cozic
03db0c5486 Desktop: Resolves #4462: Improved usability when plugin repository cannot be connected to 2021-05-15 16:04:10 +02:00
Laurent Cozic
bb275e671d Tools: Allow running the test units with Postgres 2021-05-15 15:13:08 +02:00
Laurent Cozic
2d0580ff71 Server: Fixed /items page when using Postgres 2021-05-15 15:10:40 +02:00
Laurent Cozic
2331d3487b Desktop, Cli: Resolves #4968: Import SVG as images when importing ENEX files 2021-05-15 13:42:57 +02:00
Laurent Cozic
f1380fd51d Server: Fixes #4540: Make sure temp files are deleted after upload is done 2021-05-15 12:13:46 +02:00
Laurent Cozic
d462dab8eb Update French translation 2021-05-15 11:36:52 +02:00
Laurent Cozic
cf37b74d9a Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-05-15 11:14:40 +02:00
Laurent Cozic
aec3ea9c0c Desktop, Cli: Fixes #4965: Improved importing Evernote notes that contain codeblocks 2021-05-15 11:12:11 +02:00
Helmut K. C. Tessarek
1f5aa70acd
Update translations (for new server/client code) 2021-05-14 13:27:17 -04:00
Harris Arvanitis
416637ce83
All: Translation: Update el_GR.po (#4961) 2021-05-14 13:23:13 -04:00
Gen Neko
99c4b0bc01
All: Translation: Update ja_JP.po (#4960) 2021-05-14 13:22:35 -04:00
Laurent Cozic
74d8fec98a Desktop release v2.0.1 2021-05-14 17:17:40 +02:00
Laurent Cozic
321a58c356 Prepare for v2 2021-05-14 17:17:02 +02:00
Laurent Cozic
81884cf2ea add comment 2021-05-14 14:52:29 +02:00
Laurent Cozic
d7ff634f5e Merge branch 'release-1.8' into dev 2021-05-14 14:50:04 +02:00
Laurent Cozic
a965da97b6 ios-v10.8.1 2021-05-14 14:43:49 +02:00
Laurent Cozic
b99cb0248d Cli: Fixes #4845: Fixed possible crash when trying to delete corrupted revision in revision service 2021-05-14 12:09:20 +02:00
Laurent Cozic
a31b402b9e Desktop: Added button to skip an application update 
And made auto-updates enabled by default
 2021-05-14 11:29:06 +02:00
Laurent Cozic
6959f14a3f Desktop: Fixes #4958: Display proper error message when JEX file is corrupted 2021-05-13 22:13:53 +02:00
Laurent
0765cf5955
All: Add support for sharing notebooks with Joplin Server (#4772) 
- Joplin Server: Adds support for sharing a notebook
- Desktop: Adds support for sharing a notebook with Joplin Server
- Mobile: Adds support for reading and writing to a shared notebook (not possible to share a notebook)
- Cli: Adds support for reading and writing to a shared notebook (not possible to share a notebook)
 2021-05-13 17:57:37 +01:00
JackGruber
09ad70983a
Desktop: Fix #4581: Show or hide completed todos in search results based on user settings (#4951) 2021-05-13 13:23:17 +01:00
Helmut K. C. Tessarek
6e64b872cf
Update translations 2021-05-13 05:34:25 -04:00
Helmut K. C. Tessarek
d26b92500c
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-05-13 05:29:16 -04:00
Subhra264
df6f0ce9af
Desktop: Fixes #4891: Solve "Resource Id not provided" error (#4943) 2021-05-13 09:34:03 +01:00
Helmut K. C. Tessarek
fa6981faa8
All: Add new date format YYMMDD (#4954) 2021-05-13 08:55:41 +01:00
JackGruber
ce80d7e883
Generator: Fixed issue with handling of CRLF in ignore file (#4956) 2021-05-13 08:54:27 +01:00
Laurent Cozic
1a84ca204e Merge branch 'release-1.8' into dev 2021-05-11 15:05:01 +02:00
Edvin Saletovic
0d523e5394
All: Translation: Update bs_BA.po (#4942) 2021-05-10 16:27:31 -04:00
Laurent Cozic
b28f087bbe Desktop release v1.8.5 2021-05-10 12:33:18 +02:00
Laurent Cozic
ea536dbf87 Merge branch 'release-1.8' into dev 2021-05-10 12:23:39 +02:00
Laurent Cozic
ed19424271 Plugin Generator release v1.8.1 2021-05-10 12:23:14 +02:00
Laurent Cozic
553aa0fffa CLI v1.8.1 2021-05-10 11:39:11 +02:00
Laurent Cozic
ebd650b62f Releasing sub-packages 2021-05-10 11:35:29 +02:00
Laurent Cozic
66dbbf3822 Plugins: Updated types 2021-05-10 11:33:28 +02:00
Laurent Cozic
1e27a4fcd2 Fix types 2021-05-10 11:32:31 +02:00
Laurent Cozic
9c20d5947d All: Security: Filter out NOSCRIPT tags that could be used to cause an XSS (thanks to Jubair Rehman for the PoC) 2021-05-10 11:22:12 +02:00
Laurent Cozic
bb77d7171a Desktop: Fixes #4916: Fixed pasting of text and images from Word on Windows 2021-05-10 11:12:29 +02:00