mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-16 14:54:55 +00:00
Code Issues Releases Wiki Activity
3,858 Commits 3 Branches 24 Tags 101 MiB
b8aac2b929
Commit Graph

310 Commits

Author SHA1 Message Date
Ozzie Isaacs
302679719d Merge branch 'master' into Develop 
# Conflicts:
#	cps/admin.py
#	cps/converter.py
#	cps/subproc_wrapper.py
#	test/Calibre-Web TestSummary_Linux.html
 2021-07-30 16:33:06 +02:00
Ozzie Isaacs
a63baa1758 better logged in session protection 2021-07-30 16:28:37 +02:00
Ozzie Isaacs
a1a8a0cf29 Logout if logged out and don't allow to get logged in afterwards 2021-07-25 05:24:03 +02:00
Ozzie Isaacs
9a8c342e61 Fix deleting user (deleting shelfs and so on failed before) 2021-07-23 20:03:20 +02:00
Ozzie Isaacs
a27314464a Merge branch 'master' into Develop 2021-07-11 08:50:14 +02:00
Ozzie Isaacs
87f07003f4 Removed invalid code 
Sqlalchemy 2.0 compatibility for kobo sync
 2021-07-11 08:49:47 +02:00
Ozzie Isaacs
a56e071a19 Fix #2043 (Multiuser kobo sync with restrict to shelfs working) 
Sync only selected shelfs is stored correct on creating user
 2021-07-10 17:09:04 +02:00
Ozzie Isaacs
430ccd9ab1 Merge branch 'master' into Develop 2021-06-29 18:52:02 +02:00
Ozzie Isaacs
792d4a65bc Fix typo 2021-06-29 18:24:35 +02:00
Ozzie Isaacs
1833e8fdb4 Success message after database change 2021-06-12 08:48:55 +02:00
Ozzie Isaacs
1a0bf45c34 Check file/folder permissions before update 2021-06-06 12:16:47 +02:00
Ozzie Isaacs
a47d6cd937 Fix confirm dialog database change 
Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers)
 2021-05-26 14:50:44 +02:00
Ozzie Isaacs
a62fca1e55 Merge branch 'master' into Develop 2021-05-22 11:28:59 +02:00
Ozzie Isaacs
c85cfa90a4 Update testresults on windows 
Added encoding on fb2 upload
 2021-05-19 19:21:09 +02:00
Ozzie Isaacs
e15324d2cd Merge branch 'master' into Develop 2021-05-16 09:38:00 +02:00
Ozzie Isaacs
20b84a9459 Unified translations 
Update translations for release
 2021-05-16 09:37:45 +02:00
