7c8f6ce62f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
2020-09-26 07:54:38 +02:00
2d712a3841
Fix #1612
2020-09-20 10:03:05 +02:00
4eded82102
Add ISFDB
2020-09-15 17:39:13 +07:00
ec4ff83465
Add ISSN tags
2020-09-15 13:50:34 +07:00
8745b8b051
nice title for Litres tags
2020-09-15 13:47:57 +07:00
4e28c3cadb
add Litres references
2020-09-15 13:41:01 +07:00
670cbcd336
Merge branch 'master' into Develop
2020-09-07 21:33:11 +02:00
449d31e8a1
Refactored update_dir_structure_file
2020-09-07 21:26:59 +02:00
1450a21d00
Fix links to amazon ( #1461 )
2020-09-07 18:27:43 +02:00
e012726cd4
Fix #1461 (parse Amazon_* identifiers)
2020-09-06 19:31:31 +02:00
f49688fdb9
Fix #1461 (parse Amazon_* identifiers)
2020-09-06 19:31:03 +02:00
e32b017431
Revert "Test revert global Session"
...
This reverts commit 393869e538
2020-09-06 10:59:34 +02:00
393869e538
Test revert global Session
2020-09-06 10:27:10 +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
feacbe8ebd
Possible Fix for database crash after adding new format and accessing calibre database afterwards
2020-09-05 10:24:32 +02:00
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
2020-08-25 00:15:41 -04:00
5ec1283bb1
Remove threading for the calibre DB class
2020-08-24 21:03:59 -04:00
0f28dc5e55
Remove the queue stuff for CalibreDB (is no longer used)
2020-08-23 23:17:07 -04:00
bf41b04cfa
Remove convert task from db.py - with the fixed from #1565 , this no longer seems to be needed
2020-08-23 13:07:24 -04: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
ad144922fb
Merge with master
2020-08-22 09:23:29 +02:00
1535bdbcd8
Merge remote-tracking branch 'memorydatabase/issue/1564'
2020-08-15 12:08:59 +02:00
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
2020-08-14 19:43:54 +02:00
94ad93ebd7
Added series like custom columns #1501
2020-08-11 18:56:34 +02:00
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
2020-08-11 12:44:55 -04: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
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
2020-06-08 17:34:03 +02:00
0dd0605a1f
Book list for merging
2020-06-06 21:21:10 +02:00
827b0c6e50
Changed pubdate to timestamp
2020-06-06 09:52:35 +02:00
27ed918896
Enabled search for archived books
2020-05-27 19:19:17 +02:00
46197d82b5
Edit and Upload books refactored
2020-05-24 20:19:43 +02:00
d0e15da352
Fix lcase function
2020-05-23 12:51:48 +02:00
5f0660a4e5
Refactored helper.py and db.py
2020-05-23 10:16:29 +02:00
b7535b9526
Merging master branch
...
- fix title sort function
- fix focus on search
2020-05-21 22:31:29 +02:00
098dab889a
Fixed title sorting routine
2020-05-21 19:37:54 +02:00
1a458fe39f
Fix for #1407 converting books should now be possible again
2020-05-21 18:16:11 +02:00
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)
2020-05-21 09:28:35 +02:00
47641eee59
Merge branch 'master' into Develop
2020-05-12 16:16:04 +02:00
b48afa38ac
Fix #1386 (Add asin to recognized identifiers)
2020-05-12 14:44:57 +02:00
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
2020-05-10 19:24:55 +02:00
dd3b562f1a
Change some links from http to https
2020-05-09 17:11:56 +02:00
718d50a037
Starting again without traceback (moved gdriveutil import)
2020-05-09 12:17:28 +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
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
2d92818613
Code cosmetics
2020-04-27 20:01:13 +02:00
24c743d23d
Code cosmetics
2020-04-19 19:08:58 +02:00
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
2020-04-14 10:58:32 +02:00
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
2020-01-15 17:58:23 +01:00
