1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-24 18:47:23 +00:00
calibre-web/cps
Ozzieisaacs 9fc0c3b3de Merge remote-tracking branch 'English_texts/master'
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
2020-02-23 13:27:44 +01:00
..
services Merge remote-tracking branch 'fix/kobo' 2020-02-23 13:17:59 +01:00
static Merge branch 'Develop' 2020-02-23 13:15:30 +01:00
templates Merge remote-tracking branch 'English_texts/master' 2020-02-23 13:27:44 +01:00
translations Update translation 2020-02-23 13:22:57 +01:00
__init__.py Fix auto detection of locale 2020-02-01 13:40:29 +01:00
about.py Merge branch 'Develop' 2020-02-23 13:15:30 +01:00
admin.py Bugfixes from tests 2020-02-15 16:02:31 +01: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 Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
config_sql.py Renamed restrict -> deny 2020-02-15 10:21:45 +01:00
constants.py Calibre-web version visible in about section 2020-02-23 12:40:11 +01:00
converter.py Merge remote-tracking branch 'github_3/hotfix/epub-import' 2019-10-20 15:48:06 +02:00
db.py Merge with branch develop 2020-02-23 09:08:01 +01:00
editbooks.py Merge with branch develop 2020-02-23 09:08:01 +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-02-17 18:42:53 +01: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_auth.py Merge remote-tracking branch 'fix/kobo' 2020-02-23 13:17:59 +01:00
kobo.py Merge branch 'master' into Develop 2020-02-22 16:24:06 +01:00
logger.py Logging to stdout, proposal form #1078 2019-11-16 10:09:34 +01:00
oauth_bb.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
oauth.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
opds.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01: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 Merge with branch develop 2020-02-23 09:08:01 +01:00
shelf.py Merge branch 'master' into Develop 2020-02-17 18:42:53 +01:00
subproc_wrapper.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
ub.py Merge remote-tracking branch 'English_texts/master' 2020-02-23 13:27:44 +01:00
updater.py Merge with branch develop 2020-02-23 09:08:01 +01:00
uploader.py Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
web.py Merge remote-tracking branch 'English_texts/master' 2020-02-23 13:27:44 +01: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