6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
4 years ago
5ec1283bb1
Remove threading for the calibre DB class
4 years ago
0f28dc5e55
Remove the queue stuff for CalibreDB (is no longer used)
4 years ago
bf41b04cfa
Remove convert task from db.py - with the fixed from #1565 , this no longer seems to be needed
4 years ago
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)
4 years ago
ad144922fb
Merge with master
4 years ago
1535bdbcd8
Merge remote-tracking branch 'memorydatabase/issue/1564'
4 years ago
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
4 years ago
94ad93ebd7
Added series like custom columns #1501
4 years ago
0e1ec5034e
Fix for #1564 - using memory database in multiple threads.
...
See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
4 years ago
c18d5786dd
Improved validation check
5 years ago
1c681ee378
Improvements for books table editor
5 years ago
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
5 years ago
0dd0605a1f
Book list for merging
5 years ago
827b0c6e50
Changed pubdate to timestamp
5 years ago
27ed918896
Enabled search for archived books
5 years ago
46197d82b5
Edit and Upload books refactored
5 years ago
d0e15da352
Fix lcase function
5 years ago
5f0660a4e5
Refactored helper.py and db.py
5 years ago
b7535b9526
Merging master branch
...
- fix title sort function
- fix focus on search
5 years ago
098dab889a
Fixed title sorting routine
5 years ago
1a458fe39f
Fix for #1407 converting books should now be possible again
5 years ago
b75497231e
Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result)
5 years ago
47641eee59
Merge branch 'master' into Develop
5 years ago
b48afa38ac
Fix #1386 (Add asin to recognized identifiers)
5 years ago
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
5 years ago
dd3b562f1a
Change some links from http to https
5 years ago
718d50a037
Starting again without traceback (moved gdriveutil import)
5 years ago
e1439b529b
Config Options for limiting email size, change username to e-mail adress, use kepubify
...
Added work on Unrar5 decompression (breaks comic reader totally)
5 years ago
0adcd1b3d9
UI Improvements
...
Added additional restrictions to Calibre DB interface
5 years ago
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
5 years ago
2d92818613
Code cosmetics
5 years ago
24c743d23d
Code cosmetics
5 years ago
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
5 years ago
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
5 years ago
1c630eb604
fixes from tests
5 years ago
f705889c23
Inital Kobo
5 years ago
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
6 years ago
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
6 years ago
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
6 years ago
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
6 years ago
572b5427c7
Fix Encoding issues for python2
6 years ago
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
6 years ago
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
6 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
bb0d5c5538
Working for pip and "normal" start for python3 and python2
6 years ago
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
6 years ago
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
6 years ago
544405f5aa
Update search for cyrillic letters #877
6 years ago
e1e79a73e8
Fix #884
6 years ago
blitzmann