NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,730 Commits 1 Branch 0 Tags 95 MiB
8ee34bf428
Commit Graph

933 Commits

Author SHA1 Message Date
Ozzieisaacs
1e9d88fa98 Merge branch 'master' into Develop 2021-11-21 10:22:44 +01:00
Ozzieisaacs
6cb713d62c Added filtering of languages 
Bugfix show all allowed languages in user settings in case restrictions currently apply
 2021-11-21 10:21:45 +01:00
Ozzieisaacs
6deb527769 Merge branch 'master' into Develop 2021-11-21 09:14:36 +01:00
Ozzie Isaacs
6aad9378b8 Fix visiblility upload right on enabled upload feature 2021-11-20 12:44:34 +01:00
Ozzieisaacs
4fd4cf4355 Merge branch 'master' into Develop 
# Conflicts:
#	cps/static/css/style.css
#	cps/web.py
 2021-11-13 17:41:16 +04:00
Ozzieisaacs
c1f4ca36b6 Current sorting order visible in all sidebar selectors, and search results 
Sorting "hot" books only ascending and descending according to download numbers
Downloaded books sorting according to authors name working
 2021-11-04 20:51:48 +04:00
Ozzieisaacs
58379159fb Fix shown cover in series grid view (#979) 2021-11-04 17:32:31 +04:00
Ozzieisaacs
42cc13d1e2 Mark which functions are selected on list pages 2021-11-03 21:07:16 +04:00
Ozzieisaacs
ecc5cb167e Upload setting in user template only visible if upload enabled 
Delete book setting only visible if edit book setting is ticked
 2021-11-03 20:32:17 +04:00
Ozzieisaacs
d72210c6ae Exclude upload rights visibility if upload is not activated 2021-11-03 19:05:24 +04:00
Ozzieisaacs
2b6f5b1565 Fix csrf check in list pages 2021-11-02 21:32:29 +04:00
Ozzieisaacs
95371d0d7f Fix shelf grid ordering for inverted order at page load 
Ordering buttons now visible on medium size screens
 2021-11-02 20:27:50 +04:00
Ozzieisaacs
c7df8a1a34 Fix missing csrf token in series grid view 2021-11-02 18:57:28 +04:00
Ozzieisaacs
a5415e00d5 Fix grid to list in series view 
Fix sort asc, desc in author and series list
 2021-11-01 13:11:49 +01:00
Ozzie Isaacs
a8317d900b Bugfix for edit custom ratings in list edit mode 
Bugfix for deleting custom enum in list edit mode
 2021-10-30 15:50:17 +02:00
Ozzie Isaacs
bbb65ec804 Merge remote-tracking branch 'trustedhost/master' 2021-10-30 09:40:04 +02:00
Ozzie Isaacs
f6a2b8a9ef Read and archive bit visible in book table 2021-10-24 21:32:19 +02:00
Bernat
9f260128cf
Prevent virtual keyboard login auto capitalization 
Stops virtual keyboards, such as the ones on mobile devices, to default to uppercase for the first letter of the login user input field.
 2021-10-24 20:14:47 +02:00
Ozzie Isaacs
bb20979c71 Merge branch 'master' into Develop 2021-10-24 09:49:42 +02:00
Ozzie Isaacs
917909cfdb Refactored books detail page 2021-10-24 09:48:29 +02:00
cbartondock
c6bf62a6eb The recent changes to content security policy broke custom theming. I fixed it by adding a trusted hosts field to Server Configuration 2021-10-22 15:35:10 -04:00
Ozzie Isaacs
fe4db16a7e html editor in books list 2021-10-21 20:13:04 +02:00
Ozzie Isaacs
708861bcd5 Enabed edit of custom texts (including categories) in books list 2021-10-17 14:29:13 +02:00
Ozzie Isaacs
24a2c0a5cf Enable edit of custom text in book table 2021-10-17 14:11:52 +02:00
Ozzie Isaacs
1e1d3a7c81 Enable edit of enum column in books list 2021-10-17 14:05:18 +02:00
Ozzie Isaacs
666015e867 Fix datepicker localized month names 
Removed redundant parenthesis in kobo.py response
 2021-10-16 20:53:44 +02:00
Ozzie Isaacs
9d5e9b28ae Enabled editing of "number" custom_columns in books list 2021-10-16 20:46:16 +02:00
Ozzie Isaacs
fe21d15194 Merge remote-tracking branch 'cn/fix/bootstrap-table-locale' 
# Conflicts:
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-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-ro.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
 2021-10-16 11:48:00 +02:00
Ozzie Isaacs
56a9c62421 Merge remote-tracking branch 'cn/chinese/master' 
# Conflicts:
#	cps/templates/search_form.html
 2021-10-16 11:41:09 +02:00
Ozzie Isaacs
50d703e2d8 Chunked reading status on kobo sync 
Bugfix loading text on shelf delete
Bugfix sort books list according to selection without selection
 2021-10-16 11:28:35 +02:00
Ozzie Isaacs
bad4c01474 Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead) 2021-10-10 18:02:18 +02:00
Ozzie Isaacs
25f608d109 Bugfixes from testrun (load images from gdrive) 
Fix locale for new users
 2021-10-09 09:37:10 +02:00
