Commit Graph

666 Commits (82afa81220a127c6a795dd7db3776552005857ff)

Author SHA1 Message Date
Ozzieisaacs f543d7f486 Fix #1016 5 years ago
Ozzieisaacs 5f25b81004 Final fix for #983 5 years ago
Ozzieisaacs 73bbffccaa Fix for login issue on MacOS 5 years ago
Ozzieisaacs 00f17bb697 Mature contents no longer displayed in/allowed to (#975):
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
Ozzieisaacs cf00b4eebf Cover upload gives Error 500 fix #972 (leftover from refactoring)
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
6 years ago
Ozzieisaacs 97a0dccdec Fix for display of format, series, category, ratings,
Fix for display of language (sorting not working yet)
6 years ago
Ozzieisaacs b9c3a3fcea Fix #652 6 years ago
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
6 years ago
Daniel Pavel 63634961d4 cleaner worker api
the worker thread now stops on its own
6 years ago
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
6 years ago
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
6 years ago
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 6 years ago
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
6 years ago
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)
6 years ago
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2 6 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 6 years ago
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
6 years ago
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
6 years ago
Ozzieisaacs f5e3ed26b9 Fix for #935 6 years ago
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
6 years ago
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
6 years ago
Krakinou 9a5ab97d78
Merge branch 'master' into master 6 years ago
Krakinou 79286c9384 encode password 6 years ago
yjouanique c4e3f3670f Added public /reconnect endpoint 6 years ago
Daniel Pavel b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
Krakinou 97d12b94f6 Correct settings update 6 years ago
Krakinou e4d801bbaf initial flask_simpleldap implementation 6 years ago
Ozzieisaacs bb0d5c5538 Working for pip and "normal" start for python3 and python2 6 years ago
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 6 years ago
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
6 years ago
Ozzieisaacs f70c839014 Added additional permission viewer 6 years ago
Ozzieisaacs 0c80f5c63a Update Teststatus 6 years ago
Ozzieisaacs 1030e195a5 Fix #916 6 years ago
Ozzieisaacs 3b03aa30a6 Fix for advanced search 6 years ago
Ozzieisaacs cb0403a924 Merge remote-tracking branch 'adv_search/master' 6 years ago
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.
6 years ago
Ozzieisaacs 55bb8d4590 Fix #900 6 years ago
Ozzieisaacs b80bfa5260 Improvement for #897 6 years ago
Ozzieisaacs f941908f73 Workaround for #889 6 years ago
Ozzieisaacs 9b3b2acb49 Sort button is correctly visible on list pages
Publisher list is working
6 years ago
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
6 years ago
Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
6 years ago
Ozzieisaacs c748716ad2 Fix for opds feed of unread/read books 6 years ago
Ozzieisaacs 544405f5aa Update search for cyrillic letters #877 6 years ago
Ozzieisaacs 67736fe187 Catch errors on loading pickle file
Fix for cover images without Pillow
6 years ago
Ozzieisaacs 91ebe33879 Merge remote-tracking branch 'image_formats/dev' 6 years ago
Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
6 years ago
Ozzieisaacs 55bdd13fb1 Fix #877 6 years ago
Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py
6 years ago
Daniel Pavel f7e640fd98 support pycountry if iso-639 is not available 6 years ago
Ozzieisaacs 4b301a7961 Additional fix for #845 (in case of error) 6 years ago
Ozzieisaacs 772f978b45 Improved code quality 6 years ago
Ozzieisaacs 0f1db18eae Simplified typeahead 6 years ago
Ozzieisaacs 6940bb9b88 Code improvement 6 years ago
Ozzieisaacs 07649d04a3 Fix updater
Update translations
Code cleaning updater
6 years ago
Ozzieisaacs 8923e71220 Remove debug logging 6 years ago
Ozzieisaacs 843a93fe28 Updater fix for slow servers 6 years ago
OzzieIsaacs 8ab9365688 Prevent error 500 for cover of not exisiting book 6 years ago
Chad Bergeron 169ace777a Fixed infinite scroll for read and unread displays (#855) 6 years ago
Elifcan Cakmak ec2103a3d0 fixed a bug that affects allowing password change for users (#854) 6 years ago
tomjmul 8e8486497f Restirct a user to a set of tags 6 years ago
Ozzieisaacs e5593d9a7f Integrated author in sorting functions 6 years ago
Ozzieisaacs a360b1759a Code cosmetics
bugfix import HttpError from pydrive
6 years ago
Ozzieisaacs baf83b2f5a Refactored generating download links 6 years ago
Ozzieisaacs 9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 6 years ago
Ozzieisaacs a66873a9e2 Added file formats view 6 years ago
Ozzieisaacs a0a15b4598 Fix max authors shown 6 years ago
Ozzieisaacs 4a33278596 Update ratings 6 years ago
Ozzieisaacs 6d2270d931 Fixes for Oauth 6 years ago
Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
6 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 6 years ago
Ozzieisaacs 5b0a0e2139 Fix #835 6 years ago
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 6 years ago
Ozzieisaacs feb6a71f95 Fix uncompressed cbz files
merge from master -> file extension limitation
6 years ago
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 6 years ago
Ozzieisaacs 6269a83c3d Fix mismerge user logon with python3 in opds feed 6 years ago
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar 6 years ago
Ozzieisaacs fb23db57b4 Added filtering of authors, series, categories, publishers 6 years ago
Ozzieisaacs 11b770b3fb Fix for #830
Fix user with umlauts
6 years ago
Ozzieisaacs fda977b155 Fix for users with umlauts 6 years ago
Ozzieisaacs 68a36597ab Fix opds login on python3 6 years ago
Ozzieisaacs 361a1243d7 Improvements #828 6 years ago
Virgil Grigoras e5bc1ae020 Add new database field for storing max_authors 6 years ago
Ozzieisaacs eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop
Oauth is optional again
6 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
6 years ago
Ozzieisaacs cc3088c52f Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py

Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
6 years ago
Ozzieisaacs 1a7052b287 Update pdf upload
Translation of uploadprogress dialog
6 years ago
AngelByDay 38307ececb
Force namespace resolution of imports
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
6 years ago
Ozzieisaacs ae7c4908f9 Fix #767 6 years ago
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
6 years ago
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 6 years ago
Ozzieisaacs a0be02e687 Ldap working 6 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 6 years ago
Ozzieisaacs 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
6 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 6 years ago
Ozzieisaacs 1fc4bc5204 Fix routes
Fix error page
6 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 6 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 6 years ago