user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'original/Develop' into kobo_book_delete

Browse Source
This commit is contained in:
Michael Shavit
2020-01-26 15:58:57 -05:00
parent 4547c328bc 2eec329bdf
commit 9804a98af8
19 changed files with 628 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/config_sql.py
+3 -1
View File
@@ -68,6 +68,7 @@ class _Settings(_Base):
config_anonbrowse = Column(SmallInteger, default=0)
config_public_reg = Column(SmallInteger, default=0)
config_remote_login = Column(Boolean, default=False)
config_kobo_sync = Column(Boolean, default=False)
config_default_role = Column(SmallInteger, default=0)
config_default_show = Column(SmallInteger, default=38911)
@@ -89,7 +90,8 @@ class _Settings(_Base):
config_login_type = Column(Integer, default=0)
# config_oauth_provider = Column(Integer)
config_kobo_proxy = Column(Boolean, default=False)
config_ldap_provider_url = Column(String, default='localhost')
config_ldap_port = Column(SmallInteger, default=389)