Commit Graph

2092 Commits

Author SHA1 Message Date
f9995583a5 Merge remote-tracking branch 'translate/patch-1' into master 2020-10-20 17:12:25 +02:00
4cc68bd139 Fixed typo. 2020-10-20 13:45:01 +02:00
d2510ad1bc Merge remote-tracking branch 'upstream/master' 2020-10-17 21:46:26 -04:00
bc0416cbb4 Fix for #1660 (advanced search for custom columns working, headline for advanced search working) 2020-10-16 20:24:15 +02:00
2814617e4b Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search)
Fix #1666 (Pagination in search not working)
2020-10-16 19:56:24 +02:00
da9dfd166d fixed incorrect cover widths 2020-10-16 13:51:48 -04:00
1be07a42df Flex display to fix columns issue 2020-10-16 13:41:48 -04:00
1d83a6a898 distinguish convert from and convert to extensions 2020-10-16 11:51:59 -04:00
2ff286b672 natural solution, pagination is changing on new page 2020-10-16 00:43:57 +03:00
e8620a0986 Fix logging error on windows with invalid goodreads key/secret 2020-10-14 20:48:01 +02:00
5b67b687d3 Removed remaining code from view downloaded books in user section
Fixes for #1661
2020-10-13 19:45:27 +02:00
9adcfa99f4 trigger infinite scroll script only on templates where .load-more class is present 2020-10-11 22:35:56 +03:00
e723aaa5f6 fix for history state (+1 not needed) 2020-10-11 21:56:49 +03:00
d128b037a5 Fix for editing files on windows 2020-10-11 18:01:26 +02:00
f574f8faf0 better js check 2020-10-10 18:34:55 +03:00
cedfa90d76 fix for #981 2020-10-10 17:51:46 +03:00
f1e6f6e505 fixes for #1560 2020-10-10 14:58:06 +03:00
e16c0caebb Fix opds search 2020-10-10 12:53:10 +02:00
52489a484a Merge remote-tracking branch 'Knepherbird/master' into master
# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
2020-10-10 12:47:49 +02:00
e1d5c2c578 Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master 2020-10-10 12:29:30 +02:00
49f49632ad Renamed CalibLur.css 2020-10-10 12:22:52 +02:00
6dadc6fb1e same fix but hopefully better 2020-10-10 13:15:02 +03:00
a58a2f5fe4 Added missing file for tr locale of datepicker 2020-10-10 11:53:15 +02:00
c33c6bbff0 fix for #1594 2020-10-10 12:39:52 +03:00
093f90d4c1 Update translation files 2020-10-10 11:38:40 +02:00
20ffa325d3 Fix #1642 2020-10-10 10:53:08 +02:00
df295e92ee Merge remote-tracking branch 'origin/Develop' into Develop 2020-10-10 10:33:12 +02:00
2e67bd2407 Fix add to shelf from search 2020-10-10 10:32:53 +02:00
9aa01ee8cf Merge branch 'master' into Develop 2020-10-10 10:14:33 +02:00
d70ded0993 Fix for search 2020-10-10 07:47:27 +02:00
bb03026589 Fixes from merge problems 2020-10-10 07:30:03 +02:00
1f4564da76 Merge remote-tracking branch 'es/patch-1' into master 2020-10-06 21:48:42 +02:00
3b8e5ddfb3 Merge remote-tracking branch 'worker/db' into Develop
# Conflicts:
#	cps/tasks/convert.py
2020-10-06 21:40:47 +02:00
edc293f96a Update
Add some missings translations
2020-10-06 16:43:00 +02:00
6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
2020-10-04 19:23:06 +02:00
e3f4f24c3e Fixes for failed email and conversions with gdrive 2020-10-04 13:59:33 +02:00
eb37e3a52b Fix UI Deelete Buttons in Edit Books page
Fix Conversion of multiple formats of one book in the queue with gdrive
2020-10-04 12:09:52 +02:00
95d540630e Change ldap_certpath to file 2020-10-04 06:15:35 +02:00
23d66a0d68 Fix 2020-10-03 21:43:48 +02:00
0d64692c84 Fix for convert + email task with gdrive 2020-09-30 19:29:57 +02:00
376001100a Bugfixes from last testrun 2020-09-28 21:24:47 +02:00
e2954249f8 Update chinese translation 2020-09-27 19:22:41 +02:00
cc0b0196f4 Store UI settings in flask session for guest user 2020-09-27 19:12:10 +02:00
6dfa171b4e Added id's for testing
moved downloaded books section
2020-09-27 16:00:17 +02:00
b140073988 Merge branch 'master' into Develop
Fix #1629 (Gevent Tracebacks with SSL encryption)
2020-09-27 13:02:25 +02:00
c22bc857b0 Fix #1629 (Gevent Tracebacks with SSL encryption) 2020-09-27 13:00:07 +02:00
497fbdcdfc Save view settings 2020-09-27 12:37:41 +02:00
861f1b2ca3 Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
2020-09-27 08:54:32 +02:00
6108ef4c89 Version update to 0.6.10 Beta 2020-09-27 07:43:56 +02:00
a9c0bcb4a2 Updated testresults
Version bump for release
2020-09-27 07:15:03 +02:00