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
ceffa3a108
Removed xss on shelf add/remove action
2021-08-30 17:06:11 +02:00
Ozzie Isaacs
c0a06eec46
Removed xss on shelf add/remove action
2021-08-30 17:05:53 +02:00
Ozzie Isaacs
d8bad7394a
Merge remote-tracking branch 'caliblur/master'
2021-08-29 13:31:46 +02:00
Ozzieisaacs
10e212fcde
Merge branch 'master' into Develop
2021-08-29 10:44:13 +02:00
Ozzie Isaacs
1fa267ce1b
Final fix for escaping html special chars in tables
2021-08-28 15:47:57 +02:00
Ozzie Isaacs
d4cfad6363
Fixed several text problems from tasks
...
Fixed task update
2021-08-28 11:32:13 +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
e615073893
Add all html special characters to the escaped characters in bootstrap table
2021-08-27 12:56:08 +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
a35c635987
Update python metadata search
2021-08-18 21:38:20 +02:00
Ozzie Isaacs
aa9fdd2ada
Merge branch 'master' into Develop
2021-08-18 20:32:33 +02:00
cbartondock
b05c17b8bb
Fixed book covers being too wide in search/shelves/discover on mobile
2021-08-14 21:50:05 -04:00
xlivevil
bce69b2dfc
Add pdf.js font file
2021-08-07 20:51:10 +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
ceec1051d5
Added option to save books with no nenglish characters
...
Imporvements on metadata search
2021-08-01 13:50:17 +02:00
cbartondock
81ccc11c9c
fixed dropdowns going off screen in caliblur
2021-07-31 12:51:51 -04:00
Ozzie Isaacs
702e96ddd6
Update load metadata
2021-07-31 09:18:05 +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
53dae32897
Fix multiple messages on windows after change config with reboot
2021-07-26 16:50:21 +02:00
Ozzie Isaacs
3b81ea37f4
Fix entries of user table are visible if database has no tags
2021-07-23 19:46:01 +02:00
Ozzie Isaacs
15ec6bec95
fix #2014 (User menu dropdown in caliblur is tiny and presents scrollbars)
...
Fix display of nonexistent series_index
Fix caliblur add-to-shelf
2021-07-11 13:15:13 +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
1a0bf45c34
Check file/folder permissions before update
2021-06-06 12:16:47 +02:00
Ozzie Isaacs
67874e07b6
Fix routes for reverse proxy
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
84e1c6e809
Fix for #2004 (pdf viewer buttons missing in safari)
2021-06-05 08:08:08 +02:00
Ozzie Isaacs
aadd6fd7e0
Possible fix for #2003 (Calibre theme download icon broken)
2021-06-03 12:35:09 +02:00
Ozzie Isaacs
a79600c81f
Mass change book title and author ( fix #1996 )
2021-05-28 18:22:29 +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
98fc1ee0a7
Comic reader code cleaning
2021-05-22 19:28:30 +02:00
Ozzie Isaacs
010c0bfc7d
Improved error handling for content too long
2021-05-16 14:07:16 +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
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
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
6bc426b21d
Fix edit_books.js
2021-05-14 07:29:48 +02:00
