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 |
|
Jeroen Hellingman
|
6f6d8df431
|
Update messages.po
Review of Dutch translations (native speaker); improving consistency in vocabulary still needed.
|
2021-09-02 11:25:58 +02:00 |
|
cbartondock
|
9ebde57fc3
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-31 18:44:18 -04:00 |
|
Ozzie Isaacs
|
8dc1e9bfa4
|
Updated test result
|
2021-08-31 08:33:09 +02: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 |
|
cbartondock
|
8930426f2a
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-30 11:35:10 -04: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
|
86ef1d47e8
|
Bugfixes from testrun
|
2021-08-30 08:02:21 +02:00 |
|
cbartondock
|
b835aa660a
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-29 14:05:21 -04:00 |
|
Ozzie Isaacs
|
4d92d7da3a
|
Removed timelogging on metadata search
|
2021-08-29 14:37:15 +02:00 |
|
Ozzie Isaacs
|
d1e6a85803
|
Parallel requests of metadata provider
|
2021-08-29 14:36:05 +02:00 |
|
Ozzie Isaacs
|
d8bad7394a
|
Merge remote-tracking branch 'caliblur/master'
|
2021-08-29 13:31:46 +02:00 |
|
Ozzie Isaacs
|
f5062d1354
|
Merge remote-tracking branch 'it/patch-1'
|
2021-08-29 13:31:21 +02:00 |
|
Ozzie Isaacs
|
1d79d9ded2
|
Bugfix from tests (displaying of book languages in user list)
|
2021-08-29 11:31:10 +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 |
|
cbartondock
|
abcf9a1808
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-28 09:35:12 -04:00 |
|
Ozzie Isaacs
|
d4cfad6363
|
Fixed several text problems from tasks
Fixed task update
|
2021-08-28 11:32:13 +02:00 |
|
Ozzie Isaacs
|
3a24561ca2
|
Removed additional " from convert message
|
2021-08-28 10:32:40 +02:00 |
|
Ozzie Isaacs
|
5c19a8aacc
|
Bugfix edit comments
Testupdate
|
2021-08-28 08:24:38 +02:00 |
|
Ozzie Isaacs
|
3946ef8f0d
|
Merge branch 'master' into Develop
# Conflicts:
# cps.py
# cps/web.py
|
2021-08-27 16:16:24 +02:00 |
|
cbartondock
|
6a2868c68d
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-27 10:13:05 -04:00 |
|
Ozzie Isaacs
|
7ae3255ea9
|
Revert Content-Security-Policy header
|
2021-08-27 14:28:30 +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
|
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 |
|
cbartondock
|
ff39fac50f
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-26 17:58:53 -04:00 |
|
Daniela Mazza
|
80d3ba42b4
|
Update messages.po
Changed translate of "Read Books": the meaning is exactly "Libri letti", not "Libri da leggere"
|
2021-08-26 19:16:38 +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 |
|
cbartondock
|
24ad15be11
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-19 08:30:13 -04: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 |
|
Ozzie Isaacs
|
afa585eb65
|
Added -f flag for compatibility reasons
|
2021-08-18 20:32:13 +02:00 |
|
cbartondock
|
03acb77162
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2021-08-15 12:06:55 -04:00 |
|
Ozzie Isaacs
|
28ca39ca13
|
Add logging of user sessions
|
2021-08-15 12:43:19 +02:00 |
|
cbartondock
|
b05c17b8bb
|
Fixed book covers being too wide in search/shelves/discover on mobile
|
2021-08-14 21:50:05 -04:00 |
|
cbartondock
|
3839af65c4
|
add python-version to gitignore for managed pyenv compatibility
|
2021-08-14 15:57:09 -04:00 |
|
Ozzie Isaacs
|
275e073c42
|
Fix #2085 (Missing spaces between glyphicon and text on sidebar)
|
2021-08-10 20:17:30 +02:00 |
|
Ozzie Isaacs
|
c4876010e9
|
Merge remote-tracking branch 'pdf/master'
|
2021-08-09 16:46:19 +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
|
1e2335dea0
|
Merge remote-tracking branch 'caliblur/master'
|
2021-08-01 17:35:30 +02:00 |
|
Ozzie Isaacs
|
e052590270
|
Merge remote-tracking branch 'chinese/master'
# Conflicts:
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
|
2021-08-01 17:31:47 +02:00 |
|