Ozzie Isaacs
aca5324914 Bugfix arrange shelf 
Bugfix remote login
Bugfix perform Update
 2021-10-06 22:06:33 +02:00
Ozzie Isaacs
d8f9e2feb2 Bugfixes for user import with default locale and default language 
Bugfixes from testrun
 2021-10-06 18:41:01 +02:00
Ozzie Isaacs
50919d4721 Added handling for missing flask-wtf dependency 
Added CSRF protection (via flask-wtf)
Moved upload function to js file
Fixed error page in case of csrf failure
 2021-10-04 19:23:20 +02:00
Ozzie Isaacs
1c15e10ac0 Improved csrf protection for remote login 2021-10-03 09:58:45 +02:00
Ozzie Isaacs
52be2ad4a2 Improved DJVU Reader 2021-10-03 09:32:29 +02:00
Ozzie Isaacs
43fdef5e53 Improved textreader 2021-10-03 09:31:24 +02:00
Ozzie Isaacs
b82d03c12c Removed js from search_form, tasks 
Added translation of bootstrap-select in user table
 2021-10-03 08:01:58 +02:00
Ozzie Isaacs
e064a3ec2b Removed unnecessary spaces in book convert texts 2021-10-02 07:53:36 +02:00
xlivevil
deb91996a8
fix:bootstrap-table locale 
Add data-locale in table tag
Add bootstrap-table-locale-all-min-js
Remove bootstrap-table locale dir
 2021-09-30 20:09:02 +08:00
