calibre-web/cps
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
2020-04-16 20:12:27 +02:00
..
services Merge branch 'master' into Develop 2020-04-16 20:12:27 +02:00
static Merge branch 'master' into Develop 2020-04-16 20:12:27 +02:00
templates Merge branch 'master' into Develop 2020-04-16 20:12:27 +02:00
translations Update Translation 2020-04-03 19:50:29 +02:00
__init__.py Merge branch 'master' into Develop 2020-03-29 16:48:56 +02:00
about.py Fixes for oauth login after programming basic tests 2020-04-15 22:03:21 +02:00
admin.py Fixes for oauth login after programming basic tests 2020-04-15 22:03:21 +02:00
cache_buster.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
cli.py Merge with branch develop 2020-02-23 09:08:01 +01:00
comic.py English Language V2 2020-03-19 13:10:10 +11:00
config_sql.py Merge branch 'master' into Develop 2020-04-16 20:12:27 +02:00
constants.py Merge remote-tracking branch 'kobo_book_delete' into Develop 2020-03-12 20:43:39 +01:00
converter.py Merge remote-tracking branch 'github_3/hotfix/epub-import' 2019-10-20 15:48:06 +02:00
db.py Added fix for python2 regex 2020-04-14 10:58:32 +02:00
editbooks.py Merge remote-tracking branch 'kobo_book_delete' into Develop 2020-03-12 20:43:39 +01: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-16 20:12:27 +02:00
iso_language_names.py Updated tiniymce + locale 2020-01-12 14:11:53 +01:00
isoLanguages.py Moved language names from iso639.pickle to a python file 2019-07-30 15:16:24 +03:00
jinjia.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
kobo.py Merge remote-tracking branch 'fix/fix_covers' into Develop 2020-04-04 06:57:54 +02:00
kobo_auth.py Update Translation 2020-02-23 20:07:21 +01:00
logger.py Improve logger for windows 2020-03-28 07:13:51 +01:00
oauth.py Fix for #1307 (Oauth login not working) 2020-04-16 17:58:42 +02:00
oauth_bb.py Fix for #1307 (Oauth login not working) 2020-04-16 17:58:42 +02:00
opds.py Added redirect after create shelf 2020-04-02 20:19:05 +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 Update shelfs handling, bugfix changed updater 2020-04-02 18:23:24 +02:00
shelf.py Merge remote-tracking branch 'english/master' 2020-04-03 19:46:26 +02:00
subproc_wrapper.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
ub.py Merge branch 'master' into Develop 2020-04-16 20:12:27 +02:00
updater.py Update Updater 2020-04-01 18:45:16 +02:00
uploader.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
web.py Merge branch 'master' into Develop 2020-04-16 20:12:27 +02:00
worker.py Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 2020-01-01 17:29:01 +01:00