NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
da3fcb9a72
calibre-web/cps
History
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
2019-03-10 08:31:10 +01:00
..
static Merge branch 'master' into Develop 2019-03-10 08:31:10 +01:00
templates Merge branch 'master' into Develop 2019-03-10 08:31:10 +01:00
translations Merge branch 'master' into Develop 2019-03-10 08:31:10 +01:00
__init__.py Code cosmetics 2019-03-04 20:03:09 +01:00
about.py Merge remote-tracking branch 'github/patch-1' into Develop 2019-02-24 19:34:57 +01:00
admin.py Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
cache_buster.py Updated translations 2019-01-20 19:37:45 +01:00
cli.py Updated translations 2019-01-20 19:37:45 +01:00
comic.py Fix for #812 2019-03-05 21:28:55 +01:00
converter.py More refactoring 2019-02-08 20:12:16 +01:00
db.py Working again (basically) 2019-02-06 21:52:32 +01:00
editbooks.py Fix uncompressed cbz files 2019-03-05 20:59:30 +01:00
epub.py Updated translations 2019-01-20 19:37:45 +01:00
fb2.py Updated translations 2019-01-20 19:37:45 +01:00
gdrive.py Link fixes 2019-02-16 07:23:36 +01:00
gdriveutils.py Merge branch 'master' into Develop 2019-02-20 18:09:42 +01:00
helper.py Merge remote-tracking branch 'github/patch-1' into Develop 2019-02-24 19:34:57 +01:00
jinjia.py More refactoring 2019-02-08 20:12:16 +01:00
oauth_bb.py Unicode 2019-02-24 19:08:24 +01:00
oauth.py Link fixes 2019-02-16 07:23:36 +01:00
opds.py Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
pagination.py More refactoring 2019-02-08 20:12:16 +01:00
redirect.py Updated translations 2019-01-20 19:37:45 +01:00
reverseproxy.py More refactoring 2019-02-08 20:12:16 +01:00
server.py More refactoring 2019-02-08 20:12:16 +01:00
shelf.py Merge remote-tracking branch 'github/patch-1' into Develop 2019-02-24 19:34:57 +01:00
subproc_wrapper.py Refactor subprocess calls 2019-02-03 18:32:27 +01:00
ub.py Merge branch 'master' into Develop 2019-03-10 08:31:10 +01:00
updater.py Merge branch 'master' into Develop 2019-02-24 10:39:37 +01:00
uploader.py Code cosmetics 2019-03-04 20:03:09 +01:00
web.py Merge branch 'master' into Develop 2019-03-10 08:31:10 +01:00
worker.py Link fixes 2019-02-16 07:23:36 +01:00