mmonkey
cd3791f5f4 Always use full-sized image for book edit and details pages 2021-09-30 01:43:31 -05:00
Ozzie Isaacs
cd1fe6dde0 Fix #2085 (Misaligned shelf names after glyphicon) 2021-09-29 19:26:21 +02:00
mmonkey
9e7f69e38a Updated series cache timeout to one day 2021-09-29 03:01:28 -05:00
mmonkey
46205a1f83 Made long running tasks cancellable. Added cancel button to cancellable tasks in the task list. Added APP_MODE env variable for determining if the app is running in development, test, or production. 2021-09-29 02:40:12 -05:00
mmonkey
26071d4e7a Added Scheduled Tasks Settings 2021-09-26 02:02:48 -05:00
xlivevil
1b8410e786
Update Simplified Chinese translation 2021-09-25 23:15:44 +08:00
xlivevil
fed9eff7b8
Fix the publishstart option in advsearch 2021-09-25 22:10:46 +08:00
Ozzie Isaacs
c1ac68e2ae Fix #2053 (Hovering on cover, now shows tooltip also in Caliblur! Theme) 2021-09-25 14:01:17 +02:00
mmonkey
0bd544704d Added series cover thumbnail generation. Better cache file handling. 2021-09-25 03:04:38 -05:00
mmonkey
be28a91315 Simplified all of the thumbnail generation and loading. 2021-09-24 03:11:14 -05:00
mmonkey
d648785471 Review feedback fixes 2021-09-17 01:42:56 -05:00
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
86ef1d47e8 Bugfixes from testrun 2021-08-30 08:02:21 +02:00
Ozzie Isaacs
1d79d9ded2 Bugfix from tests (displaying of book languages in user list) 2021-08-29 11:31:10 +02:00
Ozzie Isaacs
1fa267ce1b Final fix for escaping html special chars in tables 2021-08-28 15:47:57 +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
91e6d94c83 Improved displaying of username and task title in tasks 2021-08-27 14:27:35 +02:00
Ozzie Isaacs
32e27712f0 Added lxml to needed requirements 
Improved displaying of series title, book of series, comments and custom comments
 2021-08-27 09:43:32 +02:00
Ozzie Isaacs
aa9fdd2ada Merge branch 'master' into Develop 2021-08-18 20:32:33 +02:00
Ozzie Isaacs
275e073c42 Fix #2085 (Missing spaces between glyphicon and text on sidebar) 2021-08-10 20:17:30 +02:00
xlivevil
bce69b2dfc Add pdf.js font file 2021-08-07 20:51:10 +08:00
xlivevil
fb97e39d9f Merge branch 'master' of https://github.com/xlivevil/calibre-web 2021-08-05 21:39:04 +08:00
xlivevil
913690df78 Fix #1913(set lazyload in pdf reader) 
Add favicon.ico in pdf reader
 2021-08-05 21:37:39 +08:00
Ozzie Isaacs
e68a3f18fa Merge branch 'master' into Develop 2021-08-01 20:23:19 +02:00
Ozzie Isaacs
1534827ad7 With merge button disabled it's no longer possible to open merge dialog 2021-08-01 20:23:04 +02:00
Ozzie Isaacs
b36422bc05 Update list/grid button action (reverse proxy problem) 2021-08-01 20:06:48 +02:00
Ozzie Isaacs
41ca85268f Update translation files 2021-08-01 17:27:18 +02:00
Ozzie Isaacs
0e9709f304 Make Book-No. of book-range to translatable text 2021-08-01 17:09:29 +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
53603f79bd Get_meta button unfocused on return to edit books 2021-07-31 09:00:34 +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
0ec2bcd897 Fixes from testrun 2021-07-30 09:25:19 +02:00
Ozzie Isaacs
c5e39a7523 Fix divs in user edit page 2021-07-27 08:09:57 +02:00
Ozzie Isaacs
3c8bfc31e4 fix change name allowd as non admin 2021-07-23 19:34:46 +02:00
Ozzie Isaacs
616cc2018a Fix show cover 
Update more debug output for kobo sync
 2021-07-12 14:58:03 +02:00
