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
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
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
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
Ozzieisaacs
9d7daf7afd
Kobo links to /v1/products/books/external are responded
...
Merge remote-tracking branch 'kobo/patch-1' into master
2020-12-01 14:03:03 +01:00
Ozzieisaacs
cb1ebc1cd0
Drag 'n drop for files
2020-12-01 13:52:41 +01:00
Ozzieisaacs
6ad56a0859
Merge branch 'master' into Develop
2020-11-30 18:37:14 +01:00
Ozzieisaacs
8515781564
Fix #1727 (import rarfile 4.0 fails on python3.5)
2020-11-30 18:36:45 +01:00
ElQuimm
7e2bfbd255
update italian message.po
...
some minors changes.
2020-11-26 14:35:15 +01:00
Jennifer Thakar
e2325f7ba4
Forward Overdrive requests to Kobo Store
...
When loading books from OverDrive, Kobo readers make requests to `/v1/products/books/external/<overdrive ids>`.
This adds a route to forward these requests to the Kobo Store, so that OverDrive still works when using Calibre-Web's Kobo sync server.
2020-11-22 15:06:37 -08:00
OzzieIsaacs
9afdab8c52
Fix from merge convert_from _to
2020-11-22 11:57:10 +01:00
Ozzieisaacs
f620d4a9ca
Fix LDAP errors
2020-11-22 11:19:14 +01:00
Ozzieisaacs
fb1e763bbe
Fix browser caching problem on change cover
2020-11-22 10:07:25 +01:00
Ozzieisaacs
ecea7e7493
Revert "Fix browser caching problem on change cover"
...
This reverts commit b9536812f4
2020-11-22 10:06:54 +01:00
Ozzieisaacs
560ade00b4
Fix browser caching problem on change cover
2020-11-22 10:03:10 +01:00
Ozzieisaacs
81ea24ad54
Merge branch 'master' into df
2020-11-22 09:34:11 +01:00
Ozzieisaacs
747b25046a
Merge branch 'master' into Develop
2020-11-22 09:16:27 +01:00
Ozzieisaacs
b9536812f4
Fix browser caching problem on change cover
2020-11-22 09:09:41 +01:00
Ozzieisaacs
eed2f0a430
Merge remote-tracking branch 'comic/master' into master
2020-11-22 08:45:02 +01:00
Ozzieisaacs
31fe8cd263
Improvement for #1721 (shrinked generic cover)
2020-11-22 08:28:52 +01:00
Ozzieisaacs
a3fadbaa1a
Shrinked size of generic cover
2020-11-22 08:28:10 +01:00
Ozzieisaacs
e2be655d74
Update LDAP, fix Windows AD login ( #1697 )
2020-11-22 08:17:00 +01:00
Ozzieisaacs
6538aff02f
Merge branch 'master' into Develop
2020-11-22 08:08:27 +01:00
Ozzieisaacs
42c13ae135
Fix for #1718 (fetch of metadata from google without cover leads to exception)
2020-11-20 20:35:07 +01:00
Ozzieisaacs
9bd51c650b
Add config options for client certificate authentication
2020-11-20 19:47:50 +01:00
Ozzieisaacs
ba1c1c87c4
Merge remote-tracking branch 'kobo/feature/use-kobo-specific-download-urls' into Develop
2020-11-20 19:47:25 +01:00
Ozzieisaacs
ceefba2743
Fix for #1550 (password prompt for LDAP and anonymous browsing)
2020-11-15 17:16:01 +01:00
Ozzieisaacs
32b7b39223
Added function to download debug information
2020-11-15 14:25:27 +01:00
Ozzieisaacs
4081895a78
exclude _pysqlite.so from being overwritten
2020-11-14 15:53:56 +01:00
Ozzieisaacs
013c4e9c35
Merge remote-tracking branch 'epub/recompute_epub' into master
2020-11-14 13:22:42 +01:00
Ozzieisaacs
067f289050
Merge remote-tracking branch 'comic/comic' into master
2020-11-14 13:21:56 +01:00
Ozzieisaacs
06511b92aa
Merge remote-tracking branch 'epub/GruberMarkus-patch-1' into master
2020-11-14 13:20:26 +01:00
Ozzieisaacs
32f4c9eabf
Merge remote-tracking branch 'fr/master' into master
2020-11-14 13:16:08 +01:00
Ozzieisaacs
14bc345883
Merge remote-tracking branch 'audio/fix-audio-icon' into master
2020-11-14 13:14:21 +01:00
Ozzieisaacs
d76b4fd7ea
Merge remote-tracking branch 'it/patch-17' into master
2020-11-14 13:12:36 +01:00
ElQuimm
83cdd7e9fb
update italian message.po
...
some minor update to the translation.
2020-11-13 11:17:46 +01:00
verglor
50441bae62
Fix missing audio icon for other audio formats than mp3
2020-11-10 18:08:22 +01:00
Martin
5b0766a9b0
Correct spelling
2020-11-10 10:06:37 +01:00
Martin
d979fe8e5f
fix fr translation : sed cryptage/chiffrement
2020-11-10 10:04:47 +01:00
Markus Gruber
f2c52fd278
Update jszip to 3.5.0. Update epub.js to 0.3.88.
...
Fixes several problems when viewing EPUBs in a browser, for example when jumping to a certain chapter in the table of contents does not work.
2020-11-09 15:47:27 +01:00
Ozzieisaacs
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
2020-11-08 19:29:10 +01:00
Ozzieisaacs
58d485cbb5
Fix #1702 (invalid timestamps during kobo sync caused by malformed database)
2020-11-07 12:49:39 +01:00
Ozzieisaacs
e99dd3310c
Exchanged douban apikey
2020-11-07 12:18:33 +01:00
Ozzieisaacs
400f6e02a5
Fix #1668 (upload of books with language set to different than UI language and not showing all books)
...
Fix for only showing external port if kobo is really activated in admin menu
2020-11-07 11:44:02 +01:00
jvoisin
700b0609df
Don't recompute metadata for epubs
2020-11-06 21:36:49 +01:00
cbartondock
bc52f90ed4
Merge remote-tracking branch 'upstream/master'
2020-11-02 11:36:45 -05:00
Ozzieisaacs
0771546dad
Log exception on user import
2020-11-01 18:25:38 +01:00
jvoisin
95a1a71a66
Minor refactor of comic.py
2020-10-31 22:28:24 +01:00
Ozzieisaacs
25da6aeeca
Merge remote-tracking branch 'sec_fixes/space' into master
2020-10-31 20:04:42 +01:00
Ozzieisaacs
00b422807b
Merge remote-tracking branch 'sec_fixes/edit_auth' into master
2020-10-31 20:04:12 +01:00
Ozzieisaacs
130701a7bb
Merge remote-tracking branch 'sec_fixes/admin_update' into master
2020-10-31 20:02:42 +01:00
Ozzieisaacs
ff88e68904
Add missing locale files
2020-10-31 19:58:22 +01:00
Ozzieisaacs
55fcf23d2b
Merge remote-tracking branch 'sec_fixes/negate' into master
2020-10-31 19:37:47 +01:00
Ozzieisaacs
1b0b4c4cc5
Merge remote-tracking branch 'sec_fixes/ldap' into master
2020-10-31 19:29:17 +01:00
Ozzieisaacs
cd57731593
Merge remote-tracking branch 'sec_fixes/unused_imports' into master
2020-10-31 19:24:46 +01:00
Ozzieisaacs
37a80b935d
Added greek translation
2020-10-31 19:20:00 +01:00
Ozzieisaacs
4d61aec153
Merge remote-tracking branch 'zh/trans' into master
2020-10-31 19:07:10 +01:00
Ozzieisaacs
1adf25d50b
Update Italian translation
2020-10-31 19:06:09 +01:00
Julian Naydichev
ae33aee3f6
When serving a download URL via KoboSync, use a URL that is specific to Kobo
2020-10-31 14:50:08 +01:00
jvoisin
2c99e71626
Remove a superfluous space
2020-10-29 18:17:32 +01:00
jvoisin
e7f7775efa
Require edit permissions to edit books, even via ajax
2020-10-29 14:52:20 +01:00
jvoisin
8b60a19577
Don't leak to non-admin users the current installed version
2020-10-29 14:03:18 +01:00
Ozzieisaacs
5701e08db9
Fix for #1668
2020-10-28 20:37:52 +01:00
jvoisin
d2617322c6
Negate a condition
...
- removes two levels of indentation
- makes it clear that if the wrong tokens are provided nothing will happen
- remove a useless nested function
2020-10-27 19:41:05 +01:00
jvoisin
fa82745f64
Put import_ldap_users behind a login
2020-10-27 19:26:04 +01:00
jvoisin
19b2a334e4
Remove unused imports
2020-10-27 11:06:43 +01:00
vagra
627c2adf08
SImple Chinese translation updated.
2020-10-26 22:56:58 +08:00
ElQuimm
e3e137ca50
updated italian message.po
2020-10-22 16:31:25 +02:00
cbartondock
0978be580f
Merge remote-tracking branch 'upstream/master'
2020-10-21 13:01:25 -04:00
Ozzieisaacs
5792838333
Add OSError to catched Gevent Error
2020-10-20 17:38:37 +02:00
Ozzieisaacs
f9995583a5
Merge remote-tracking branch 'translate/patch-1' into master
2020-10-20 17:12:25 +02:00
