9a678c41fe
Fix error from merge
2020-09-26 09:42:40 +02:00
7c8f6ce62f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
2020-09-26 07:54:38 +02:00
422c1893c0
Fix for the fix cover_url
2020-09-24 11:02:12 +02:00
bed1b24340
Fixes from test of upload restrictions
2020-09-24 10:54:02 +02:00
da909ff084
Fixes from test of upload restrictions
2020-09-23 20:50:34 +02:00
7ba014ba49
Fix "is not a valid language" on upload of comic books
...
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
2020-09-20 15:05:52 +02:00
165c649f31
Fix "is not a valid language" on upload
2020-09-20 11:44:03 +02:00
4cf71dd336
Fix "is not a valid language" on upload
2020-09-20 11:41:44 +02:00
e29247774c
Bugfixes for uploading books to GDrive with new worker
2020-09-12 13:55:36 +02:00
7929711fea
Improvements for file uploading format restriction
2020-09-08 20:57:39 +02:00
49a028a599
Bugfix not unlink generic cover on upload
2020-09-08 19:04:04 +02:00
449d31e8a1
Refactored update_dir_structure_file
2020-09-07 21:26:59 +02:00
d3bde0408f
Improvederror handling for editing identifier
2020-09-05 18:47:28 +02:00
34d3225984
Errorhandling edit identifier
2020-09-05 18:46:11 +02:00
eaed53e25b
Fix for author edit error (2 same sort_authors lead maybe to choose wrong one)
2020-09-05 18:23:14 +02:00
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
2020-08-25 00:15:41 -04:00
6a8ae9c0c4
Merge remote-tracking branch 'upstream/master' into tasks
...
# Conflicts:
# cps/helper.py
2020-08-23 21:38:56 -04:00
f066926fc9
Merge branch 'master' into Develop
2020-08-23 10:56:10 +02:00
cf35c9dcef
Merge remote-tracking branch 'name/patch-2' into master
2020-08-23 10:53:18 +02:00
414043ded1
Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment)
2020-08-22 23:35:48 -04:00
2533c9c14e
Continue converting tasks - email and upload tasks
2020-08-22 22:44:28 -04:00
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
2020-08-22 10:27:09 +02:00
ad144922fb
Merge with master
2020-08-22 09:23:29 +02:00
28bfb06c67
Revert the deletion of another line
...
This was done by mistake, whoops!
2020-08-09 00:57:30 -04:00
704dcb3e58
Move assignment of `new_coverpath`
...
With the assignment originally being within the try, if the try failed, the exception wouldn't have access to the value
2020-08-09 00:55:56 -04:00
c6c9cfea22
Merging books basically working
2020-06-29 20:14:48 +02:00
ccca5d4d1c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
2020-06-28 12:11:46 +02:00
329a7a03a5
Fix for errors editing/uploading books with duplicate tags/authors/language names
...
Additional parsing of epubs for cover files
Fix for change of database with linked read_column and read column isn't present any more
2020-06-22 19:11:58 +02:00
22344a3971
Improvements for delete book
2020-06-18 20:39:45 +02:00
d44f283a05
View status in books table is stored
2020-06-12 16:15:54 +02:00
c18d5786dd
Improved validation check
2020-06-12 13:45:07 +02:00
1c681ee378
Improvements for books table editor
2020-06-11 21:19:09 +02:00
94b5ec91cc
Title in table translatable
...
Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout
2020-06-11 08:48:23 +02:00
9b2df9cfd9
Fix #1441 (list copy function not available on python2, crashes edit metadata)
2020-05-27 18:38:50 +02:00
6f9c08f906
Fix typo RarExecutable
2020-05-24 20:54:23 +02:00
70c666c380
Upload book without reload complete library
2020-05-24 20:40:58 +02:00
46197d82b5
Edit and Upload books refactored
2020-05-24 20:19:43 +02:00
96d6018ecc
Added ability to view comicapi version
...
Changed required comicapi version
Unified "cannot" and "Cannot" texts
Removed annoying "was already removed" string from log
2020-05-23 16:20:19 +02:00
5f0660a4e5
Refactored helper.py and db.py
2020-05-23 10:16:29 +02:00
1a458fe39f
Fix for #1407 converting books should now be possible again
2020-05-21 18:16:11 +02:00
41960ada4a
Autodetect binaries
2020-05-09 11:04:35 +02:00
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
2020-05-06 18:47:33 +02:00
6a6c1b6b21
Fix for #1358 , #1355
2020-05-06 16:25:03 +02:00
0735fb1e92
Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
...
Preparation for release
2020-05-05 20:28:10 +02:00
850a85915b
Fix #1354 (Error on uploading single book, because of missing rarfile)
2020-05-05 18:48:40 +02:00
e1439b529b
Config Options for limiting email size, change username to e-mail adress, use kepubify
...
Added work on Unrar5 decompression (breaks comic reader totally)
2020-05-04 18:19:30 +02:00
0adcd1b3d9
UI Improvements
...
Added additional restrictions to Calibre DB interface
2020-05-03 10:55:33 +02:00
0138ff9e16
Added additional config options
2020-05-02 10:18:01 +02:00
9bc085a23e
Fixes for comic reader
2020-05-02 09:35:14 +02:00
000b85ff81
Fixes for deleting books(error handling and user feedback)
2020-05-01 10:26:35 +02:00
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
2020-04-30 18:08:28 +02:00
27eb09fb19
Add unrar Support
2020-04-28 20:23:39 +02:00
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
2020-04-28 16:50:08 +02:00
6682b1ced1
Fix download of book covers with enabled pillow from url
2020-04-26 21:00:29 +02:00
bc89b0658a
Fix deletion of books with multiple custom column links
...
Fix delete of author-folder in case last book of author was deleted (#1269 )
2020-04-26 20:44:37 +02:00
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
2020-04-24 16:56:08 +02:00
742ec2b38d
Fix issue with the delete_book changes introduced in
...
41a3623
2020-04-22 00:19:33 -04:00
95ca1e6a9d
Fix for #1319
2020-04-20 18:56:39 +02:00
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
2020-03-07 13:35:58 +01:00
d267338837
Fixes for Kobo sync
...
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
2020-03-07 11:07:43 +01:00
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
f9dbc6bc78
Clean-up book from ArchivedBook on hard-delete.
...
This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
2020-01-26 16:20:10 -05:00
9b119fa724
edit book: manage identifiers
2020-01-20 22:26:43 +01:00
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
2020-01-15 17:58:23 +01:00
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
56ee8c56ba
Fix #1122
...
(Uploading books with applied language restriction leads no longer to error 500)
2020-01-05 08:40:57 +01:00
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
2020-01-04 07:57:54 +01:00
7098d08888
Added option to convert AZW3 to mobi for sending to kindle
2019-12-15 18:44:02 +01:00
eede894e72
Merge remote-tracking branch 'merge-metadata'
2019-12-09 20:53:16 +01:00
e0faad1e59
Handle no write permission to tmp folder ( #1060 )
2019-12-08 09:40:54 +01:00
c61463447f
Merge metadata of uploaded book versions.
2019-12-06 15:00:01 +01:00
fda0ab1e86
FIx for ( #1092 listening to mp3 not working)
2019-12-01 12:36:55 +01:00
78f9ee86b1
Fix pdf cover
...
Fix massadding books
Add feature inform of duplicate books
2019-11-26 08:19:03 +01:00
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
2019-07-17 19:07:05 +02:00
63634961d4
cleaner worker api
...
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
4708347c16
Merge branch 'Develop'
...
# Conflicts:
# MANIFEST.in
# README.md
# cps/helper.py
# cps/static/js/archive/archive.js
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/updater.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
2019-07-13 20:54:21 +02:00
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
26949970d8
Revert logging functions
...
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
2019-06-10 14:15:21 +02:00
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
2019-06-08 13:45:27 +02:00
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
2019-04-20 18:32:46 +02:00
765b817384
Refactored shelf.py and editbooks.py
2019-03-16 16:53:22 +01:00
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
2019-03-16 15:48:09 +01:00
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
2019-03-05 20:59:30 +01:00
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
2019-02-24 19:34:57 +01:00
4230226716
Link fixes
...
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
2019-02-16 07:23:36 +01:00
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
2019-02-09 18:46:41 +01:00
d6ee8f75e9
More refactoring
2019-02-08 20:12:16 +01:00
Ozzieisaacs
blitzmann
Michael Shavit
Simon Latapie
Christian Keil
Daniel Pavel