1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-25 17:40:31 +00:00
calibre-web/cps
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
2020-04-30 18:08:28 +02:00
..
services Merge branch 'master' into Develop 2020-04-25 20:06:25 +02:00
static Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
templates Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
translations Revert accidently deleted nl translation strings 2020-04-27 21:11:43 +02:00
__init__.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
about.py Fixes for oauth login after programming basic tests 2020-04-15 22:03:21 +02:00
admin.py Renabled cbrimage extraction (via unrar and rarfile) 2020-04-28 16:50:08 +02:00
cache_buster.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
cli.py Code cosmetics 2020-04-19 19:08:58 +02:00
comic.py Add unrar Support 2020-04-28 20:23:39 +02:00
config_sql.py Merge branch 'master' into Develop 2020-04-25 20:06:25 +02:00
constants.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
converter.py Merge remote-tracking branch 'github_3/hotfix/epub-import' 2019-10-20 15:48:06 +02:00
db.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
editbooks.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
epub.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
fb2.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
gdrive.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
gdriveutils.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
helper.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
iso_language_names.py Merge remote-tracking branch 'turkish/master' 2020-04-24 22:14:57 +02:00
isoLanguages.py Moved language names from iso639.pickle to a python file 2019-07-30 15:16:24 +03:00
jinjia.py Code cosmetics 2020-04-19 19:08:58 +02:00
kobo_auth.py Code cosmetics 2020-04-27 20:01:13 +02:00
kobo.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
logger.py Code cosmetics 2020-04-19 19:08:58 +02:00
oauth_bb.py Fix for #1307 (Oauth login not working) 2020-04-16 17:58:42 +02:00
oauth.py Code cosmetics 2020-04-19 19:08:58 +02:00
opds.py Fix opds with shelves 2020-04-26 08:40:53 +02:00
pagination.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
redirect.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
reverseproxy.py Merge branch 'master' into Develop 2020-02-17 18:42:53 +01:00
server.py bugfix on create shelv via kobo sync protocol 2020-04-25 20:02:55 +02:00
shelf.py Merge remote-tracking branch 'kobo/shelves' into Develop 2020-04-24 16:56:08 +02:00
subproc_wrapper.py Code cosmetics 2020-04-19 19:08:58 +02:00
ub.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
updater.py Code cosmetics 2020-04-19 19:08:58 +02:00
uploader.py Renabled cbrimage extraction (via unrar and rarfile) 2020-04-28 16:50:08 +02:00
web.py Merge branch 'master' into Develop 2020-04-30 18:08:28 +02:00
worker.py Code cosmetics 2020-04-27 20:01:13 +02:00