self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Code Issues Releases Activity
12,224 Commits 244 Branches 1,266 Tags 536 MiB
021cdf8034
Commit Graph

913 Commits

Author SHA1 Message Date
Laurent Cozic
551033f8ba Merge branch 'dev' into release-2.0 2021-06-12 10:00:04 +02:00
Ahmad Mamdouh
2af3bf61ea
All: Conflict notes will now populate a new field with the ID of the conflict note. (#5049) 2021-06-12 08:46:49 +01:00
Laurent Cozic
af9f3eedd3 Server v2.0.9 2021-06-11 18:49:29 +02:00
Laurent Cozic
8f1e3ba43c Server v2.0.8 2021-06-11 18:29:40 +02:00
Laurent Cozic
8459b46cd0 Tools: Allow building Docker image from CI 2021-06-11 18:24:59 +02:00
Laurent Cozic
5d233a7387 Tools: Fixed tests 2021-06-11 01:15:43 +02:00
Laurent Cozic
a36b13dcb4 Server: Handle custom user content URLs 2021-06-10 19:33:04 +02:00
Laurent Cozic
4098c01e7c Merge branch 'dev' into release-2.0 2021-06-10 14:03:50 +02:00
Laurent Cozic
c37eb56ed7 Tools: Fixed tests 2021-06-10 11:13:00 +02:00
Laurent Cozic
0e4c545e14 Tools: Fixed tests 2021-06-10 10:57:45 +02:00
Laurent Cozic
594084e274 Server: Fixed error when creating user 2021-06-08 12:39:18 +02:00
Laurent Cozic
5614eb9442 Server: Added option to enable or disable stack traces 2021-06-08 12:08:40 +02:00
Laurent Cozic
7a3a2084db Server: Add navbar on login and sign up page 2021-06-08 11:48:58 +02:00
Laurent Cozic
f7a7009b3c Server v2.0.6 2021-06-07 19:28:18 +02:00
Laurent Cozic
c8d7ecbf6c Server: Add request duration to log 2021-06-07 16:27:09 +02:00
Laurent Cozic
3c41b45e8e Server: Check share ID when uploading a note 2021-06-07 16:17:52 +02:00
Laurent Cozic
5528ab7cc8 Tools: Fixed tests 2021-06-07 15:46:35 +02:00
Laurent Cozic
23cfbc2367 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-06-06 19:14:48 +02:00
Laurent Cozic
de45740129 Server: Load shared user content from correct domain 2021-06-06 19:14:12 +02:00
Helmut K. C. Tessarek
a04d8ef441
Doc: fix text of terms and privacy (#5053) 2021-06-05 08:26:32 +01:00
Laurent Cozic
db7b802803 Server: Add terms and privacy page 2021-06-04 18:09:09 +02:00
Laurent Cozic
75d79f373a Server: Added way to disable signup page, and added links between signup and login pages 2021-06-04 17:08:21 +02:00
Laurent Cozic
770af6a53b Server: Add Stripe integration 2021-06-03 15:21:02 +02:00
Laurent Cozic
69aa749205 Server v2.0.5 2021-06-02 10:26:38 +02:00
Laurent Cozic
1d2a3a97d2 Keep Joplin Server name for now 2021-06-02 09:56:24 +02:00
Laurent Cozic
f8a26cf8f9 Server: Allow disabling item upload for a user 2021-05-27 16:25:37 +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
ba30dce6c8 server-v2.0.2 2021-05-25 19:17:42 +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
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
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
2806aa1b19 Tools: Moved lib-specific tests under lib package 2021-05-21 15:17:21 +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
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
6ddb69e1ea Server: Fixed bug when unsharing a notebook that has no recipients 2021-05-16 18:55:07 +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
45c40f7395 Server: Fixed log page 2021-05-16 11:46:16 +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
f1380fd51d Server: Fixes #4540: Make sure temp files are deleted after upload is done 2021-05-15 12:13:46 +02:00
Laurent Cozic
321a58c356 Prepare for v2 2021-05-14 17:17:02 +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
Laurent Cozic
0b67446ec0 All: Security: Apply npm audit security fixes 2021-05-09 19:30:08 +02:00
Laurent Cozic
3235f58f5a Desktop: Resolves #4727: Add support for safe mode, which temporarily disables note rendering and plugins 2021-04-24 20:23:33 +02:00
Laurent Cozic
874f3010b7 Server: Added log page to view latest changes to files 2021-03-20 18:09:55 +01:00
Laurent Cozic
76c143e8b0 Server: Prevent new user password from being hashed twice 2021-03-14 18:43:20 +00:00
Laurent Cozic
c1198dc76a setup v1.8 2021-02-07 14:34:43 +00:00
Laurent Cozic
b1b5069a23 Desktop: Fixes #4426: Improved handling of empty paths for Joplin Server sync target 2021-02-01 10:48:37 +00:00
Laurent Cozic
07484de91e Server: Fixed crash when rendering note with links to non-existing resources or notes 2021-01-31 17:00:24 +00:00
Laurent Cozic
ccbc329cbf Server: Add support for sharing notes via a link 2021-01-29 18:45:11 +00:00
Laurent Cozic
63a5bfa756 Server: Fixed error handling when no session is provided 2021-01-25 12:13:02 +00:00
Laurent Cozic
e828c8e6eb Server: Fixes #4402: Fixed uploading empty file to the API 2021-01-25 12:04:18 +00:00
Laurent Cozic
adad4cab75 Doc: Automatically create Joplin Server changelog 2021-01-24 19:25:32 +00:00
Laurent Cozic
89a2e9fe9a Server release v1.7.2 2021-01-24 18:56:53 +00:00
Laurent Cozic
63559ac8b9 Tools: Apply eslint rule "no-multi-spaces" 2021-01-23 15:51:19 +00:00
Laurent Cozic
22a7668d4b Server: Fixed password hashing when changing password 2021-01-22 01:11:06 +00:00
Laurent Cozic
0d2bf6d787 Server: Improved config and support for Docker 2021-01-18 10:13:26 +00:00
Laurent Cozic
eb3493f648 Server: Fixed tests and clean up 2021-01-15 22:02:36 +00:00
Laurent Cozic
413ec1a933 Server: Refactored to use Router class 2021-01-14 22:36:46 +00:00
Laurent Cozic
7ad29577f9 Server: Improved how routes can be defined 2021-01-14 18:27:59 +00:00
Laurent Cozic
7652a5a0a0 Server: Added tests for logout and fixed transaction deadlock 2021-01-14 17:18:27 +00:00
Laurent Cozic
4a230d7cd5 Server: Removed all controller 
These controllers were mostly here to allow testing the business logic.
However now that the routes are tested directly they are no longer
necessary. And testing the routes significantly increase the test
coverage.
 2021-01-14 14:28:20 +00:00
Laurent Cozic
9b2e5e2959 Server: Removed the need for session controller 2021-01-14 13:29:03 +00:00
Laurent Cozic
3c5ac1ecc5 Server: Removed the need for file controller 2021-01-14 13:07:38 +00:00
Laurent Cozic
03dc1bbfe1 Server: Removed the need for profile controller 2021-01-14 12:50:45 +00:00
Laurent Cozic
80580ba54d Server: Clean up test units 2021-01-14 11:55:27 +00:00
Laurent Cozic
f14ea46f0b Server: Moved controller tests to route and model 2021-01-13 23:20:45 +00:00
Laurent Cozic
247bd9bfd9 Server: Moved session tests to route 2021-01-13 22:06:47 +00:00
Laurent Cozic
fc58db5d1a Server: Removed controller dependency from route 2021-01-13 21:50:43 +00:00
Laurent Cozic
66a09e5068 Server: Moved file API tests to route 2021-01-13 18:11:35 +00:00
Laurent Cozic
4b2bb1168b Setup new release version 1.7 2021-01-13 12:19:12 +00:00
Laurent Cozic
6cdb16c8ab Server: Started moving controller tests to routes 2021-01-12 22:03:31 +00:00
Laurent Cozic
eab2371206 Server: Add test units for sessions route 2021-01-12 18:08:14 +00:00
Laurent Cozic
63615ffbaf Server: Unit test request routing 2021-01-12 17:33:14 +00:00
Laurent Cozic
59fa51c5bf Server: Added test units for user login 2021-01-12 17:14:09 +00:00
Laurent Cozic
c70f023fe0 Server: Added test units for notification handler 2021-01-12 16:49:39 +00:00
Laurent Cozic
fb5eb1a47b Server: Dismiss admin password notification when password has been changed 2021-01-12 16:02:44 +00:00
Laurent Cozic
16788d1437 Tools: Setup server tests 2021-01-07 22:15:41 +00:00
Laurent Cozic
f43ec71d9a Tools: Increase Jest timeout on server tests 2021-01-07 21:34:07 +00:00
Laurent Cozic
ec7cccf573 Doc: Fixed server doc 2021-01-04 16:16:09 +00:00
Laurent Cozic
e94a1cac1c Server release v1.6.4 2021-01-04 15:03:36 +00:00
Laurent Cozic
fb01c64133 Server: Added script to create release 2021-01-04 15:01:45 +00:00
Laurent Cozic
20d126b39d Server: Fixed access control on user list and clean up 2020-12-30 23:50:44 +00:00
Laurent Cozic
d2771029a3 Server: Support for notifications and clean up 2020-12-30 18:35:18 +00:00
Laurent Cozic
81aba8b8b0 Server: Fixed pagination 2020-12-30 02:24:29 +00:00
Laurent Cozic
f48697572d Server: Fixed file count issue for PostgreSQL 2020-12-29 23:48:34 +00:00
Laurent Cozic
e61e8b7b94 Server: Fixed URLs 2020-12-29 23:22:57 +00:00
Laurent Cozic
ee2ec28cd4 Server: Add basic file manager 2020-12-29 18:04:57 +00:00
Laurent Cozic
34a99f738c linter 2020-12-28 17:26:15 +00:00
Laurent Cozic
0e0de1207f Server: Adding basic file manager 2020-12-28 16:37:12 +00:00
Laurent Cozic
2fda067034 Server: Improved logging and error handling 2020-12-28 15:15:30 +00:00
Laurent
41684a64ef
Server: Add Joplin Server package (#1872) 2020-12-28 11:48:47 +00:00