Commit Graph

2487 Commits (1a0bf45c34b174832033df9a82212e0ebcf19886)

Author SHA1 Message Date
Ozzie Isaacs 91b9370a21 Merge branch 'master' into development
# Conflicts:
#	cps/static/css/libs/bootstrap-table.min.css
#	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
#	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
4 years ago
Ozzie Isaacs ca0aa600b4 Bugfix german translation 4 years ago
Ozzie Isaacs 1c42c4c969 Update bootstrap-table
Fixes for book edit
4 years ago
Ozzie Isaacs 6e406311c3 Fix #1928 (ldap_import_user_filter missing in to_save) 4 years ago
robochud 87884c1af2
Update messages.po
very little typo
4 years ago
cbartondock 42a23ea23c removed some dumb graphical inconsistencies 4 years ago
cbartondock 710c31d1ca Fixed book details not loading after infinite scroll 4 years ago
cbartondock f637ba4dad Fixed border display in book details 4 years ago
Ozzie Isaacs b17d71e4c3 Update optional-requirements.txt
Bugfix Mail task after convert task
4 years ago
Ozzie Isaacs 3c5bd3a605 Added gmail.json file to excluded file, added file also to excluded file during update 4 years ago
Ozzie Isaacs 99520d54a5 Added ability to send emails via gmail (#1905)
Gmail email sending
4 years ago
Ozzie Isaacs e10a8c078b Merge branch 'master' into development
# Conflicts:
#	cps/templates/email_edit.html
4 years ago
Ozzie Isaacs 7a196fed7c Prevent empty email port and server address(#1906) 4 years ago
Ozzie Isaacs c418c7e725 Prevent empty email from field (#1906) 4 years ago
Ozzie Isaacs e35748deff Fix wording and tabs 4 years ago
Ozzie Isaacs b57efbe31c Fix wording and tabs 4 years ago
Ozzie Isaacs 8f91437701 Implementation for gmail server with OAuth2 started 4 years ago
Ozzie Isaacs a7eb547ca4 Renamed brazilian datepicker file 4 years ago
Ozzie Isaacs 0ceb12f74f Renamed brazilian datepicker file 4 years ago
Ozzie Isaacs 4960624de7 Merge branch 'master' into development 4 years ago
Ozzie Isaacs 2c92f24d89 Added Brazilian translation 4 years ago
Ozzie Isaacs 0b7c679dba Changed test email message (fix #657) 4 years ago
Ozzie Isaacs aab3cdc58a Changed test email message 4 years ago
Ozzie Isaacs 3c63f5b204 Merge branch 'master' into development 4 years ago
Ozzie Isaacs 0b97bbf827 Merge remote-tracking branch 'div_a/use-kobo-for-download-link' into master 4 years ago
Ozzie Isaacs 970dbb0c59 Merge branch 'master' into development
# Conflicts:
#	cps/opds.py
#	cps/templates/admin.html
4 years ago
Ozzie Isaacs d21d3c2ceb Merge remote-tracking branch 'div_a/use-btn-anchors' into master 4 years ago
Ozzie Isaacs f26beec1d3 Updated pdf reader 4 years ago
Ozzie Isaacs c4225e29ed Updated pdf reader 4 years ago
Ozzie Isaacs f4e134742b Fix updater
Bugfixes from testruns
Update Testresults
4 years ago
Ozzie Isaacs 2b17bf4114 Update tests
Fixes upload book
4 years ago
Ozzie Isaacs c4f0fc8f7b Update tests
Fixes upload book
4 years ago
Gavin Mogan c279055af4 Use the kobo auth'd version for download link when proxied -- Fixes #1908 4 years ago
Gavin Mogan 657cba042a Use btn classes on anchors not div so the entire button is clickable 4 years ago
Ozzie Isaacs 7a58e48cae Bugfixes opds feed 4 years ago
Ozzie Isaacs 670eab62bf Update opds feed with letters for all titles, authors, categories and series 4 years ago
Ozzie Isaacs fc85586809 Bugfixes for sqlalchemy 1.4.0 4 years ago
Ozzie Isaacs 837fc4988d Letterize authors 4 years ago
Ozzie Isaacs 4664b47851 Fixed alphabetical order in list and grid view
Completed download section
4 years ago
Ozzie Isaacs 9864d932e0 Changed user.nickname to user.name
Added function to view downloads of all users for admins
4 years ago
Ozzie Isaacs 436f60caa9 refactored some functions 4 years ago
Ozzie Isaacs e9530eda9d Bugfix from refactoring 4 years ago
Ozzie Isaacs f4ddac16f9 Improved error logging for #1905 4 years ago
Ozzie Isaacs 33bdc07f55 Fix for #1845 (ods not working in Moonreader an Librera)
Fix opds search with wrong parameter no longer causes error 500
4 years ago
Ozzie Isaacs 130a4ed2d3 Fix opds and error logging in mail 4 years ago
Ozzie Isaacs 59ebc1af8a Code refactoring 4 years ago
Ozzie Isaacs 82e15d2e98 Merge branch 'master' into development
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
4 years ago
Ozzie Isaacs 9c842f1895 Bugfixes pdf xmp parsing 4 years ago
Ozzie Isaacs 8cc849488b Code cosmetics 4 years ago
Ozzie Isaacs d3f8153b90 Merge branch 'master' into development 4 years ago
Ozzie Isaacs b1b7ee65b4 Refactored advanced search 4 years ago
Ozzie Isaacs 6889456662 Merge remote-tracking branch 'adv_search/master' into master 4 years ago
Ozzie Isaacs 5d8d796807 Compatibility for sqlalchemy 2.0 4 years ago
Ozzie Isaacs f3d88fc746 Update sqlalchemy 1.4 working 4 years ago
Ozzie Isaacs d87ccae6c9 Merge branch 'master' into development
# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html
4 years ago
Ozzie Isaacs 2760a7816d Fix metadata recognition fb2 files 4 years ago
Ozzie Isaacs 8f5c649d0f Updated dependency comicapi (removed pypdf2)
Updated dependency pyPDF2 ->pyPDF3
Fixed broken updater in case of http error
Bugfixes from testrun
Bugfix load cover for BasicMetadata
4 years ago
Ozzie Isaacs fcf9e7a1ef Upload pdf fixes:
Handle no title
Handle no author
Fix import of more than one language
Add missing pdf upload publisher handling
4 years ago
Ozzie Isaacs 2be7b6480a Merge remote-tracking branch 'pdf/XMP_Metadata3' into master 4 years ago
cbartondock f5ded86c02 removed extraneous logs 4 years ago
rra 8abfaf0ffd Parse XMP metadata in separate function, add exception, try multiple metadata formats 4 years ago
Ozzie Isaacs b070ba142f Selects are working in user management with generic confirm dialog 4 years ago
Ozzie Isaacs bd7c6828bf Selects are working in user management 4 years ago
cbartondock d0671ec58c Merge branch 'master' of https://github.com/janeczku/calibre-web 4 years ago
cbartondock 1e40ffd1cc merge changes 4 years ago
Ozzie Isaacs da2c3e9ed7 Edit user mass change checkbox working 4 years ago
Ozzie Isaacs f62d6abb69 Merge branch 'master' into development
# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html
4 years ago
Ozzie Isaacs 12ad7a6322 Suppress some errors 4 years ago
Ozzie Isaacs b75247ea3a Suppress some errors 4 years ago
Ozzie Isaacs 9a963bbe79 Refactored code
Testrun
4 years ago
Ozzie Isaacs 994bc8b0e4 Removed dropdown button on single file listen/read (Fix #1840) 4 years ago
Ozzie Isaacs 2451605033 Merge remote-tracking branch 'djvu/read-djvu' into master 4 years ago
Ozzie Isaacs 10942527f3 Merge branch 'master' into development
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
4 years ago
Ozzie Isaacs 4909ed5ccd Merge remote-tracking branch 'cliblur/master' into development
# Conflicts:
#	cps/static/css/style.css
4 years ago
Ozzie Isaacs 5cf5df68dc Merge remote-tracking branch 'cliblur/master' into master 4 years ago
Ozzie Isaacs dd32cc99ea Merge remote-tracking branch 'es/patch-1' into master 4 years ago
Ozzie Isaacs 79092dc8eb Merge remote-tracking branch 'it/patch-21' into master 4 years ago
Ozzie Isaacs 6229e4610a Updated teststatus and bugfix convert ebooks 4 years ago
Northguy bfe36d3f4a
change in color definition
Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
    color: hsla(0, 0%, 100%, .45)
}
4 years ago
Northguy d42bf44fad
Added same color for series name and series number 4 years ago
rra 33e352819c Merge remote-tracking branch 'upstream/master' into XMP_Metadata3 4 years ago
Ozzie Isaacs 53ee0aaee1 Some functions refactored 4 years ago
Ozzie Isaacs 42707a19bd Code cosmetics 4 years ago
Ozzie Isaacs 0888706790 Code cosmetics 4 years ago
Ozzie Isaacs 16453a05f8 Code cosmetics 4 years ago
Ozzie Isaacs 2fbb7466d3 Code cosmetics 4 years ago
Ozzie Isaacs f29f94f45f Code cosmetics 4 years ago
Ozzie Isaacs cd973868fc Code cosmetics 4 years ago
Ozzie Isaacs 3c35f02cac Code cosmetics 4 years ago
Ozzie Isaacs 22c93e2389 Merge branch 'master' into development 4 years ago
Ozzie Isaacs 8c751eb532 Some code cosmetics 4 years ago
Ozzie Isaacs 4df443e007 Some code cosmetics 4 years ago
Ozzie Isaacs f52fa41439 Fix restart server
Some code cosmetics
4 years ago
Ozzie Isaacs f77d72fd86 Merge branch 'master' into development
# Conflicts:
#	cps/static/css/style.css
4 years ago
Ozzie Isaacs 9b80c84794 Some code cosmetics 4 years ago
Ozzie Isaacs 725fc658f8 Some code cosmetics 4 years ago
alfred82santa 24bbf226a1 Sync reading state only for books on kobo shelves 4 years ago
cbartondock 83474da7b5 fixed being able to click through dropdown in advanced search results 4 years ago
cbartondock 9146e5f287 fixed advanced search mass add to shelves in caliblur 4 years ago
cbartondock ff4502c63a Made shelf search user specific 4 years ago
cbartondock 9711bd8fe1 added actions boxes to drop downs 4 years ago
cbartondock 05139e53be advanced shelf search is working 4 years ago
cbartondock 870b2642a9 advanced shelf search is almost working 4 years ago
ElQuimm d31b26ae7d
Updated italian message.po
Have a nice day.
4 years ago
Zaroz 5511925ba2
Removed elif "url" identifier format type
Removed elif "url" identifier format type, since else output is identical
4 years ago
Angel Docampo f96b20717d
Updated spanish messages.po
Corrected a grammatical error
4 years ago
Zaroz 940c9c45d7
Updated db.py
changed __repr__ else statement to allow for custom id entries
4 years ago
Ozzie Isaacs 87d6008dfc Fix for #1870 (png was missing in supported picture formats for comic viewer) 4 years ago
Ozzie Isaacs b9c0c8d2dc Update bootstrap table to 1.18.2 4 years ago
Ozzie Isaacs 81c30d5fd5 Add missing files from bootstrap editable
Added user-table single-select header for locale and default-language
4 years ago
Ozzie Isaacs 0aa33d88a5 Merge branch 'master' into development 4 years ago
Ozzie Isaacs e64a504bb1 Working Locale and default language selection in user table edit 4 years ago
jvoisin bc876a159e Declare variables before using them
It should fix the following stacktrace:

```
[2021-02-18 14:46:14,771] ERROR {cps:1891} Exception on / [GET]
Traceback (most recent call last):
  File "/opt/calibre/vendor/flask/app.py", line 2447, in wsgi_app
    response = self.full_dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1952, in full_dispatch_request
    rv = self.handle_user_exception(e)
  File "/opt/calibre/vendor/flask/app.py", line 1821, in handle_user_exception
    reraise(exc_type, exc_value, tb)
  File "/opt/calibre/vendor/flask/_compat.py", line 39, in reraise
    raise value
  File "/opt/calibre/vendor/flask/app.py", line 1950, in full_dispatch_request
    rv = self.dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1936, in dispatch_request
    return self.view_functions[rule.endpoint](**req.view_args)
  File "/opt/calibre/cps/usermanagement.py", line 38, in decorated_view
    return login_required(func)(*args, **kwargs)
  File "/opt/calibre/vendor/flask_login/utils.py", line 272, in decorated_view
    return func(*args, **kwargs)
  File "/opt/calibre/cps/web.py", line 719, in index
    return render_books_list("newest", sort_param, 1, page)
  File "/opt/calibre/cps/web.py", line 422, in render_books_list
    entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
  File "/opt/calibre/cps/db.py", line 610, in fill_indexpage
    return self.fill_indexpage_with_archived_books(page, pagesize, database, db_filter, order, False, *join)
  File "/opt/calibre/cps/db.py", line 635, in fill_indexpage_with_archived_books
    #    book = self.order_authors(book)
UnboundLocalError: local variable 'entries' referenced before assignment
```
4 years ago
Ozzieisaacs 4aa1a838ed Removed f-strings, making it compatible with python 3.5 4 years ago
Ozzieisaacs 095a51edd0 Convert tabs to spaces in server.py (related to #1862) 4 years ago
Ozzie Isaacs a3a11bdf3f Changed checkbox states are saved on server 4 years ago
Ozzie Isaacs 70b503f3d4 Merge branch 'master' into development
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
4 years ago
Ozzie Isaacs bbf609b880 Fix #1859 (Upload of jpg files without installed imagemagick doesn't work) 4 years ago
Ozzie Isaacs 0992bafe30 Bulk User management 4 years ago
Ozzie Isaacs 3c1b06872d Updated testresults
Changed optional-requirements
Prevent redirect 308 on /<data> routes (#1854)
4 years ago
Ozzie Isaacs cefdd2f66c suppress asyncio message always on restart or shutdown 4 years ago
Ozzie Isaacs 5dac13b1da Revert change in ub.py 4 years ago
alfred82santa 6014b04b2a Use BookShelf added_date as date reference 4 years ago
Ozzie Isaacs 8aebf48193 Update handling for package data 4 years ago
Ozzie Isaacs fbb905957b Prevent redirect 308 on /<data> routes 4 years ago
Ozzie Isaacs e0ce135838 Move "create_engine" call 4 years ago
Ozzie Isaacs 60497c60c1 Update creating Home_Config variable for packaging support, added .HOMEDIR to ignored filename during update 4 years ago
Ozzie Isaacs 251a77c8b4 Merge branch 'master' into Development
Improved packaging support
4 years ago
alfred82santa 2b7c1345ee Fix disable shelf kobo sync 4 years ago
alfred82santa 69b7d94774 Fixes and remove shelf kobo sync flag when kobo sync disabled 4 years ago
alfred82santa 8fe762709b Fix mistake 4 years ago
alfred82santa a3f17deb17 Added options in order to synchronize only selected shelf on Kobo device 4 years ago
Ozzie Isaacs e6fb460071 New restart routine for executable files
Fix log in updater
New source option updater available
4 years ago
Ozzie Isaacs 6137fdeb33 Version bump 4 years ago
Ozzie Isaacs 4a4d02ea6a Added translations 4 years ago
Ozzie Isaacs be26e5f152 Update Teststatus
Update Version
4 years ago
Ozzie Isaacs 127bfba135 fix wrong path in get_update_status js function 4 years ago
Ozzie Isaacs 7efae3c125 Renamed "Recently Added" to "Books" 4 years ago
Ozzie Isaacs 1e5af21000 Fix #1843 (get path to script via html file and known js file instead of randomly picking last one) 4 years ago
Ozzie Isaacs 33a0a4c173 Changed function for getting path in js file 4 years ago
Ozzie Isaacs eeb7974e05 User table:
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
4 years ago
Ozzie Isaacs f45ea1a31c Merge branch 'master' into development 4 years ago
Ozzie Isaacs a866dbaa80 Fix mimetype in comic reader 4 years ago
Ozzie Isaacs 62447d6b89 Basic User edit in tables 4 years ago
Ozzie Isaacs ff16afbf0b Merge branch 'master' into development 4 years ago
Ozzie Isaacs 9d7ef25062 Fix Kobo sync & Update Teststatus 4 years ago
Ozzie Isaacs 88078d65e9 Fix #1482 (do not shorten title in book detail page) 4 years ago
Ozzie Isaacs b07a97c17e Merge remote-tracking branch 'webp/comic-webp' into master 4 years ago
Ozzie Isaacs 41e7d65e2a Merge remote-tracking branch 'caliblur/master' into master 4 years ago
Ozzie Isaacs 7fa5865cf6 Merge remote-tracking branch 'autoconv/kepub_autoconv' into development
# Conflicts:
#	cps/kobo.py
#	cps/kobo_auth.py
4 years ago