Ozzie Isaacs
1ca1281346
Merge remote-tracking branch 'jszip/compress_dl'
2022-12-25 18:38:28 +01:00
jvoisin
02ec853e3b
Remove a duplicate library
2022-12-25 16:09:18 +01:00
Ozzie Isaacs
66e0a81d23
Merge remote-tracking branch 'mp3_csrf/save-mp3-position'
2022-12-25 10:34:01 +01:00
Ozzie Isaacs
1f6eb2def6
html tag fix
2022-12-25 10:32:01 +01:00
Ozzie Isaacs
7d3af5bbd0
Merge remote-tracking branch 'font_size/issue/487'
2022-12-25 10:29:29 +01:00
Ozzie Isaacs
043a612d1a
Update path to kobo config file
2022-12-25 10:22:58 +01:00
Ozzie Isaacs
928e24fd1a
Merge remote-tracking branch 'google_site_verification/master'
2022-12-25 09:59:32 +01:00
Ozzie Isaacs
3361c41c6d
Merge remote-tracking branch 'caliblur/issues/caliBlur'
2022-12-25 09:49:02 +01:00
Ozzie Isaacs
c15b603fef
Merge remote-tracking branch 'mp3listen/master'
2022-12-25 09:41:56 +01:00
JonathanHerrewijnen
9450084d6e
Editing listenmp3.html page to show audiobook info
2022-11-24 20:34:01 +00:00
Vijay Pillai
b52c7aac53
Added GOOGLE_SITE_VERIFICATION environmental value to enable google safe browsing
2022-11-10 11:02:50 -05:00
Ghighi Eftimie
9409b9db9c
fixes for 946, 2284 caliblur
2022-10-21 21:53:15 +02:00
Ghighi Eftimie
b663f1ce83
added font size fader in reader's settings popup #487
2022-10-16 16:22:08 +02:00
Olivier
adfbd447ed
mp3 player was missing the csrf_token
2022-10-11 19:50:23 +09:00
xlivevil
09e1ec3d08
fix typo
2022-09-28 20:12:21 +08:00
Ozzie Isaacs
c10708ed07
Backup metadata 4th step
2022-09-19 22:39:40 +02:00
Ozzieisaacs
7750ebde0f
Update pdf Reader
2022-09-05 19:42:02 +02:00
Ozzie Isaacs
e5c8a7ce50
Change landing page for issues, to reduce number of empty issues
2022-08-27 10:20:53 +02:00
gjutras
0a7345186d
Merge branch 'janeczku-master'
...
# Conflicts:
# cps/helper.py
# cps/tasks/convert.py
# cps/templates/user_edit.html
2022-07-08 16:42:14 -04:00
Ozzie Isaacs
3bde8a5d95
Encrypt passwords
2022-07-02 17:45:24 +02:00
Ozzieisaacs
4ef8c35fb7
Bugfies password validation from testrun
2022-06-16 14:16:00 +02:00
Ozzieisaacs
04326af2da
password validation working
2022-06-16 11:15:17 +02:00
Ozzieisaacs
d6a31e5db8
config verify password working
2022-06-16 10:44:42 +02:00
Ozzie Isaacs
73d48e4ac1
Frontend for password strength
2022-06-16 08:33:39 +02:00
Thore Schillmann
2816a75c3e
changed datetime format of published tag
2022-06-09 20:35:44 +00:00
Ozzie Isaacs
543fe12862
Merge remote-tracking branch 'epub_theme/epub_themes'
2022-06-04 09:26:01 +02:00
Thore Schillmann
0f3f918153
multiple authors and publication date in opds feed
2022-05-22 17:40:21 +00:00
Ozzie Isaacs
fbac3e38ac
Eenabled send epubs to E-Reader devices
2022-05-08 12:55:54 +02:00
Ozzieisaacs
ae5053e072
Added missing translation strings
...
Update German Translation
2022-05-01 13:24:11 +02:00
Ozzie Isaacs
cde51e743a
Removed duplicate Werkzeug entry in about page
...
Code cosmetics
2022-05-01 12:36:35 +02:00
Ozzie Isaacs
e8e4d87d39
Bugfix session commit
...
Bugfix get_locale
Bugfix reconnect database schedule
Bugfix no permission error message logging
Bugfix updater
2022-04-30 10:17:41 +02:00
Ozzie Isaacs
ef4b5e2881
Bugfix audio player
...
Bugfix Debugfile export
2022-04-28 21:40:48 +02:00
Ozzie Isaacs
2e007a160e
reenable startup logging
...
Bugfixes from refactoring and merge
2022-04-26 14:45:06 +02:00
Ozzie Isaacs
e7464f2694
Refactored web.py to shrink size of file
2022-04-26 11:49:06 +02:00
Ozzie Isaacs
9410b47144
Refactored startup for compatibility with pyinstaller 5.0
2022-04-26 11:10:44 +02:00
Ozzie Isaacs
6e8445fed5
Changed schedule start- and end-time to schedule start and duration
...
Localized display of schedule start-time and duration
Removed displaying scheduling settings if "APScheduler" is missing
Input check for start-time and duration
2022-04-25 17:00:07 +02:00
Ozzie Isaacs
ae9a970782
Add button to update cover cache (for usecase sideloaded changed cover)
...
Bugfix logig start background schedue
2022-04-25 08:24:14 +02:00
Ozzie Isaacs
1e723dff3a
Make texts in Background thread translatable
2022-04-24 18:40:50 +02:00
Ozzie Isaacs
bf049d8240
Make series cover cache invisible
2022-04-24 11:05:22 +02:00
Ozzie Isaacs
3c98cd1b9a
Merge branch 'master' into cover_thumbnail
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2022-04-20 07:25:37 +02:00
Ozzie Isaacs
a8680a45ca
Bugfixes from Testrun
...
Update teststatus
2022-04-19 20:37:27 +02:00
Ozzieisaacs
09b381101b
Added "None" to list of file formats, tags, series, languages
...
Unified languages.html and list.html template
2022-04-16 17:01:41 +02:00
Ozzie Isaacs
afaf496fbe
Merge branch 'master' into cover_thumbnail
...
# Conflicts:
# cps/db.py
# cps/templates/author.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/search.html
# cps/templates/shelf.html
# cps/web.py
# requirements.txt
# test/Calibre-Web TestSummary_Linux.html
2022-04-02 11:57:18 +02:00
gjutras
cb0d9ec95c
Allow kindle_email to be CSV to allow sending to multiple kindles
2022-03-28 19:59:59 -04:00
Ozzie Isaacs
32a3c45ee0
Refactored load read status for web access and opds access
...
Refactored and removed discover html page
Bugfix show author
Bugfix open dialog in author page
Fix for #2341 (advanced search with linked read column and read column having a higher number than number of available custom columns)
2022-03-27 12:21:19 +02:00
Ozzie Isaacs
14a6e7c42c
Deactivated several functions for kindle tolino and kobo. Opening books now working for ebook readers
2022-03-25 18:30:12 +01:00
Ozzie Isaacs
a6a8f7eb43
Series Link in series view no longer clickable
2022-03-21 19:33:57 +01:00
Ozzie Isaacs
5070cc4c23
Merge branch 'master' into cover_thumbnail
2022-03-21 19:02:14 +01:00
Ozzie Isaacs
f5b79930ad
Bugfix remember sort order of series and authors if entered from link below book cover ( #2340 )
2022-03-20 20:02:57 +01:00
Ozzie Isaacs
ec53570118
Merge branch 'master' into cover_thumbnail
...
# Conflicts:
# cps/editbooks.py
# test/Calibre-Web TestSummary_Linux.html
2022-03-20 17:15:40 +01:00
Ozzie Isaacs
8cb5989c97
Catch additional error on not existing custom column linked to read column ( #2341 )
...
Prevent metadata changes are lost on edit books with errors (#2326 )
Better log output
Renamed log message on database delete
2022-03-20 11:55:12 +01:00
Ozzie Isaacs
d9a83e0638
Merge branch 'master' into cover_thumbnail
...
# Conflicts:
# cps/editbooks.py
# cps/helper.py
# cps/web.py
# test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
Ozzie Isaacs
4545f4a20d
Better epub cover parsing with multiple cover-image items
...
Code cosmetics
renamed variables
refactored xml page generation
refactored prepare author
2022-03-13 19:00:37 +01:00
Ozzie Isaacs
296f76b5fb
Fixes after testrun
...
Code cosmetics
2022-03-13 10:23:13 +01:00
Ozzie Isaacs
2b31b6a306
Fix for #2325 (author sort order differs from authors order with readonly database)
2022-03-12 16:51:50 +01:00
Bharat KNV
9efd644360
Change dark theme from black to dark gray and add a black theme
2022-03-06 15:56:54 +05:30
Ozzie Isaacs
4a0dde0371
Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail
...
# Conflicts:
# cps/admin.py
# cps/config_sql.py
# cps/helper.py
# cps/tasks/upload.py
# cps/updater.py
# cps/web.py
2022-02-08 19:55:20 +01:00
mmonkey
032fced9c7
Merge branch 'develop' into thumbnails
2022-01-28 23:15:50 -06:00
Ozzie Isaacs
4f3c396450
Merge remote-tracking branch 'lubimyczytac/add_lubimyczytac.pl_meta_provider' into Develop
...
# Conflicts:
# optional-requirements.txt
2022-01-27 18:37:02 +01:00
mmonkey
50bb74d748
Add CSRF support for schedule task settings, fixed details page not loading
2022-01-27 00:35:45 -06:00
mmonkey
3416323767
Removed title tags from cover images
2022-01-26 23:56:10 -06:00
mmonkey
18ce310b30
Merge branch Develop into thumbnails
2022-01-26 23:51:50 -06:00
Ozzie Isaacs
6339d25af0
Bugfixes from testrun
2022-01-26 18:38:39 +01:00
Ozzie Isaacs
d9d6fb33ba
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2022-01-25 19:33:21 +01:00
Ozzie Isaacs
17b4643b7c
fix #2285 (Fix for shelf handling in caliblur theme)
2022-01-25 19:31:52 +01:00
Ozzie Isaacs
3b216bfa07
Kobo sync token is now also created if accessed from localhost( fixes #1990 )
...
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2022-01-24 18:47:34 +01:00
Ozzieisaacs
e8e2f789e5
Fix #2287 (books can't be added to shelf from search)
2022-01-24 12:37:15 +01:00
Ozzie Isaacs
127bf98aac
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/detail.html
# test/Calibre-Web TestSummary_Linux.html
2022-01-23 17:51:54 +01:00
Ozzie Isaacs
d759df0df6
Kobo sync token is now also created if accessed from localhost( fixes #1990 )
...
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2022-01-22 18:23:43 +01:00
Ozzie Isaacs
6bf0753978
Prevent wrong use of safe statement
2022-01-18 17:39:54 +01:00
Ozzie Isaacs
a02f621f08
Added id for testability
2022-01-17 18:38:37 +01:00
Ozzie Isaacs
96b1e8960b
Bugfix send to kindle with multiple formats
2022-01-09 12:55:38 +01:00
Ozzie Isaacs
e3dbf7a88d
Bugfixes load metadata
...
Improvements for testing load metadata
2022-01-07 12:40:03 +01:00
Ozzieisaacs
bbadfa2251
bugfixes load metadata
2022-01-04 21:11:52 +01:00
Ozzieisaacs
ae1f515446
Bugfix uncheck all ekements in books list and user list
...
Improved testability for books list
2021-12-30 14:45:31 +01:00
Ozzieisaacs
0548fbb685
Bugfix post commands without updater
2021-12-30 14:45:31 +01:00
Ozzieisaacs
f39dc100b4
Migrated some routes to POST
...
- shelf massadd
- resetpassword
- delete shelf
- send to kindle
2021-12-30 14:45:31 +01:00
Ozzieisaacs
785726deee
Migrated some routes to POST
...
- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown
2021-12-30 14:45:30 +01:00
Ozzie Isaacs
2e815147fb
Merge branch 'master' into Develop
...
# Conflicts:
# cps/kobo_sync_status.py
# test/Calibre-Web TestSummary_Linux.html
2021-12-19 10:29:56 +01:00
Bharat KNV
0693cb1ddb
Added basic theming to the epub reader
2021-12-15 21:35:10 +05:30
Ozzie Isaacs
f0399d04b7
Merge remote-tracking branch 'bookmark_csrf/master'
2021-12-14 17:59:32 +01:00
Ozzie Isaacs
9d9acb058d
Add button to force full kobo sync
2021-12-06 21:02:06 +01:00
Ozzie Isaacs
f78d2245aa
Fixes from testrun
2021-12-05 18:48:21 +01:00
Ozzie Isaacs
d217676350
Upated testresult
...
Bugfix book table
2021-12-05 13:09:41 +01:00
Ozzie Isaacs
cd5711e651
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
2021-12-04 20:56:04 +01:00
Ozzie Isaacs
5ed3b1cf53
On master: Order of language count in /language ( fixes #2200 )
2021-12-01 21:38:43 +01:00
Jonathan Fenske
66874f8163
Update read.html
...
include the CSR token input
2021-11-30 22:25:45 -06:00
Ozzie Isaacs
7f9da94a18
Tie visibility of upload buttons to upload right only
2021-11-27 17:43:51 +01:00
GarcaMan
a8689ae26b
first commit
2021-11-24 19:41:07 +00:00
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
