a659f2e49d
Improved logging for emails
...
Removed private data from debug export
2021-01-03 19:27:34 +01:00
0d7f2e157a
Update Download Debug package
...
- include config
- bugfix for stream logger
2020-12-12 10:02:11 +01:00
e1987c34d9
Revert expire on commit
2020-12-09 08:49:18 +01:00
8f36128fe3
Merge branch 'session' into Develop
2020-12-08 11:49:39 +01:00
5e3618716d
Fix missing session rollback on commit error
2020-12-07 19:53:34 +01:00
f13522559d
Fixed problems on startup with config session
2020-12-07 13:51:52 +01:00
777c2726d3
Changed session_handing
2020-12-07 08:52:52 +01:00
56505457eb
Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master
...
# Conflicts:
# cps/admin.py
2020-12-03 16:01:15 +01:00
9bd51c650b
Add config options for client certificate authentication
2020-11-20 19:47:50 +01:00
19b2a334e4
Remove unused imports
2020-10-27 11:06:43 +01:00
7929711fea
Improvements for file uploading format restriction
2020-09-08 20:57:39 +02:00
843279bacb
Merge remote-tracking branch 'jef/jef/download-kobo' into master
2020-08-23 21:22:44 +02:00
4d44746a88
Change settings database gdrive watch to JSON
2020-08-15 15:07:03 +02:00
b309c1fc91
Fix filenames (Escape "\") for searching calibre excecutable on windows
2020-08-09 15:11:54 +02:00
1ca4583896
feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported
2020-07-23 12:12:00 +02:00
25fc6f1937
Further fixes for #1530 (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "")
2020-07-22 18:44:11 +02:00
93a0217d5f
Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "")
2020-07-20 20:28:10 +02:00
e048388213
feat(api): include external port option
...
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com >
2020-07-03 12:58:58 -04:00
b852fb0e26
Merge branch 'Develop'
2020-05-25 21:30:21 +02:00
e4eab17595
Fix version detect of binaries on windows
2020-05-24 17:24:54 +02:00
cf10244f20
Fix for failed recovery of config_logfile
2020-05-24 09:59:45 +02:00
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
2020-05-17 16:22:58 +02:00
5405dc5141
Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash)
2020-05-17 11:15:46 +02:00
e787f9dd9f
Automatic username ( #1172 )
2020-05-12 17:23:58 +02:00
308fd55483
#1141 (Setting for file size limit on email)
2020-05-09 20:29:17 +02:00
75fb7c2e95
Allowing upload extensions ( #1119 )
2020-05-09 16:54:22 +02:00
718d50a037
Starting again without traceback (moved gdriveutil import)
2020-05-09 12:17:28 +02:00
41960ada4a
Autodetect binaries
2020-05-09 11:04:35 +02:00
a437c603c6
Merge remote-tracking branch 'kepubify/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/helper.py
# cps/templates/config_edit.html
# cps/web.py
2020-05-08 14:53:21 +02:00
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
2020-05-06 18:47:33 +02:00
fb16429867
Randomize flask secret_key
2020-05-04 19:02:03 +02:00
0adcd1b3d9
UI Improvements
...
Added additional restrictions to Calibre DB interface
2020-05-03 10:55:33 +02:00
fcefd8031a
Fix #985 (png and webp are extracted as cover files from comic files)
2020-05-02 11:24:30 +02:00
64bebaa1d1
Update Upload formats
2020-05-02 10:46:00 +02:00
0138ff9e16
Added additional config options
2020-05-02 10:18:01 +02:00
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
2020-04-25 20:06:25 +02:00
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
2020-04-17 18:16:28 +02:00
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
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
2020-04-14 10:58:32 +02:00
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
2020-04-05 17:31:41 +02:00
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
6c614c06f6
restricted_tags -> denied_tags
...
Fix for the next error after update:
Traceback (most recent call last):
File "cps.py", line 34, in <module>
from cps import create_app
File "/home/rewerson/lib/web/cps/__init__.py", line 68, in <module>
config = config_sql.load_configuration(ub.session)
File "/home/rewerson/lib/web/cps/config_sql.py", line 348, in load_configuration
update({"restricted_tags": conf.config_mature_content_tags}, synchronize_session=False)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/query.py", line 3862, in update
update_op.exec_()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1693, in exec_
self._do_exec()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1874, in _do_exec
values = self._resolved_values
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1840, in _resolved_values
desc = _entity_descriptor(self.mapper, k)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/base.py", line 402, in _entity_descriptor
"Entity '%s' has no property '%s'" % (description, key)
sqlalchemy.exc.InvalidRequestError: Entity '<class 'cps.ub.User'>' has no property 'restricted_tags'
2020-02-25 16:30:51 +03:00
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
a9a6f5b97e
Renamed restrict -> deny
2020-02-15 10:21:45 +01:00
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-01-26 15:58:57 -05:00
0411d4a8c9
Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
...
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
2020-01-26 16:52:40 +01:00
c0239a659c
Add UI support for archived books.
...
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
2020-01-26 00:27:54 -05:00
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
661ed17d23
Handle stream output in logviewer
...
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
2020-01-07 20:26:59 +01:00
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
