Ozzieisaacs
|
2de4bfdcf2
|
Merge branch 'master' into Develop
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
|
6 years ago |
|
Ozzieisaacs
|
0b8624b542
|
Deleted load metadata from douban, as API seems to be shut down (#858)
|
6 years ago |
|
Ozzieisaacs
|
4ae9d4a749
|
Merge branch 'master' into Develop
# Conflicts:
# cps/web.py
# cps/worker.py
|
6 years ago |
|
Ozzieisaacs
|
436c2671d1
|
Fix delete domain entries
Fix error handling smtp.authentication error
|
6 years ago |
|
Ozzieisaacs
|
2a5f2ff7b3
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
|
6 years ago |
|
Ozzieisaacs
|
dc933f3d66
|
Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
|
6 years ago |
|
Daniel Pavel
|
439ce19b5d
|
Updated epub.js to v0.3.66
|
6 years ago |
|
Ozzieisaacs
|
1c9ff6421d
|
Fix uploader
|
6 years ago |
|
Ozzieisaacs
|
4b301a7961
|
Additional fix for #845 (in case of error)
|
6 years ago |
|
Ozzieisaacs
|
dc93222579
|
Update 2 column author list view
|
6 years ago |
|
Ozzieisaacs
|
6940bb9b88
|
Code improvement
|
6 years ago |
|
Ozzieisaacs
|
7c69589c5b
|
Code cosmetics unrar.js
|
6 years ago |
|
Ozzieisaacs
|
149e9b4bd4
|
Code cosmetis unrar
|
6 years ago |
|
Ozzieisaacs
|
a360b1759a
|
Code cosmetics
bugfix import HttpError from pydrive
|
6 years ago |
|
Ozzieisaacs
|
1db1c2e7df
|
Enabling LDAP working again
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
|
6 years ago |
|
Ozzieisaacs
|
da3fcb9a72
|
Merge branch 'master' into Develop
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
|
6 years ago |
|
Ozzieisaacs
|
8612dce97c
|
Merge remote-tracking branch 'author/shorten-authors'
|
6 years ago |
|
Ozzieisaacs
|
0b0e62fdf2
|
Merge remote-tracking branch 'dialog/master'
Fix for #833
|
6 years ago |
|
Ozzieisaacs
|
6f80a63ca6
|
Fix for #827
|
6 years ago |
|
Andrew Sullivan
|
3dfc2f2580
|
fixing issue #833
|
6 years ago |
|
Ozzieisaacs
|
6f0b3bbda0
|
Fix for #812
|
6 years ago |
|
Ozzieisaacs
|
feb6a71f95
|
Fix uncompressed cbz files
merge from master -> file extension limitation
|
6 years ago |
|
Ozzieisaacs
|
1561a4abdf
|
Comic improvments
|
6 years ago |
|
Ozzieisaacs
|
f483ca3214
|
Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
|
6 years ago |
|
Ozzieisaacs
|
466af21548
|
Code Cosmetics
|
6 years ago |
|
Ozzieisaacs
|
0224d45961
|
Code cosmetics
|
6 years ago |
|
Ozzieisaacs
|
fb23db57b4
|
Added filtering of authors, series, categories, publishers
|
6 years ago |
|
Ozzieisaacs
|
68a36597ab
|
Fix opds login on python3
|
6 years ago |
|
Ozzieisaacs
|
fa276fd0d3
|
Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
|
6 years ago |
|
Ozzieisaacs
|
de58d0a4d8
|
Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
|
6 years ago |
|
jianyun.zhao
|
54a006a420
|
[fix] Add a scroll bar to a long list of meta information
|
6 years ago |
|
Ozzieisaacs
|
361a1243d7
|
Improvements #828
|
6 years ago |
|
Virgil Grigoras
|
bd7b0175a1
|
Fix remaining shown by codacy
|
6 years ago |
|
Virgil Grigoras
|
f5cf62f209
|
Fix issues shown by codacy
|
6 years ago |
|
Virgil Grigoras
|
d3ed0317bb
|
styling and javascript for hiding authors
|
6 years ago |
|
Ozzieisaacs
|
f6fbe2e135
|
Fix #766
Update pdf upload
Translation of uploadprogress dialog
|
6 years ago |
|
Ozzieisaacs
|
cc3088c52f
|
Merge branch 'master' into Develop
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
|
6 years ago |
|
Ozzieisaacs
|
0facb8fffa
|
Fix #766
|
6 years ago |
|
Ozzieisaacs
|
1a7052b287
|
Update pdf upload
Translation of uploadprogress dialog
|
6 years ago |
|
Ozzieisaacs
|
17b7333992
|
Merge remote-tracking branch 'caliblur/master'
|
6 years ago |
|
leram84
|
ae279c5123
|
fixed description read-more button
|
6 years ago |
|
hexeth
|
9a0e8fefb7
|
re-add loader code
|
6 years ago |
|
Matt
|
c07cb23ef2
|
Merge branch 'master' of git://github.com/janeczku/calibre-web
|
6 years ago |
|
hexeth
|
5a863541de
|
Fix object object
|
6 years ago |
|
Ozzie Isaacs
|
4c80db4324
|
Revert bootstrap update 3.4.0 -> 3.3.7
|
6 years ago |
|
Ozzieisaacs
|
a0be02e687
|
Ldap working
|
6 years ago |
|
Ozzieisaacs
|
37007dafee
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
|
6 years ago |
|
Ozzieisaacs
|
56826f67fc
|
progressbar during upload thanks to jim3ma
|
6 years ago |
|
lorek123
|
d508b909d1
|
update js and css libs, especially to fix xss in Jquery and Bootstrap
|
6 years ago |
|
Ozzieisaacs
|
f5235b1d4c
|
Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
|
6 years ago |