Ozzie Isaacs
|
10731696df
|
Merge branch 'development' into cover_thumb
# Conflicts:
# cps/admin.py
|
3 years ago |
|
Ozzie Isaacs
|
82e15d2e98
|
Merge branch 'master' into development
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
|
3 years ago |
|
Ozzie Isaacs
|
9c842f1895
|
Bugfixes pdf xmp parsing
|
3 years ago |
|
Ozzie Isaacs
|
8cc849488b
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
fcaa232967
|
Merge remote-tracking branch 'origin/master' into master
|
3 years ago |
|
Ozzie Isaacs
|
d3f8153b90
|
Merge branch 'master' into development
|
3 years ago |
|
Ozzie Isaacs
|
99ecf22790
|
Merge remote-tracking branch 'origin/master' into master
|
3 years ago |
|
Ozzie Isaacs
|
b1b7ee65b4
|
Refactored advanced search
|
3 years ago |
|
Ozzie Isaacs
|
6889456662
|
Merge remote-tracking branch 'adv_search/master' into master
|
3 years ago |
|
Ozzie Isaacs
|
081553dc9f
|
Disable blank issue templates
|
3 years ago |
|
Ozzie Isaacs
|
1e7a2c400b
|
Fixed misstyping
|
3 years ago |
|
Ozzie Isaacs
|
30e897af48
|
Merge remote-tracking branch 'cover/thumbnails' into cover_thumb
# Conflicts:
# cps/admin.py
# cps/templates/author.html
# cps/templates/layout.html
# cps/ub.py
# cps/web.py
# requirements.txt
|
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
|
5d8d796807
|
Compatibility for sqlalchemy 2.0
|
3 years ago |
|
Ozzie Isaacs
|
f3d88fc746
|
Update sqlalchemy 1.4 working
|
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
|
2760a7816d
|
Fix metadata recognition fb2 files
|
3 years ago |
|
Ozzie Isaacs
|
8f5c649d0f
|
Updated dependency comicapi (removed pypdf2)
Updated dependency pyPDF2 ->pyPDF3
Fixed broken updater in case of http error
Bugfixes from testrun
Bugfix load cover for BasicMetadata
|
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
|
2be7b6480a
|
Merge remote-tracking branch 'pdf/XMP_Metadata3' into master
|
3 years ago |
cbartondock
|
f5ded86c02
|
removed extraneous logs
|
3 years ago |
rra
|
8abfaf0ffd
|
Parse XMP metadata in separate function, add exception, try multiple metadata formats
|
3 years ago |
|
Ozzie Isaacs
|
b070ba142f
|
Selects are working in user management with generic confirm dialog
|
3 years ago |
|
Ozzie Isaacs
|
bd7c6828bf
|
Selects are working in user management
|
3 years ago |
|
cbartondock
|
d0671ec58c
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
3 years ago |
|
cbartondock
|
1e40ffd1cc
|
merge changes
|
3 years ago |
|
Ozzie Isaacs
|
da2c3e9ed7
|
Edit user mass change checkbox working
|
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
|
9a963bbe79
|
Refactored code
Testrun
|
3 years ago |
|
Ozzie Isaacs
|
994bc8b0e4
|
Removed dropdown button on single file listen/read (Fix #1840)
|
3 years ago |
|
Ozzie Isaacs
|
2451605033
|
Merge remote-tracking branch 'djvu/read-djvu' into master
|
3 years ago |
|
Ozzie Isaacs
|
10942527f3
|
Merge branch 'master' into development
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
|
3 years ago |
|
Ozzie Isaacs
|
4909ed5ccd
|
Merge remote-tracking branch 'cliblur/master' into development
# Conflicts:
# cps/static/css/style.css
|
3 years ago |
|
Ozzie Isaacs
|
5cf5df68dc
|
Merge remote-tracking branch 'cliblur/master' into master
|
3 years ago |
|
Ozzie Isaacs
|
dd32cc99ea
|
Merge remote-tracking branch 'es/patch-1' into master
|
3 years ago |
|
Ozzie Isaacs
|
79092dc8eb
|
Merge remote-tracking branch 'it/patch-21' into master
|
3 years ago |
|
Ozzie Isaacs
|
6229e4610a
|
Updated teststatus and bugfix convert ebooks
|
3 years ago |
Northguy
|
bfe36d3f4a
|
change in color definition
Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
color: hsla(0, 0%, 100%, .45)
}
|
3 years ago |
|
Northguy
|
d42bf44fad
|
Added same color for series name and series number
|
3 years ago |
|
rra
|
33e352819c
|
Merge remote-tracking branch 'upstream/master' into XMP_Metadata3
|
3 years ago |
|
Ozzie Isaacs
|
53ee0aaee1
|
Some functions refactored
|
3 years ago |
|
Ozzie Isaacs
|
42707a19bd
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
0888706790
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
16453a05f8
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
2fbb7466d3
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
f29f94f45f
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
cd973868fc
|
Code cosmetics
|
3 years ago |
|
Ozzie Isaacs
|
3c35f02cac
|
Code cosmetics
|
3 years ago |