mmonkey
|
04a5db5c1d
|
Resolve merge conflicts
|
3 years ago |
Ozzie Isaacs
|
018f3ca250
|
Sort authors additionally to series and series_index (Fix #2001)
Sqlalchemy version2 is now a global flag
|
3 years ago |
|
Ozzie Isaacs
|
78d0fd811b
|
Version bump
|
3 years ago |
|
Ozzie Isaacs
|
54d06e580d
|
Release version 0.6.12
|
3 years ago |
|
Ozzie Isaacs
|
dd30ac4fbd
|
Added thumbnails
Merge remote-tracking branch 'cover/thumbnails' into development
# Conflicts:
# cps/admin.py
# cps/templates/layout.html
# cps/ub.py
# cps/web.py
Update join for sqlalchemy 1.4
|
3 years ago |
|
Ozzie Isaacs
|
d87ccae6c9
|
Merge branch 'master' into development
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
|
3 years ago |
|
Ozzie Isaacs
|
fcf9e7a1ef
|
Upload pdf fixes:
Handle no title
Handle no author
Fix import of more than one language
Add missing pdf upload publisher handling
|
3 years ago |
|
Ozzie Isaacs
|
f62d6abb69
|
Merge branch 'master' into development
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
|
3 years ago |
|
Ozzie Isaacs
|
12ad7a6322
|
Suppress some errors
|
3 years ago |
|
Ozzie Isaacs
|
b75247ea3a
|
Suppress some errors
|
3 years ago |
|
Ozzie Isaacs
|
f77d72fd86
|
Merge branch 'master' into development
# Conflicts:
# cps/static/css/style.css
|
3 years ago |
|
Ozzie Isaacs
|
725fc658f8
|
Some code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
0992bafe30
|
Bulk User management
|
3 years ago |
|
Ozzie Isaacs
|
60497c60c1
|
Update creating Home_Config variable for packaging support, added .HOMEDIR to ignored filename during update
|
3 years ago |
|
Ozzie Isaacs
|
e6fb460071
|
New restart routine for executable files
Fix log in updater
New source option updater available
|
3 years ago |
|
Ozzie Isaacs
|
6137fdeb33
|
Version bump
|
3 years ago |
|
Ozzie Isaacs
|
be26e5f152
|
Update Teststatus
Update Version
|
3 years ago |
|
Ozzie Isaacs
|
51f9cd4bb4
|
Fix english language names
|
3 years ago |
|
Ozzie Isaacs
|
a1668e2411
|
Version Bump
|
3 years ago |
|
Ozzie Isaacs
|
9418045a2c
|
Updated Translation
Version bump
Fixed errors in requirements file(s)
|
3 years ago |
cbartondock
|
1d83a6a898
|
distinguish convert from and convert to extensions
|
4 years ago |
|
Ozzieisaacs
|
6dfa171b4e
|
Added id's for testing
moved downloaded books section
|
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 |
|
Ozzieisaacs
|
4516cc0d65
|
Listen button only visible if user has read permissions
Audioformat fix
Table edit functions only available if user has edit rights
|
4 years ago |
|
Ozzieisaacs
|
9145c9a52c
|
Fix #1397 (Reenabled m4a, m4b audio playback)
|
4 years ago |
|
Ozzieisaacs
|
94592b74a6
|
Merge branch 'master' into Develop
|
4 years ago |
|
Ozzieisaacs
|
b83d56eff2
|
Version bump
|
4 years ago |
|
OzzieIsaacs
|
2ad329e64c
|
Preparation for release
|
4 years ago |
|
Ozzieisaacs
|
b852fb0e26
|
Merge branch 'Develop'
|
4 years ago |
|
Ozzieisaacs
|
38c28f4358
|
Merge branch 'master' into Develop
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
|
4 years ago |
|
Ozzieisaacs
|
2468cf63cc
|
Fix for #1397 (changed supported audio files)
Changed max gevent version
Fix for #1397 (changed supported audio files)
|
4 years ago |
|
Ozzieisaacs
|
0a02caad04
|
Improvements
|
4 years ago |
|
Ozzieisaacs
|
48f4b12c0e
|
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
|
4 years ago |
|
Ozzieisaacs
|
51808d2ad4
|
Version Bump
|
4 years ago |
|
Ozzieisaacs
|
0735fb1e92
|
Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
Preparation for release
|
4 years ago |
|
Ozzieisaacs
|
64bebaa1d1
|
Update Upload formats
|
4 years ago |
|
OzzieIsaacs
|
2c5d76908a
|
Added missing upload format
|
4 years ago |
|
Ozzieisaacs
|
b160a8de0b
|
Merge branch 'master' into Develop
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
|
4 years ago |
jvoisin
|
487878819e
|
Move a few variables around
This should prevent a couple of crashes
due to undeclared variables.
|
4 years ago |
|
Ozzieisaacs
|
b4d7733e0a
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
|
4 years ago |
|
Ozzieisaacs
|
e29f17ac46
|
Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
# cps/kobo.py
# cps/shelf.py
|
4 years ago |
|
Ozzieisaacs
|
81a329f1e7
|
Fix for #1087 ( Caliblur! Theme button alignment)
|
4 years ago |
|
Ozzieisaacs
|
09e7d76c6f
|
Merge remote-tracking branch 'kobo_book_delete' into Develop
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
|
4 years ago |
|
Ozzieisaacs
|
e60ef8fc97
|
Calibre-web version visible in about section
Update Calibre-web Version info
|
4 years ago |
|
Ozzieisaacs
|
7c89f0b5b9
|
Merge with branch develop
Release version
|
4 years ago |
Michael Shavit
|
9804a98af8
|
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
|
4 years ago |
|
Ozzieisaacs
|
594c8aad91
|
Update Version Info
|
4 years ago |
|
Ozzieisaacs
|
2eec329bdf
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
|
4 years ago |