Ozzie Isaacs
4a0dde0371
Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail
...
# Conflicts:
# cps/admin.py
# cps/config_sql.py
# cps/helper.py
# cps/tasks/upload.py
# cps/updater.py
# cps/web.py
2022-02-08 19:55:20 +01:00
Ozzie Isaacs
4f3c396450
Merge remote-tracking branch 'lubimyczytac/add_lubimyczytac.pl_meta_provider' into Develop
...
# Conflicts:
# optional-requirements.txt
2022-01-27 18:37:02 +01:00
mmonkey
18ce310b30
Merge branch Develop into thumbnails
2022-01-26 23:51:50 -06:00
Ozzie Isaacs
d9d6fb33ba
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2022-01-25 19:33:21 +01:00
Ozzie Isaacs
17b4643b7c
fix #2285 (Fix for shelf handling in caliblur theme)
2022-01-25 19:31:52 +01:00
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
2022-01-24 18:47:34 +01:00
Ozzie Isaacs
127bf98aac
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/detail.html
# test/Calibre-Web TestSummary_Linux.html
2022-01-23 17:51:54 +01:00
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
2022-01-22 18:23:43 +01:00
Ozzie Isaacs
bbef41290f
Fix delete book format wasn't working
2022-01-22 14:01:32 +01:00
Ozzie Isaacs
de1bc3f9af
Fix #2265 (add book to shelf on popup for book details)
...
Updated testresults
2022-01-17 17:46:57 +01:00
collerek
20b5a9a2c0
Merge branch 'master' into add_lubimyczytac.pl_meta_provider
2022-01-13 10:49:51 +01:00
Ozzie Isaacs
e3dbf7a88d
Bugfixes load metadata
...
Improvements for testing load metadata
2022-01-07 12:40:03 +01:00
Ozzie Isaacs
405f3c181f
Added korean locale
2022-01-06 14:04:49 +01:00
Ozzie Isaacs
6d839d5cc7
Bugfixes from testrun
2022-01-04 21:12:59 +01:00
Ozzieisaacs
7b8b2f93a0
Merge remote-tracking branch 'scholary/master'
2021-12-30 14:55:39 +01:00
Ozzieisaacs
ae1f515446
Bugfix uncheck all ekements in books list and user list
...
Improved testability for books list
2021-12-30 14:45:31 +01:00
Ozzieisaacs
f39dc100b4
Migrated some routes to POST
...
- shelf massadd
- resetpassword
- delete shelf
- send to kindle
2021-12-30 14:45:31 +01:00
Ozzieisaacs
785726deee
Migrated some routes to POST
...
- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown
2021-12-30 14:45:30 +01:00
cbartondock
4edd1914b4
Fixed google scholar issues
2021-12-23 23:16:41 -05:00
Ozzie Isaacs
2e815147fb
Merge branch 'master' into Develop
...
# Conflicts:
# cps/kobo_sync_status.py
# test/Calibre-Web TestSummary_Linux.html
2021-12-19 10:29:56 +01:00
Ozzie Isaacs
f0399d04b7
Merge remote-tracking branch 'bookmark_csrf/master'
2021-12-14 17:59:32 +01:00
Ozzie Isaacs
9b57fa25de
Merge remote-tracking branch 'zh/master'
2021-12-14 17:52:12 +01:00
collerek
920acaca99
everything working to refactor
2021-12-11 01:06:04 +01:00
xlivevil
a184f4e71a
Merge branch 'master' into master
2021-12-08 22:58:30 +08:00
Ozzie Isaacs
9d9acb058d
Add button to force full kobo sync
2021-12-06 21:02:06 +01:00
Ozzie Isaacs
fd5ab0ef53
Bugfix handle archive bit
2021-12-05 18:01:56 +01:00
Ozzie Isaacs
d217676350
Upated testresult
...
Bugfix book table
2021-12-05 13:09:41 +01:00
Ozzie Isaacs
cd5711e651
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
2021-12-04 20:56:04 +01:00
Ozzie Isaacs
bd01e840ca
Delete books in shelfs, downloaded books, kobo sync status, etc on database change ( fixes #620 )
2021-12-04 11:50:25 +01:00
Jonathan Fenske
3f91313303
Update epub.js
...
send the CSRF token when adding bookmarks
2021-11-30 22:24:34 -06:00
xlivevil
67e3721530
fix(tinymce Simplified Chinese locale):rename zh_CN to zh_Hans_CN
2021-12-01 11:28:03 +08:00
Ozzieisaacs
6deb527769
Merge branch 'master' into Develop
2021-11-21 09:14:36 +01:00
Ozzie Isaacs
7ad419dc8c
Fix upload of cover and book formats containing html characters
2021-11-20 13:40:23 +01:00
Ozzieisaacs
4fd4cf4355
Merge branch 'master' into Develop
...
# Conflicts:
# cps/static/css/style.css
# cps/web.py
2021-11-13 17:41:16 +04:00
Ozzieisaacs
42cc13d1e2
Mark which functions are selected on list pages
2021-11-03 21:07:16 +04:00
Ozzieisaacs
1e0ff0f9c2
Fix #2045 ("fetch metadata" update appends to the existing tags instead or replacing them)
2021-11-03 18:16:15 +04:00
Ozzieisaacs
95371d0d7f
Fix shelf grid ordering for inverted order at page load
...
Ordering buttons now visible on medium size screens
2021-11-02 20:27:50 +04:00
Ozzieisaacs
a5415e00d5
Fix grid to list in series view
...
Fix sort asc, desc in author and series list
2021-11-01 13:11:49 +01:00
Ozzie Isaacs
a8317d900b
Bugfix for edit custom ratings in list edit mode
...
Bugfix for deleting custom enum in list edit mode
2021-10-30 15:50:17 +02:00
Ozzie Isaacs
be7ac7e163
Update infinite scrolling javascript
2021-10-25 19:17:10 +02:00
Ozzie Isaacs
3a1a32f053
Update infinite scrolling javascript
2021-10-25 19:16:52 +02:00
Ozzie Isaacs
f6a2b8a9ef
Read and archive bit visible in book table
2021-10-24 21:32:19 +02:00
Ozzie Isaacs
cdd38350fe
Updated tinymce editor, enabled raw html edit
2021-10-24 17:14:50 +02:00
Ozzie Isaacs
516e76de4f
Updated tinymce editor, enabled raw html edit
2021-10-24 17:13:57 +02:00
Ozzie Isaacs
fe4db16a7e
html editor in books list
2021-10-21 20:13:04 +02:00
Ozzie Isaacs
7671a1d5c8
Fix errormessage after update
2021-10-17 15:36:19 +02:00
Ozzie Isaacs
00dc60da79
Added translation for traditional chinese
2021-10-17 15:02:16 +02:00
Ozzie Isaacs
666015e867
Fix datepicker localized month names
...
Removed redundant parenthesis in kobo.py response
2021-10-16 20:53:44 +02:00
Ozzie Isaacs
9d5e9b28ae
Enabled editing of "number" custom_columns in books list
2021-10-16 20:46:16 +02:00
Ozzie Isaacs
cea10d3945
Merge remote-tracking branch 'comic_sort/comic_reader_sort'
2021-10-16 11:50:46 +02:00