Ozzie Isaacs
e69b1adccd Fix #2053 (Add tooltip for complete title on hover over cover and title) 2021-07-12 14:17:28 +02:00
Ozzie Isaacs
aae81c3d24 Fix #2048 (Display book title in reader) 2021-07-11 12:52:46 +02:00
Ozzie Isaacs
ec7803fa76 Update python search Metadata 2021-07-10 07:38:16 +02:00
Ozzie Isaacs
aa2d3d2b36 Update python search Metadata 2021-07-07 21:24:29 +02:00
Ozzie Isaacs
d5e9cdc5b7 Search Metadata improvements 2021-07-07 21:10:38 +02:00
Ozzie Isaacs
67836006c5 Successfull testrun 2021-06-19 14:44:57 +02:00
Ozzie Isaacs
1aca1b9fdd Fixed duplicate ids in logviewer 2021-06-06 16:14:30 +02:00
Ozzie Isaacs
ced0bcfe33 Fix missing " in books table 2021-06-05 18:41:52 +02:00
Ozzie Isaacs
8c0aa79f78 Fix #1915 (more than 10 books at a time are displayed in books table) 2021-06-05 18:41:52 +02:00
Ozzie Isaacs
a79600c81f Mass change book title and author (fix #1996) 2021-05-28 18:22:29 +02:00
Ozzie Isaacs
6de3aebf3a Fix for #1998 (Error 500 with configured oauth on user setup page accessed by admins) 2021-05-28 14:23:30 +02:00
Ozzie Isaacs
1b7e422772 Changed error page to display logout route in case of unconfigured 2021-05-28 13:56:07 +02:00
Ozzie Isaacs
b0f48b7f00 Merge branch 'master' into Develop 2021-05-26 19:58:10 +02:00
Ozzie Isaacs
94b07d05c1 First half of #1996 (editing single books) 2021-05-26 19:57:58 +02:00
Ozzie Isaacs
4392fec7f5 Added fullscreen cover viewer 2021-05-26 19:40:41 +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
251780bed6 Added google scholar as metadata provider 2021-05-16 13:24:42 +02:00
Ozzie Isaacs
decc2a9c79 Merge branch 'master' into Develop 2021-05-16 13:19:38 +02:00
Ozzie Isaacs
b62d84424e Merge remote-tracking branch 'comic/comic_viewer_changes' into master 2021-05-16 13:19:28 +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
3e5c944365 Changed backend for comic reader, now supports rar5 2021-05-16 08:35:20 +02:00
Ozzie Isaacs
d95838309e Added config option for shelf sync behavior 2021-05-15 10:45:51 +02:00
Ozzie Isaacs
4745fc0db1 Bugfix search for publish dates and custom column dates 
Bugfix save umplauts in comments unescaped (as calibre does)
Improved testability
 2021-05-15 07:51:32 +02:00
Ozzie Isaacs
b3648187ff Bugfix search for publishdates and custom column dates 
Bugfix save umplauts in comments unescaped (as calibre does)
Improved testability
 2021-05-15 07:51:12 +02:00
Ozzie Isaacs
f29088e854 Merge branch 'master' into Develop 
# Conflicts:
#	cps/kobo.py
 2021-05-14 19:59:35 +02:00
Ozzie Isaacs
b009dfe4ee Always use bootstrap datepicker 2021-05-14 19:58:06 +02:00
Ozzie Isaacs
eba94f430c Updated js libs 2021-05-14 09:29:24 +02:00
Ozzie Isaacs
06347b7e3c Bugfixes from testrun 2021-05-14 08:26:56 +02:00
Ozzie Isaacs
6bf360fbfb Added "comments" type to supported custom columns 2021-05-13 14:00:01 +02:00
Ozzie Isaacs
380292a8aa Custom column datetime now searchable (#1984) 2021-05-13 13:31:36 +02:00
Ozzie Isaacs
b0cc52e0aa Enable custom column datetime (adv. search not working yet) #1984 2021-05-13 10:39:36 +02:00
Ozzie Isaacs
9ef705650b Access pages with stored order per default (#1987) 
Fix for toggle-text of enable-sort button on shelf page
 2021-05-13 09:41:27 +02:00
Ozzieisaacs
eb2273247f Changed texts in edit shelf page for Kobo shelf sync 2021-05-02 15:59:40 +02:00
Ozzieisaacs
8dc11e89bd Merge remote-tracking branch 'koko_sync/feature/kobo-shelf' into Develop 2021-05-02 09:43:47 +02:00
Ozzie Isaacs
64696fe973 Bugfixes edit user list (Fix #1938) 2021-05-01 08:36:39 +02:00
GarcaMan
7da40d1c2e Added option to remove Y-Scrollbar and reset page scroll 2021-04-25 19:59:53 +00: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
3be5b5f919 Merge remote-tracking branch 'comic_reader/master' into master 2021-04-18 12:02:21 +02:00
Ozzie Isaacs
04ac5b69ac Further improvements on user list #1938 2021-04-18 12:01:11 +02:00
BuildTools
755eb1405b Fix progress bar direction 2021-04-18 04:25:45 +09:00
Ozzie Isaacs
c0a4addf30 Cancel button in User edit now leads to the right page back #1938 2021-04-17 18:30:55 +02:00
Ozzie Isaacs
39bbee0eeb Books sort with non Books table column working #1938 2021-04-17 10:27:30 +02:00
Ozzie Isaacs
f07cc8b103 Update optional-requirements: flask-dance 
Catch error for invalid oauth tokens
Fixes for displaying error messages on deleting books from list
Fixes for displaying error messages on deleting bookformats
Removed non working sorting in books list
 2021-04-13 19:26:10 +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
Ozzieisaacs
04971f8672 Bugfix wrong js file in user list 2021-04-11 20:01:40 +02:00
Ozzieisaacs
b6177b27f4 Sorting of users in table according to selection possible 2021-04-11 19:59:20 +02:00
Ozzie Isaacs
fac232229e Added missing ead/unread category in user list #1938 2021-04-07 17:49:19 +02:00
Ozzie Isaacs
a43021e87c Fix for #1938 2021-04-07 17:46:17 +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
665210e506 Fixes for book edit with title sort and author sort 2021-04-04 14:01:06 +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
e10a8c078b Merge branch 'master' into development 
# Conflicts:
#	cps/templates/email_edit.html
 2021-03-27 18:36:11 +01:00
Ozzie Isaacs
7a196fed7c Prevent empty email port and server address(#1906) 2021-03-27 18:34:57 +01:00
Ozzie Isaacs
c418c7e725 Prevent empty email from field (#1906) 2021-03-27 18:31:49 +01:00
Ozzie Isaacs
8f91437701 Implementation for gmail server with OAuth2 started 2021-03-27 16:36:24 +01:00
Ozzie Isaacs
3c63f5b204 Merge branch 'master' into development 2021-03-27 09:46:12 +01:00
Ozzie Isaacs
970dbb0c59 Merge branch 'master' into development 
# Conflicts:
#	cps/opds.py
#	cps/templates/admin.html
 2021-03-27 09:38:12 +01:00
Ozzie Isaacs
d21d3c2ceb Merge remote-tracking branch 'div_a/use-btn-anchors' into master 2021-03-27 09:33:28 +01:00
Ozzie Isaacs
f26beec1d3 Updated pdf reader 2021-03-25 18:57:40 +01:00
Ozzie Isaacs
c4225e29ed Updated pdf reader 2021-03-25 18:57:25 +01:00
Gavin Mogan
657cba042a Use btn classes on anchors not div so the entire button is clickable 2021-03-22 17:25:38 -07:00
Ozzie Isaacs
670eab62bf Update opds feed with letters for all titles, authors, categories and series 2021-03-22 17:46:15 +01:00
Ozzie Isaacs
837fc4988d Letterize authors 2021-03-21 20:21:10 +01:00
Ozzie Isaacs
4664b47851 Fixed alphabetical order in list and grid view 
Completed download section
 2021-03-21 19:31:32 +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
33bdc07f55 Fix for #1845 (ods not working in Moonreader an Librera) 
Fix opds search with wrong parameter no longer causes error 500
 2021-03-21 11:57:42 +01:00
Ozzie Isaacs
130a4ed2d3 Fix opds and error logging in mail 2021-03-21 11:54:39 +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
d3f8153b90 Merge branch 'master' into development 2021-03-20 19:34:16 +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