Ghighi Eftimie
|
f1e6f6e505
|
fixes for #1560
|
2020-10-10 14:58:06 +03:00 |
|
Ghighi Eftimie
|
b4f95cced7
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-10 14:51:55 +03:00 |
|
Ozzieisaacs
|
e16c0caebb
|
Fix opds search
|
2020-10-10 12:53:10 +02:00 |
|
Ozzieisaacs
|
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 |
|
Ozzieisaacs
|
e1d5c2c578
|
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
|
2020-10-10 12:29:30 +02:00 |
|
Ozzieisaacs
|
49f49632ad
|
Renamed CalibLur.css
|
2020-10-10 12:22:52 +02:00 |
|
Ghighi Eftimie
|
6dadc6fb1e
|
same fix but hopefully better
|
2020-10-10 13:15:02 +03:00 |
|
Ozzieisaacs
|
a58a2f5fe4
|
Added missing file for tr locale of datepicker
|
2020-10-10 11:53:15 +02:00 |
|
Ghighi Eftimie
|
c33c6bbff0
|
fix for #1594
|
2020-10-10 12:39:52 +03:00 |
|
Ozzieisaacs
|
093f90d4c1
|
Update translation files
|
2020-10-10 11:38:40 +02:00 |
|
Ozzieisaacs
|
20ffa325d3
|
Fix #1642
|
2020-10-10 10:53:08 +02:00 |
|
Ghighi Eftimie
|
5027304801
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-10 11:50:19 +03:00 |
|
Ozzieisaacs
|
85d5afd6d9
|
Merge branch 'Develop' into master
|
2020-10-10 10:38:11 +02:00 |
|
OzzieIsaacs
|
df295e92ee
|
Merge remote-tracking branch 'origin/Develop' into Develop
|
2020-10-10 10:33:12 +02:00 |
|
Ozzieisaacs
|
2e67bd2407
|
Fix add to shelf from search
|
2020-10-10 10:32:53 +02:00 |
|
OzzieIsaacs
|
9aa01ee8cf
|
Merge branch 'master' into Develop
|
2020-10-10 10:14:33 +02:00 |
|
OzzieIsaacs
|
6b993ad329
|
Update test results
|
2020-10-10 10:14:09 +02:00 |
|
OzzieIsaacs
|
d70ded0993
|
Fix for search
|
2020-10-10 07:47:27 +02:00 |
|
OzzieIsaacs
|
3dacdcc8bb
|
Merge remote-tracking branch 'worker/db' into Develop
|
2020-10-10 07:31:08 +02:00 |
|
OzzieIsaacs
|
bb03026589
|
Fixes from merge problems
|
2020-10-10 07:30:03 +02:00 |
|
Ghighi Eftimie
|
2f69e3141e
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-07 09:16:34 +03:00 |
|
Ozzieisaacs
|
1f4564da76
|
Merge remote-tracking branch 'es/patch-1' into master
|
2020-10-06 21:48:42 +02:00 |
|
OzzieIsaacs
|
3b8e5ddfb3
|
Merge remote-tracking branch 'worker/db' into Develop
# Conflicts:
# cps/tasks/convert.py
|
2020-10-06 21:40:47 +02:00 |
|
Nacho Soler
|
edc293f96a
|
Update
Add some missings translations
|
2020-10-06 16:43:00 +02:00 |
|
blitzmann
|
3fa4149bb0
|
Fix reference issue
|
2020-10-05 23:15:42 -04:00 |
|
OzzieIsaacs
|
4b68a6ff23
|
Updates tests
|
2020-10-04 19:25:06 +02:00 |
|
Ozzieisaacs
|
28116c49dc
|
Merge branch 'worker_task' into Develop
|
2020-10-04 19:23:32 +02:00 |
|
Ozzieisaacs
|
6e6f144b7a
|
Paginated search and advanced search
Wraparound on books list deactivated
|
2020-10-04 19:23:06 +02:00 |
|
Ozzieisaacs
|
e3f4f24c3e
|
Fixes for failed email and conversions with gdrive
|
2020-10-04 13:59:33 +02:00 |
|
Ozzieisaacs
|
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 |
|
Ozzieisaacs
|
95d540630e
|
Change ldap_certpath to file
|
2020-10-04 06:15:35 +02:00 |
|
Ozzieisaacs
|
23d66a0d68
|
Fix
|
2020-10-03 21:43:48 +02:00 |
|
Ozzieisaacs
|
0d64692c84
|
Fix for convert + email task with gdrive
|
2020-09-30 19:29:57 +02:00 |
|
Ozzieisaacs
|
1cb640e51e
|
Update minimum required version of SQLAlchemy (Fix #1641)
|
2020-09-29 18:19:00 +02:00 |
|
Ozzieisaacs
|
2d98285545
|
Update minimum required version of SQLAlchemy
|
2020-09-29 18:16:56 +02:00 |
|
OzzieIsaacs
|
376001100a
|
Bugfixes from last testrun
|
2020-09-28 21:24:47 +02:00 |
|
Ozzieisaacs
|
e2954249f8
|
Update chinese translation
|
2020-09-27 19:22:41 +02:00 |
|
Ozzieisaacs
|
cc0b0196f4
|
Store UI settings in flask session for guest user
|
2020-09-27 19:12:10 +02:00 |
|
Ozzieisaacs
|
6dfa171b4e
|
Added id's for testing
moved downloaded books section
|
2020-09-27 16:00:17 +02:00 |
|
Ozzieisaacs
|
b140073988
|
Merge branch 'master' into Develop
Fix #1629 (Gevent Tracebacks with SSL encryption)
|
2020-09-27 13:02:25 +02:00 |
|
Ozzieisaacs
|
c22bc857b0
|
Fix #1629 (Gevent Tracebacks with SSL encryption)
|
2020-09-27 13:00:07 +02:00 |
|
Ozzieisaacs
|
497fbdcdfc
|
Save view settings
|
2020-09-27 12:37:41 +02:00 |
|
Ozzieisaacs
|
861f1b2ca3
|
Merge branch 'master' into Develop
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
|
2020-09-27 08:54:32 +02:00 |
|
Ozzieisaacs
|
6108ef4c89
|
Version update to 0.6.10 Beta
|
2020-09-27 07:43:56 +02:00 |
|
OzzieIsaacs
|
a9c0bcb4a2
|
Updated testresults
Version bump for release
|
2020-09-27 07:15:03 +02:00 |
|
Ozzie Isaacs
|
8f9de05768
|
Update Test results windows
|
2020-09-27 06:33:41 +02:00 |
|
Ozzieisaacs
|
e61e94f0fa
|
Merge remote-tracking branch 'it/patch-15' into master
Updated Translations
|
2020-09-26 16:19:34 +02:00 |
|
Ozzieisaacs
|
85aac02593
|
Merge remote-tracking branch 'css/master' into master
|
2020-09-26 16:13:53 +02:00 |
|
Ozzieisaacs
|
9a678c41fe
|
Fix error from merge
|
2020-09-26 09:42:40 +02:00 |
|
Ozzieisaacs
|
7c8f6ce62f
|
Merge branch 'master' into Develop
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
|
2020-09-26 07:54:38 +02:00 |
|