Commit Graph

488 Commits (18ce310b309ec7cb5b1691da0578ebe5b6bf4a87)

Author SHA1 Message Date
mmonkey 18ce310b30 Merge branch Develop into thumbnails 2 years ago
Ozzie Isaacs d9d6fb33ba Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
2 years ago
Ozzie Isaacs 17b4643b7c fix #2285 (Fix for shelf handling in caliblur theme) 2 years ago
Ozzie Isaacs 3b216bfa07 Kobo sync token is now also created if accessed from localhost(fixes #1990)
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2 years ago
Ozzie Isaacs 127bf98aac Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/detail.html
#	test/Calibre-Web TestSummary_Linux.html
2 years ago
Ozzie Isaacs d759df0df6 Kobo sync token is now also created if accessed from localhost(fixes #1990)
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2 years ago
Ozzie Isaacs bbef41290f Fix delete book format wasn't working 2 years ago
Ozzie Isaacs de1bc3f9af Fix #2265 (add book to shelf on popup for book details)
Updated testresults
2 years ago
Ozzie Isaacs e3dbf7a88d Bugfixes load metadata
Improvements for testing load metadata
2 years ago
Ozzie Isaacs 405f3c181f Added korean locale 2 years ago
Ozzie Isaacs 6d839d5cc7 Bugfixes from testrun 2 years ago
Ozzieisaacs 7b8b2f93a0 Merge remote-tracking branch 'scholary/master' 3 years ago
Ozzieisaacs ae1f515446 Bugfix uncheck all ekements in books list and user list
Improved testability for books list
3 years ago
Ozzieisaacs f39dc100b4 Migrated some routes to POST
- shelf massadd
- resetpassword
- delete shelf
- send to kindle
3 years ago
Ozzieisaacs 785726deee Migrated some routes to POST
- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown
3 years ago
cbartondock 4edd1914b4 Fixed google scholar issues 3 years ago
Ozzie Isaacs 2e815147fb Merge branch 'master' into Develop
# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html
3 years ago
Ozzie Isaacs f0399d04b7 Merge remote-tracking branch 'bookmark_csrf/master' 3 years ago
Ozzie Isaacs 9b57fa25de Merge remote-tracking branch 'zh/master' 3 years ago
xlivevil a184f4e71a
Merge branch 'master' into master 3 years ago
Ozzie Isaacs 9d9acb058d Add button to force full kobo sync 3 years ago
Ozzie Isaacs fd5ab0ef53 Bugfix handle archive bit 3 years ago
Ozzie Isaacs d217676350 Upated testresult
Bugfix book table
3 years ago
Ozzie Isaacs cd5711e651 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
3 years ago
Ozzie Isaacs bd01e840ca Delete books in shelfs, downloaded books, kobo sync status, etc on database change (fixes #620) 3 years ago
Jonathan Fenske 3f91313303
Update epub.js
send the CSRF token when adding bookmarks
3 years ago
xlivevil 67e3721530
fix(tinymce Simplified Chinese locale):rename zh_CN to zh_Hans_CN 3 years ago
Ozzieisaacs 6deb527769 Merge branch 'master' into Develop 3 years ago
Ozzie Isaacs 7ad419dc8c Fix upload of cover and book formats containing html characters 3 years ago
Ozzieisaacs 4fd4cf4355 Merge branch 'master' into Develop
# Conflicts:
#	cps/static/css/style.css
#	cps/web.py
3 years ago
Ozzieisaacs 42cc13d1e2 Mark which functions are selected on list pages 3 years ago
Ozzieisaacs 1e0ff0f9c2 Fix #2045 ("fetch metadata" update appends to the existing tags instead or replacing them) 3 years ago
Ozzieisaacs 95371d0d7f Fix shelf grid ordering for inverted order at page load
Ordering buttons now visible on medium size screens
3 years ago
Ozzieisaacs a5415e00d5 Fix grid to list in series view
Fix sort asc, desc in author and series list
3 years ago
Ozzie Isaacs a8317d900b Bugfix for edit custom ratings in list edit mode
Bugfix for deleting custom enum in list edit mode
3 years ago
Ozzie Isaacs be7ac7e163 Update infinite scrolling javascript 3 years ago
Ozzie Isaacs 3a1a32f053 Update infinite scrolling javascript 3 years ago
Ozzie Isaacs f6a2b8a9ef Read and archive bit visible in book table 3 years ago
Ozzie Isaacs cdd38350fe Updated tinymce editor, enabled raw html edit 3 years ago
Ozzie Isaacs 516e76de4f Updated tinymce editor, enabled raw html edit 3 years ago
Ozzie Isaacs fe4db16a7e html editor in books list 3 years ago
Ozzie Isaacs 7671a1d5c8 Fix errormessage after update 3 years ago
Ozzie Isaacs 00dc60da79 Added translation for traditional chinese 3 years ago
Ozzie Isaacs 666015e867 Fix datepicker localized month names
Removed redundant parenthesis in kobo.py response
3 years ago
Ozzie Isaacs 9d5e9b28ae Enabled editing of "number" custom_columns in books list 3 years ago
Ozzie Isaacs cea10d3945 Merge remote-tracking branch 'comic_sort/comic_reader_sort' 3 years ago
Ozzie Isaacs fe21d15194 Merge remote-tracking branch 'cn/fix/bootstrap-table-locale'
# Conflicts:
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-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-ro.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
3 years ago
Ozzie Isaacs 6e5d9d7657 Bugfix toggle readstatus in modal dialog 3 years ago
Ozzie Isaacs e58eb8dac1 Show checkbox from boolean custom columns on details page with caliblur theme 3 years ago
Ozzie Isaacs f3efef1f60 Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead) 3 years ago