Commit Graph

1257 Commits (a7fdbad8b402609f96facb99cc8c8c15264b8cdb)

Author SHA1 Message Date
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
subdiox c2bfb29726 Add reading direction settings to readcbr page 6 years ago
subdiox 204de4aef6 Fix an issue that fullscreen doens't work on some browsers 6 years ago
subdiox 8b6d165d64 Fix Japanese translation 6 years ago
Ozzieisaacs bfd0e87a17 Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/reverseproxy.py
6 years ago
Ozzieisaacs 6a7b8c7870 Update Version info
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
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 f1a65a2aeb Clarified licences for isolanguages.py and reverseproxy.py 6 years ago
Ozzieisaacs cc5c2c0f65 Update Version info 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 89516fc2d6 Make PIL optional #885 6 years ago
Ozzieisaacs e1e79a73e8 Fix #884 6 years ago
Ozzieisaacs 0b8624b542 Deleted load metadata from douban, as API seems to be shut down (#858) 6 years ago
Ozzieisaacs 91ebe33879 Merge remote-tracking branch 'image_formats/dev' 6 years ago
Ozzieisaacs 05da2ae3c7 Update search for cyrillic letters 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 4552208c02 Fix #848 6 years ago
Ozzieisaacs 436c2671d1 Fix delete domain entries
Fix error handling smtp.authentication error
6 years ago
Ozzieisaacs a669eacde9 Merge remote-tracking branch 'proxy/patch-1' 6 years ago
Ozzieisaacs 2253708da7 Merge remote-tracking branch 'proxy/patch-1' into Develop 6 years ago
Ozzieisaacs 51e591bd25 Added updated translation 6 years ago
Ozzieisaacs 5188c62bea Merge remote-tracking branch 'translation/loc-hu' 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
Ozzieisaacs e754ce313c Merge remote-tracking branch 'pycountry/pycountry' 6 years ago
Ozzieisaacs dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
6 years ago
Barnabás Nagy afc79416b2
HU Translation updates
Translation of the new untranslated strings
6 years ago
Josh Max cdfb6bf3e3
Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.
6 years ago
Iris Wildthyme cbdc9876b2 comicapi dependency now pippable 6 years ago
Iris Wildthyme 05d0f12608 redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation 6 years ago
Daniel Pavel 858c80bb20 'except' style fix 6 years ago
Daniel Pavel f7e640fd98 support pycountry if iso-639 is not available 6 years ago
Daniel Pavel 439ce19b5d Updated epub.js to v0.3.66 6 years ago
Ozzieisaacs 1c9ff6421d Fix uploader 6 years ago
Ozzieisaacs 4b301a7961 Additional fix for #845 (in case of error) 6 years ago
Ozzieisaacs dc93222579 Update 2 column author list view 6 years ago
Yijun Zhao 6c493df2f5 support issue: #843 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 39a3f70084 Fix for slow updater 6 years ago
Ozzieisaacs 8923e71220 Remove debug logging 6 years ago
Ozzieisaacs 843a93fe28 Updater fix for slow servers 6 years ago
OzzieIsaacs fa36072699 Fix uk translation-file 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
Ozzieisaacs e5593d9a7f Integrated author in sorting functions 6 years ago
Ozzieisaacs 3f2a9c8bae Code improvement 6 years ago
Ozzieisaacs 7c69589c5b Code cosmetics unrar.js 6 years ago
Ozzieisaacs 149e9b4bd4 Code cosmetis unrar 6 years ago
Ozzieisaacs a360b1759a Code cosmetics
bugfix import HttpError from pydrive
6 years ago
Ozzieisaacs 765b817384 Refactored shelf.py and editbooks.py 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 1db1c2e7df Enabling LDAP working again
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
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 76d40411dd Translation updated 6 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 6 years ago
Ozzieisaacs 0b0e62fdf2 Merge remote-tracking branch 'dialog/master'
Fix for #833
6 years ago
Ozzieisaacs 6f80a63ca6 Fix for #827 6 years ago
Andrew Sullivan 3dfc2f2580 fixing issue #833 6 years ago
Ozzieisaacs 5b0a0e2139 Fix #835 6 years ago
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 6 years ago
Ozzieisaacs 6f0b3bbda0 Fix for #812 6 years ago
Ozzieisaacs feb6a71f95 Fix uncompressed cbz files
merge from master -> file extension limitation
6 years ago
Ozzieisaacs 1561a4abdf Comic improvments 6 years ago
Ozzieisaacs f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
Ozzieisaacs 466af21548 Code Cosmetics 6 years ago
Ozzieisaacs 0224d45961 Code cosmetics 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 fa276fd0d3 Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
6 years ago
Ozzieisaacs de58d0a4d8 Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
6 years ago
jianyun.zhao 54a006a420 [fix] Add a scroll bar to a long list of meta information 6 years ago
Ozzieisaacs 361a1243d7 Improvements #828 6 years ago
Ozzieisaacs 246d7673a9 Corrected file header with copyright information 6 years ago
Virgil Grigoras bd7b0175a1 Fix remaining shown by codacy 6 years ago
Virgil Grigoras f5cf62f209 Fix issues shown by codacy 6 years ago
Virgil Grigoras 15aa49e163 shorten authors in author / discover / index / search and shelf 6 years ago
Virgil Grigoras 3272b4ca1e configuration field for max_authors 6 years ago
Virgil Grigoras d3ed0317bb styling and javascript for hiding authors 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 fad62a0909 translation update 6 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
6 years ago
Ozzieisaacs 1de3929988 Unicode 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 0facb8fffa Fix #766 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 17b7333992 Merge remote-tracking branch 'caliblur/master' 6 years ago
leram84 ae279c5123
fixed description read-more button 6 years ago
Ozzieisaacs e92497b34e Merge branch 'master' into Develop
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
6 years ago
Ozzieisaacs ae7c4908f9 Fix #767 6 years ago
Ozzieisaacs ea1a882353 Merge remote-tracking branch 'origin/master' 6 years ago
hexeth 9a0e8fefb7
re-add loader code 6 years ago
Matt c07cb23ef2 Merge branch 'master' of git://github.com/janeczku/calibre-web 6 years ago
hexeth 5a863541de
Fix object object 6 years ago
Ozzie Isaacs 4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7 6 years ago
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
6 years ago
Fabian Wüthrich 7fb9bf8889
Truncate single quote in upload file name 6 years ago
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 6 years ago
Ozzieisaacs a0be02e687 Ldap working 6 years ago
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value 6 years ago
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
6 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 6 years ago
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
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
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 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 d58d792f56 Catch Imagemagick policy error 6 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 6 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 6 years ago
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop 6 years ago
Ozzieisaacs 6fc4b318e8 cover folders beautified 6 years ago
Ozzieisaacs 36229076f7 Refactor subprocess calls 6 years ago
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
6 years ago
Ozzieisaacs ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
6 years ago
Ozzieisaacs b75b91606c Fix config oauth-UI 6 years ago
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
6 years ago
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 6 years ago
Ozzieisaacs 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 6 years ago
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
6 years ago
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
6 years ago
Ozzieisaacs 9128615f48 Fix #424
Fix #425
6 years ago
Ozzieisaacs ec81a3cd92 Fix Authors page pagination
Update infinite scroll plugin
6 years ago
Ozzieisaacs 97064db2a4 Restart python3 fix, stop and restart python2 working again 6 years ago
Ozzieisaacs 341dd77b9d Bugfix Restart and Stop server on python3 6 years ago
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
6 years ago