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
|
4 years ago |
|
Ozzieisaacs
|
e1d5c2c578
|
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
|
4 years ago |
|
Ozzieisaacs
|
49f49632ad
|
Renamed CalibLur.css
|
4 years ago |
Ghighi Eftimie
|
6dadc6fb1e
|
same fix but hopefully better
|
4 years ago |
|
Ozzieisaacs
|
a58a2f5fe4
|
Added missing file for tr locale of datepicker
|
4 years ago |
|
Ghighi Eftimie
|
c33c6bbff0
|
fix for #1594
|
4 years ago |
|
Ozzieisaacs
|
093f90d4c1
|
Update translation files
|
4 years ago |
|
Ozzieisaacs
|
20ffa325d3
|
Fix #1642
|
4 years ago |
|
Ghighi Eftimie
|
5027304801
|
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
Ozzieisaacs
|
85d5afd6d9
|
Merge branch 'Develop' into master
|
4 years ago |
|
OzzieIsaacs
|
df295e92ee
|
Merge remote-tracking branch 'origin/Develop' into Develop
|
4 years ago |
|
Ozzieisaacs
|
2e67bd2407
|
Fix add to shelf from search
|
4 years ago |
|
OzzieIsaacs
|
9aa01ee8cf
|
Merge branch 'master' into Develop
|
4 years ago |
|
OzzieIsaacs
|
6b993ad329
|
Update test results
|
4 years ago |
|
OzzieIsaacs
|
d70ded0993
|
Fix for search
|
4 years ago |
|
OzzieIsaacs
|
3dacdcc8bb
|
Merge remote-tracking branch 'worker/db' into Develop
|
4 years ago |
|
OzzieIsaacs
|
bb03026589
|
Fixes from merge problems
|
4 years ago |
|
Ghighi Eftimie
|
2f69e3141e
|
Merge remote-tracking branch 'upstream/master'
|
4 years ago |
|
Ozzieisaacs
|
1f4564da76
|
Merge remote-tracking branch 'es/patch-1' into master
|
4 years ago |
|
OzzieIsaacs
|
3b8e5ddfb3
|
Merge remote-tracking branch 'worker/db' into Develop
# Conflicts:
# cps/tasks/convert.py
|
4 years ago |
Nacho Soler
|
edc293f96a
|
Update
Add some missings translations
|
4 years ago |
blitzmann
|
3fa4149bb0
|
Fix reference issue
|
4 years ago |
|
OzzieIsaacs
|
4b68a6ff23
|
Updates tests
|
4 years ago |
|
Ozzieisaacs
|
28116c49dc
|
Merge branch 'worker_task' into Develop
|
4 years ago |
|
Ozzieisaacs
|
6e6f144b7a
|
Paginated search and advanced search
Wraparound on books list deactivated
|
4 years ago |
|
Ozzieisaacs
|
e3f4f24c3e
|
Fixes for failed email and conversions with gdrive
|
4 years ago |
|
Ozzieisaacs
|
eb37e3a52b
|
Fix UI Deelete Buttons in Edit Books page
Fix Conversion of multiple formats of one book in the queue with gdrive
|
4 years ago |
|
Ozzieisaacs
|
95d540630e
|
Change ldap_certpath to file
|
4 years ago |
|
Ozzieisaacs
|
23d66a0d68
|
Fix
|
4 years ago |
|
Ozzieisaacs
|
0d64692c84
|
Fix for convert + email task with gdrive
|
4 years ago |
|
Ozzieisaacs
|
1cb640e51e
|
Update minimum required version of SQLAlchemy (Fix #1641)
|
4 years ago |
|
Ozzieisaacs
|
2d98285545
|
Update minimum required version of SQLAlchemy
|
4 years ago |
|
OzzieIsaacs
|
376001100a
|
Bugfixes from last testrun
|
4 years ago |
|
Ozzieisaacs
|
e2954249f8
|
Update chinese translation
|
4 years ago |
|
Ozzieisaacs
|
cc0b0196f4
|
Store UI settings in flask session for guest user
|
4 years ago |
|
Ozzieisaacs
|
6dfa171b4e
|
Added id's for testing
moved downloaded books section
|
4 years ago |
|
Ozzieisaacs
|
b140073988
|
Merge branch 'master' into Develop
Fix #1629 (Gevent Tracebacks with SSL encryption)
|
4 years ago |
|
Ozzieisaacs
|
c22bc857b0
|
Fix #1629 (Gevent Tracebacks with SSL encryption)
|
4 years ago |
|
Ozzieisaacs
|
497fbdcdfc
|
Save view settings
|
4 years ago |
|
Ozzieisaacs
|
861f1b2ca3
|
Merge branch 'master' into Develop
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
|
4 years ago |
|
Ozzieisaacs
|
6108ef4c89
|
Version update to 0.6.10 Beta
|
4 years ago |
|
OzzieIsaacs
|
a9c0bcb4a2
|
Updated testresults
Version bump for release
|
4 years ago |
Ozzie Isaacs
|
8f9de05768
|
Update Test results windows
|
4 years ago |
|
Ozzieisaacs
|
e61e94f0fa
|
Merge remote-tracking branch 'it/patch-15' into master
Updated Translations
|
4 years ago |
|
Ozzieisaacs
|
85aac02593
|
Merge remote-tracking branch 'css/master' into master
|
4 years ago |
|
Ozzieisaacs
|
9a678c41fe
|
Fix error from merge
|
4 years ago |
|
Ozzieisaacs
|
7c8f6ce62f
|
Merge branch 'master' into Develop
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
|
4 years ago |
|
Ozzieisaacs
|
9a896ea81e
|
Removed logging of headers as it caused trouble while showing logfile in UI
|
4 years ago |
|
Ozzieisaacs
|
422c1893c0
|
Fix for the fix cover_url
|
4 years ago |
ElQuimm
|
f1cb5276d7
|
Update italian message.po
removed typo line 127
|
4 years ago |