Ozzie Isaacs
d95838309e Added config option for shelf sync behavior 2021-05-15 10:45:51 +02:00
Ozzieisaacs
02fc698f1c Some little code refactoring 2021-05-02 10:05:25 +02:00
Ozzieisaacs
541c8c4b93 Improved error handling for disapearing custom column linked to visiblility restrictions 2021-05-01 20:52:48 +02:00
Ozzieisaacs
b97373bf37 Improved error handling for disapearing custom column linked to read status 2021-05-01 18:42:57 +02:00
Ozzieisaacs
c0b561cb5a Better input check for custom_columns 2021-05-01 17:10:29 +02:00
Ozzieisaacs
5470acd3af Fix #1964 (RefreshError with unconfigured gdrive) 2021-05-01 12:45:28 +02:00
Ozzie Isaacs
64696fe973 Bugfixes edit user list (Fix #1938) 2021-05-01 08:36:39 +02:00
Ozzie Isaacs
ed2fa4cdd8 Update error handling for user list (#1938) 2021-04-28 20:49:16 +02:00
Ozzie Isaacs
4e3a5ca33b Added additional debug messages, catch additional errors in updater 2021-04-25 11:30:53 +02:00
Ozzie Isaacs
97e4707f72 user list column value and tags editor (#1938) 
Bugfixes for massedit in user list (#1938)
Changed no. of debug messages
 2021-04-25 10:43:01 +02:00
Ozzie Isaacs
bb4749c65b Result for testrun 
Added mass delete of users
refactores user table refresh
Bugfix for sorting with selected users
Bugfix delete books #1938
 2021-04-21 19:23:56 +02:00
Ozzie Isaacs
67775bc797 Update requirements 
Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats
 2021-04-13 19:08:02 +02:00
Ozzie Isaacs
d32b2ca524 Prevent traceback after delete user 
flash message in case last admin role is removed #1938
 2021-04-12 19:04:27 +02:00
Ozzie Isaacs
90f2b3fb21 Refactored list checkbox sort 2021-04-12 18:39:09 +02:00
Ozzieisaacs
b6177b27f4 Sorting of users in table according to selection possible 2021-04-11 19:59:20 +02:00
Ozzieisaacs
ae97e87506 Delete user working from user table (#1938) 
Comment in helper
 2021-04-10 11:32:25 +02:00
Ozzie Isaacs
2d73f541c0 Bugfix sort books list and user list 
Prevent transferring password hash to client
 2021-04-08 19:37:08 +02:00
Ozzie Isaacs
7561eabe52 Implement Backend to deny editing Guest rights restriction #1938 2021-04-07 18:56:17 +02:00
Ozzie Isaacs
067fb1b0b7 Prevent delete Guest user and redirect to admin page after user delete 2021-04-07 18:47:48 +02:00
Ozzie Isaacs
8acd1f1fe4 Code refactoring and improved error handling for edit user list 
Update teststatus
 2021-04-06 17:29:42 +02:00
Ozzie Isaacs
91b9370a21 Merge branch 'master' into development 
# Conflicts:
#	cps/static/css/libs/bootstrap-table.min.css
#	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
#	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
 2021-04-02 17:13:22 +02:00
Ozzie Isaacs
6e406311c3 Fix #1928 (ldap_import_user_filter missing in to_save) 2021-04-02 08:40:29 +02:00
Ozzie Isaacs
99520d54a5 Added ability to send emails via gmail (#1905) 
Gmail email sending
 2021-03-28 14:51:01 +02:00
Ozzie Isaacs
8f91437701 Implementation for gmail server with OAuth2 started 2021-03-27 16:36:24 +01:00
Ozzie Isaacs
0b7c679dba Changed test email message (fix #657) 2021-03-27 09:48:43 +01:00
Ozzie Isaacs
aab3cdc58a Changed test email message 2021-03-27 09:47:43 +01:00
Ozzie Isaacs
9864d932e0 Changed user.nickname to user.name 
Added function to view downloads of all users for admins
 2021-03-21 18:55:02 +01:00
Ozzie Isaacs
436f60caa9 refactored some functions 2021-03-21 14:17:07 +01:00
Ozzie Isaacs
e9530eda9d Bugfix from refactoring 2021-03-21 13:46:13 +01:00
Ozzie Isaacs
59ebc1af8a Code refactoring 2021-03-21 08:20:04 +01:00
Ozzie Isaacs
10731696df Merge branch 'development' into cover_thumb 
# Conflicts:
#	cps/admin.py
 2021-03-21 07:29:35 +01:00
Ozzie Isaacs
8cc849488b Code cosmetics 2021-03-21 07:15:38 +01:00
Ozzie Isaacs
dd30ac4fbd Added thumbnails 
Merge remote-tracking branch 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
 2021-03-20 11:32:50 +01:00
Ozzie Isaacs
b070ba142f Selects are working in user management with generic confirm dialog 2021-03-16 15:52:31 +01:00
Ozzie Isaacs
53ee0aaee1 Some functions refactored 2021-03-14 17:34:47 +01:00
Ozzie Isaacs
81c30d5fd5 Add missing files from bootstrap editable 
Added user-table single-select header for locale and default-language
 2021-02-20 19:55:51 +01:00
Ozzie Isaacs
e64a504bb1 Working Locale and default language selection in user table edit 2021-02-20 14:18:27 +01:00
Ozzie Isaacs
a3a11bdf3f Changed checkbox states are saved on server 2021-02-14 17:49:40 +01:00
Ozzie Isaacs
0992bafe30 Bulk User management 2021-02-13 13:17:02 +01:00
Ozzie Isaacs
251a77c8b4 Merge branch 'master' into Development 
Improved packaging support
 2021-02-07 08:54:29 +01:00
Ozzie Isaacs
e6fb460071 New restart routine for executable files 
Fix log in updater
New source option updater available
 2021-02-06 09:42:27 +01:00
Ozzie Isaacs
eeb7974e05 User table: 
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
 2021-01-31 14:54:45 +01:00
Ozzie Isaacs
62447d6b89 Basic User edit in tables 2021-01-31 10:17:57 +01:00
Ozzie Isaacs
0b32738f4e Fix Store UI settings in flask session for guest user (#1820) 
Updated testresults
Fix Filepicker (absolute instead of abs)
 2021-01-24 07:31:40 +01:00
Ozzieisaacs
5cce01215f Code refactoring ub.session.commit() 
Code cosmentics admin.py
 2021-01-03 09:53:34 +01:00
Ozzieisaacs
b100d198e8 Merge branch 'master' into Develop 
Remove relate to referrer for tag/custom column allow / deny dialog
 2020-12-31 15:12:37 +01:00
Ozzieisaacs
7849f2fb4b Remove relate to referrer for tag/custom column allow / deny dialog 2020-12-31 15:08:56 +01:00
Ozzieisaacs
2a63c35743 Activate serverside filepicker with parameter in unconfigured state 2020-12-27 11:27:15 +01:00
Ozzieisaacs
f6538b6110 New delete user button 
refactored confirm dialogs
 2020-12-21 19:50:12 +01:00
OzzieIsaacs
d5ed5cd665 Fixes from tests 2020-12-12 15:16:22 +01:00
OzzieIsaacs
fa95d064ff Fix get_sidebar_config 2020-12-12 12:03:11 +01:00
Ozzieisaacs
1905e0ee6f refactoring to prevent web.py being the middle of the universe 2020-12-12 11:23:17 +01:00
Ozzie Isaacs
5d9404863d Fix detection and removal of metadata.db ending in calibre-directory 
Update requirements
 2020-12-11 09:11:17 +01:00
Ozzieisaacs
d3986ca14a Server side file browser 2020-12-11 08:37:37 +01:00
Ozzieisaacs
2508c1abb2 Started implement server side filechooser 2020-12-10 14:41:45 +01:00
OzzieIsaacs
a80a8aab1c Fix LDAP import user 2020-12-08 20:13:36 +01:00
OzzieIsaacs
8f36128fe3 Merge branch 'session' into Develop 2020-12-08 11:49:39 +01:00
Ozzieisaacs
5e3618716d Fix missing session rollback on commit error 2020-12-07 19:53:34 +01:00
Ozzieisaacs
777c2726d3 Changed session_handing 2020-12-07 08:52:52 +01:00
Ozzieisaacs
7aabfc573b Merge branch 'master' into Develop 
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/templates/config_edit.html
#	cps/web.py
 2020-12-03 16:03:37 +01:00
Ozzieisaacs
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
Ozzieisaacs
3372070a58 Fix change title regex 
Merge branch 'Develop' into master
 2020-12-02 11:09:55 +01:00
Ozzieisaacs
6ad56a0859 Merge branch 'master' into Develop 2020-11-30 18:37:14 +01:00
Ozzieisaacs
8515781564 Fix #1727 (import rarfile 4.0 fails on python3.5) 2020-11-30 18:36:45 +01:00
Ozzieisaacs
f620d4a9ca Fix LDAP errors 2020-11-22 11:19:14 +01:00
Ozzieisaacs
9bd51c650b Add config options for client certificate authentication 2020-11-20 19:47:50 +01:00
Ozzieisaacs
ceefba2743 Fix for #1550 (password prompt for LDAP and anonymous browsing) 2020-11-15 17:16:01 +01:00
Ozzieisaacs
32b7b39223 Added function to download debug information 2020-11-15 14:25:27 +01:00
Ozzieisaacs
400f6e02a5 Fix #1668 (upload of books with language set to different than UI language and not showing all books) 
Fix for only showing external port if kobo is really activated in admin menu
 2020-11-07 11:44:02 +01:00
jvoisin
8b60a19577 Don't leak to non-admin users the current installed version 2020-10-29 14:03:18 +01:00
Ozzieisaacs
5b67b687d3 Removed remaining code from view downloaded books in user section 
Fixes for #1661
 2020-10-13 19:45:27 +02:00
Ozzieisaacs
95d540630e Change ldap_certpath to file 2020-10-04 06:15:35 +02:00
Ozzieisaacs
7ba014ba49 Fix "is not a valid language" on upload of comic books 
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
 2020-09-20 15:05:52 +02:00
OzzieIsaacs
843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 2020-08-23 21:22:44 +02:00
OzzieIsaacs
1535bdbcd8 Merge remote-tracking branch 'memorydatabase/issue/1564' 2020-08-15 12:08:59 +02:00
Clément Poissonnier
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
Jef LeCompte
e048388213
feat(api): include external port option 
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
 2020-07-03 12:58:58 -04:00
Ozzieisaacs
852f252d13 Prevent invalid variable 
Make text in kobo_auth_screen consistent
 2020-06-28 09:48:05 +02:00
Ozzieisaacs
dde5b08c47 Re enabled gevent as dependency 
Fix #1399 (Calibre-web starting with installed and not activated gdrive denpendencies without internet connection again)
 2020-06-27 13:36:33 +02:00
Ozzieisaacs
88d2c60ee8 Catch some errors related to non writable settings db 2020-06-27 13:22:16 +02:00
Ozzieisaacs
ef2c98ba39 Fix #1453 (error unrar binary not found) 2020-06-02 20:51:08 +02:00
Ozzieisaacs
5f0660a4e5 Refactored helper.py and db.py 2020-05-23 10:16:29 +02:00
OzzieIsaacs
0cf1cc5587 Fixes from tests 2020-05-21 22:26:19 +02:00
Ozzieisaacs
1a458fe39f Fix for #1407 converting books should now be possible again 2020-05-21 18:16:11 +02:00
OzzieIsaacs
a48418364c Fiexes from tests 2020-05-21 13:54:28 +02:00
Ozzieisaacs
b75497231e Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result) 2020-05-21 09:28:35 +02:00
Ozzieisaacs
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
Ozzieisaacs
5405dc5141 Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash) 2020-05-17 11:15:46 +02:00
Ozzieisaacs
1bc7134ec2 Fix error 500 on reset password in debug mode 2020-05-13 20:04:43 +02:00
Ozzieisaacs
273572f44c Merge branch 'master' into Develop 
# Conflicts:
#	cps/ub.py
 2020-05-13 20:03:54 +02:00
Ozzieisaacs
e787f9dd9f Automatic username (#1172) 2020-05-12 17:23:58 +02:00
Ozzieisaacs
308fd55483 #1141 (Setting for file size limit on email) 2020-05-09 20:29:17 +02:00
Ozzieisaacs
fefb44e612 #1356 (fixes for readonly metadata.db) 
Fix remove trailing metadata.db at entering calibre_db_path
 2020-05-09 19:54:28 +02:00
Ozzieisaacs
75fb7c2e95 Allowing upload extensions (#1119) 2020-05-09 16:54:22 +02:00
Ozzieisaacs
e8aedeac36 Refactored admin.py 2020-05-09 16:00:31 +02:00
Ozzieisaacs
0a02caad04 Improvements 2020-05-09 11:01:00 +02:00
Ozzieisaacs
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
Ozzieisaacs
0adcd1b3d9 UI Improvements 
Added additional restrictions to Calibre DB interface
 2020-05-03 10:55:33 +02:00
Ozzieisaacs
0138ff9e16 Added additional config options 2020-05-02 10:18:01 +02:00
Ozzieisaacs
832b34fc54 Improved errorhandling for resending password 
Improved errorhandling for editing user
 2020-05-01 12:00:45 +02:00
Ozzieisaacs
000b85ff81 Fixes for deleting books(error handling and user feedback) 2020-05-01 10:26:35 +02:00
Ozzieisaacs
bb317d54f2 Fix reject reset password without configured email server 2020-05-01 08:37:54 +02:00
Ozzieisaacs
d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 2020-05-01 08:33:50 +02:00
Ozzieisaacs
bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 2020-04-28 16:50:08 +02:00
Ozzieisaacs
2d92818613 Code cosmetics 2020-04-27 20:01:13 +02:00
Ozzieisaacs
898e6b4f80 Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods) 2020-04-26 18:24:22 +02:00
Ozzieisaacs
d657330584 Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326 2020-04-25 07:13:55 +02:00
Ozzieisaacs
06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 2020-04-18 11:48:34 +02:00
Ozzieisaacs
81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 2020-04-17 18:16:28 +02:00
Ozzieisaacs
a784c6bd52 Fixes for oauth login after programming basic tests 2020-04-15 22:03:21 +02:00
Ozzieisaacs
3fbaba6693 Fix #1307 2020-04-14 18:28:16 +02:00
Ozzieisaacs
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
Ozzieisaacs
a194216568 Merge remote-tracking branch 'origin/master' 2020-04-05 19:10:27 +02:00
Ozzieisaacs
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
Ozzieisaacs
0c27ff11b9 Update Updater 2020-04-01 18:45:16 +02:00
Ozzieisaacs
4eacb21259 Update updater 
Update change logfile
code cosmetics js files
 2020-03-29 16:44:24 +02:00
Ozzieisaacs
fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
Ozzieisaacs
317e59df4b Bugfixes from tests 2020-02-15 16:02:31 +01:00
Ozzieisaacs
a9a6f5b97e Renamed restrict -> deny 2020-02-15 10:21:45 +01:00
Ozzieisaacs
726595e117 Update for testability 2020-02-10 18:34:10 +01:00
Ozzieisaacs
e44494aad0 Kobo sync enable/disable working 2020-01-27 20:32:37 +01:00
Ozzieisaacs
4ab3dc2599 Merge branch 'master' into Develop 
# Conflicts:
#	cps/admin.py
 2020-01-27 18:20:50 +01:00
Ozzieisaacs
b29b5b7ac1 Merge remote-tracking branch 'github/fix-admin-view-log-file' 2020-01-27 18:14:16 +01:00
Ghighi Eftimie
fc79cdfaa2 fix mismerge 2020-01-27 15:24:11 +02:00
Ghighi Eftimie
647e954e8a fix admin view of error log 2020-01-26 20:53:03 +02:00
Ozzieisaacs
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
Ozzieisaacs
cd9bb56db5 Cleanup Kobo integration 2020-01-20 06:14:53 +01:00
Ozzieisaacs
79a9ef4859 Make Kobo optional 
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
 2020-01-12 13:42:39 +01:00
Ozzieisaacs
8143c16c14 Added texts for allowed denied tags in configuration 
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
 2020-01-11 13:28:09 +01:00
Ozzieisaacs
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
Ozzieisaacs
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
Ozzieisaacs
24ae7350f5 Fix # #1127 (user template show random books in detail view not saved) 2020-01-05 16:18:51 +01:00
Ozzieisaacs
6a07cfba65 Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login' 
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
 2020-01-05 13:38:51 +01:00
Ozzieisaacs
d9adb4fc94 Improvements for limit tags 2020-01-01 17:30:08 +01:00