Commit Graph
4420 Commits
Author SHA1 Message Date
Ozzieisaacs 88ea998f8b Only register gdrive callback if gdrive is enabled
With enabled gdrive return on change if no watch callback is configured, instead of send request to google drive
2020-12-11 15:56:42 +01:00
Ozzieisaacs 8b605aeaa8 Only register gdrive callback if gdrive is enabled 2020-12-11 15:53:10 +01:00
Ozzie Isaacs db91577485 Use calibre-web folder in tempdir on upload cover and metadata backup
fix upload cover on windows (slash vs. backslash)
2020-12-11 13:34:29 +01:00
Ozzie Isaacs 5d9404863d Fix detection and removal of metadata.db ending in calibre-directory
Update requirements
2020-12-11 09:11:17 +01:00
Ozzieisaacs d3986ca14a Server side file browser 2020-12-11 08:37:37 +01:00
Ozzieisaacs 2508c1abb2 Started implement server side filechooser 2020-12-10 14:41:45 +01:00
OzzieIsaacs 983e3b2274 Bugfix allowed formats for comics
Bugfix editing archived books
2020-12-09 19:02:10 +01:00
Ozzieisaacs 72a02e087c Update optional pydrive requirement
Bugfix cover url download for Wand insted of Pillow
Fix for gdrive with unknown certificates
2020-12-09 15:14:08 +01:00
Ozzieisaacs 352b4a0b73 Remove Pillow as dependency 2020-12-09 14:18:39 +01:00
Ozzieisaacs d957b2d20f Fix detect correct encoding for txt-reader 2020-12-09 11:04:29 +01:00
Ozzieisaacs dcab8af8ab Fixes for kobo sync 2020-12-09 09:41:23 +01:00
OzzieIsaacs e1987c34d9 Revert expire on commit 2020-12-09 08:49:18 +01:00
OzzieIsaacs a80a8aab1c Fix LDAP import user 2020-12-08 20:13:36 +01:00
OzzieIsaacs d6fbcdb09d Fix merge problem (ub prefix in ub.py) 2020-12-08 13:56:17 +01:00
OzzieIsaacs d39b28b011 Fix for existing book format with gdrive 2020-12-08 13:34:15 +01:00
OzzieIsaacs 8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
OzzieIsaacs 986d4c99bd Fix oauth ub session 2020-12-08 11:24:20 +01:00
Ozzieisaacs f677dcb1f4 Fix missing optional parameter initSession 2020-12-08 08:19:18 +01:00
Ozzieisaacs 1a9b220ec2 Session no longer expires on commit (only in worker thread) 2020-12-08 08:04:46 +01:00
Ozzieisaacs d15d252af7 Session no longer expires on commit 2020-12-08 08:01:42 +01:00
Ozzieisaacs 5e3618716d Fix missing session rollback on commit error 2020-12-07 19:53:34 +01:00
Ozzieisaacs f13522559d Fixed problems on startup with config session 2020-12-07 13:51:52 +01:00
Ozzieisaacs 777c2726d3 Changed session_handing 2020-12-07 08:52:52 +01:00
Ozzieisaacs c25afdc203 Chunked sync 2020-12-06 13:21:25 +01:00
Ozzieisaacs c25f6d7c38 Prefer kepub in kobo sync 2020-12-06 06:01:10 +01:00
Ozzieisaacs 388e46ee81 Merge remote-tracking branch 'prefer_kepub/prefer-kepub' into master (send kepub instead of epub) 2020-12-06 05:57:56 +01:00
Ozzieisaacs 242866948f Merge branch 'master' into Develop 2020-12-05 08:34:12 +01:00
Ozzieisaacs 15bb0ce990 Fix for #1439 (send kepub file instead of epub for kobo epub3 request)
Fix archived books are editable
2020-12-04 19:23:36 +01:00
Ozzieisaacs a82911ea5d Fixed missing variable exception 2020-12-04 14:50:34 +01:00
Ozzieisaacs 9a8f20317b Update ldap import user -> improve error messages 2020-12-04 11:13:39 +01:00
Ozzieisaacs b605a0f622 Update error message LDAP import user 2020-12-03 21:25:02 +01:00
Ozzieisaacs 046a074c3a Catch attribute error on ldap import user
Fixes for Login with Windows AD
2020-12-03 20:15:31 +01:00
Ozzieisaacs 7c96fac95c Removed unnecessary parameters 2020-12-03 17:33:30 +01:00
Ozzieisaacs a3ef53102d Fix warning message on ldap import 2020-12-03 17:08:51 +01:00
Ozzieisaacs 68513b775b Wording 2020-12-03 16:20:31 +01:00
Ozzieisaacs a79dcc93f6 Fixed description for LDAP filter 2020-12-03 16:19:42 +01:00
Ozzieisaacs 7aabfc573b Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/templates/config_edit.html
#	cps/web.py
2020-12-03 16:03:37 +01:00
Ozzieisaacs 22dde5d18e Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into Develop
# Conflicts:
#	cps/admin.py
2020-12-03 16:02:38 +01:00
Ozzieisaacs 56505457eb Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master
# Conflicts:
#	cps/admin.py
2020-12-03 16:01:15 +01:00
Ozzieisaacs 5930c6d5fb remove parenthesis in LDAP Message 2020-12-03 14:22:37 +01:00
Ozzie Isaacs 6b162a4e49 Updated windows testresult 2020-12-03 11:36:40 +01:00
Ozzieisaacs c3b9888b31 Fix #1739 (opds download with anonymous browsing enabled) -> download rights of guest user are now respected again 2020-12-03 09:42:41 +01:00
Ozzieisaacs cb8dfdde4c Fix #1739 (opds download with anonymous browsing enabled) 2020-12-03 08:25:36 +01:00
OzzieIsaacs ff5d333fc8 Updated testresult 2020-12-02 18:23:28 +01:00
Ozzieisaacs 8eb4b6288a Added id's for testablility 2020-12-02 18:19:30 +01:00
Ozzieisaacs f18836be90 Fix for #1435 (download not allowed with for opds links, with ldap login and a cookie in the download request) 2020-12-02 14:19:49 +01:00
Ozzieisaacs 3372070a58 Fix change title regex
Merge branch 'Develop' into master
2020-12-02 11:09:55 +01:00
Ozzieisaacs f99e2ebd13 Changed wording for tooltips 2020-12-02 09:08:56 +01:00
Ozzieisaacs 4feb26eefb Added series order option (#1715)
Added authors order option (#1301)
Added tooltips for ordering options
Fixed ratings, formats, languages order option
2020-12-01 14:51:25 +01:00
Ozzieisaacs 2da7cd2064 Merge remote-tracking branch 'it/patch-18' into master 2020-12-01 14:11:25 +01:00