mmonkey
9a08bcd2bc
Started addressing some PR comments
2021-09-16 23:20:11 -05:00
mmonkey
04a5db5c1d
Resolve merge conflicts
2021-09-16 22:58:54 -05:00
Ozzie Isaacs
e3db2796c9
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2021-08-30 20:18:21 +02:00
Ozzie Isaacs
42ef049b63
Catch error on ldap import
2021-08-30 20:17:56 +02:00
Ozzie Isaacs
3946ef8f0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps.py
# cps/web.py
2021-08-27 16:16:24 +02:00
Ozzie Isaacs
d25cfb7499
Fix for #2097 (Quotes are now handled properly in UI-editable tables)
2021-08-26 18:03:59 +02:00
Ozzie Isaacs
ceec1051d5
Added option to save books with no nenglish characters
...
Imporvements on metadata search
2021-08-01 13:50:17 +02:00
Ozzie Isaacs
250cafe814
Merge branch 'master' into Develop
2021-07-30 21:00:01 +02:00
Ozzie Isaacs
16633ef1d3
Fix #2029 (Import LDAP User with "." in the name)
2021-07-30 20:45:33 +02:00
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