Ozzieisaacs
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
Daniel Pavel
63634961d4
cleaner worker api
...
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
Ozzieisaacs
d82289e303
Deactivate ldap
...
Fix setup for pypi
2019-07-14 18:37:44 +02:00
Ozzieisaacs
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
Ozzieisaacs
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
2019-07-09 19:29:58 +02:00
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
Ozzieisaacs
f79d549910
Fix duplicate user and email (now case insensitive #948 )
...
Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 )
2019-07-06 14:35:12 +02:00
Ozzieisaacs
572b5427c7
Fix Encoding issues for python2
2019-06-23 21:11:45 +02:00
Ozzieisaacs
f40fc5aa75
Update LDAP
2019-06-16 08:59:25 +02:00
Ozzieisaacs
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
2019-06-16 08:20:01 +02:00
Ozzieisaacs
26949970d8
Revert logging functions
...
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
f5e3ed26b9
Fix for #935
2019-06-10 19:31:13 +02:00
Ozzieisaacs
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
Ozzieisaacs
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
Krakinou
9a5ab97d78
Merge branch 'master' into master
2019-06-08 01:41:43 +02:00
Krakinou
79286c9384
encode password
2019-06-08 00:54:45 +02:00
Daniel Pavel
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
Krakinou
97d12b94f6
Correct settings update
2019-06-04 00:47:49 +02:00
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
2019-06-02 22:07:22 +02:00
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
2019-05-31 16:24:13 +02:00
Ozzieisaacs
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
2019-05-31 11:17:47 +02:00
Ozzieisaacs
f70c839014
Added additional permission viewer
2019-05-19 18:39:34 +02:00
Ozzieisaacs
0c80f5c63a
Update Teststatus
2019-05-12 19:44:52 +02:00
Ozzieisaacs
1030e195a5
Fix #916
2019-05-11 13:03:38 +02:00
Ozzieisaacs
3b03aa30a6
Fix for advanced search
2019-05-06 20:51:44 +02:00
Ozzieisaacs
cb0403a924
Merge remote-tracking branch 'adv_search/master'
2019-05-06 20:48:46 +02:00
Marvin Marx
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
2019-05-05 17:58:45 +02:00
Ozzieisaacs
55bb8d4590
Fix #900
2019-05-01 17:47:54 +02:00
Ozzieisaacs
b80bfa5260
Improvement for #897
2019-04-29 19:01:30 +02:00
Ozzieisaacs
f941908f73
Workaround for #889
2019-04-23 21:32:48 +02:00
Ozzieisaacs
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
2019-04-22 19:17:23 +02:00
Ozzieisaacs
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
2019-04-22 19:11:35 +02:00
Ozzieisaacs
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
Ozzieisaacs
c748716ad2
Fix for opds feed of unread/read books
2019-04-19 12:07:46 +02:00
Ozzieisaacs
544405f5aa
Update search for cyrillic letters #877
2019-04-19 06:54:12 +02:00
Ozzieisaacs
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
2019-04-18 21:17:59 +02:00
Ozzieisaacs
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
2019-04-15 20:57:25 +02:00
Ozzieisaacs
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
2019-04-14 18:18:39 +02:00
Ozzieisaacs
55bdd13fb1
Fix #877
2019-04-14 17:54:18 +02:00
Ozzieisaacs
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
2019-04-13 16:42:09 +02:00
Daniel Pavel
f7e640fd98
support pycountry if iso-639 is not available
2019-03-29 07:00:10 +02:00
Ozzieisaacs
4b301a7961
Additional fix for #845 (in case of error)
2019-03-26 18:19:39 +01:00
Ozzieisaacs
772f978b45
Improved code quality
2019-03-24 16:24:43 +01:00
Ozzieisaacs
0f1db18eae
Simplified typeahead
2019-03-24 16:14:42 +01:00
Ozzieisaacs
6940bb9b88
Code improvement
2019-03-24 15:58:43 +01:00
Ozzieisaacs
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
2019-03-24 15:27:23 +01:00
Ozzieisaacs
8923e71220
Remove debug logging
2019-03-24 15:18:01 +01:00
Ozzieisaacs
843a93fe28
Updater fix for slow servers
2019-03-24 15:15:36 +01:00
OzzieIsaacs
8ab9365688
Prevent error 500 for cover of not exisiting book
2019-03-23 20:29:53 +01:00
