mmonkey
|
04a5db5c1d
|
Resolve merge conflicts
|
3 years ago |
Ozzie Isaacs
|
8dc1e9bfa4
|
Updated test result
|
3 years ago |
|
Ozzie Isaacs
|
e3db2796c9
|
Merge branch 'master' into Develop
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
|
3 years ago |
|
Ozzie Isaacs
|
42ef049b63
|
Catch error on ldap import
|
3 years ago |
|
Ozzie Isaacs
|
ceffa3a108
|
Removed xss on shelf add/remove action
|
3 years ago |
|
Ozzie Isaacs
|
c0a06eec46
|
Removed xss on shelf add/remove action
|
3 years ago |
|
Ozzie Isaacs
|
86ef1d47e8
|
Bugfixes from testrun
|
3 years ago |
|
Ozzie Isaacs
|
4d92d7da3a
|
Removed timelogging on metadata search
|
3 years ago |
|
Ozzie Isaacs
|
d1e6a85803
|
Parallel requests of metadata provider
|
3 years ago |
|
Ozzie Isaacs
|
d8bad7394a
|
Merge remote-tracking branch 'caliblur/master'
|
3 years ago |
|
Ozzie Isaacs
|
f5062d1354
|
Merge remote-tracking branch 'it/patch-1'
|
3 years ago |
|
Ozzie Isaacs
|
1d79d9ded2
|
Bugfix from tests (displaying of book languages in user list)
|
3 years ago |
|
Ozzieisaacs
|
10e212fcde
|
Merge branch 'master' into Develop
|
3 years ago |
|
Ozzie Isaacs
|
1fa267ce1b
|
Final fix for escaping html special chars in tables
|
3 years ago |
|
Ozzie Isaacs
|
d4cfad6363
|
Fixed several text problems from tasks
Fixed task update
|
3 years ago |
|
Ozzie Isaacs
|
3a24561ca2
|
Removed additional " from convert message
|
3 years ago |
|
Ozzie Isaacs
|
5c19a8aacc
|
Bugfix edit comments
Testupdate
|
3 years ago |
|
Ozzie Isaacs
|
3946ef8f0d
|
Merge branch 'master' into Develop
# Conflicts:
# cps.py
# cps/web.py
|
3 years ago |
|
Ozzie Isaacs
|
7ae3255ea9
|
Revert Content-Security-Policy header
|
3 years ago |
|
Ozzie Isaacs
|
91e6d94c83
|
Improved displaying of username and task title in tasks
|
3 years ago |
|
Ozzie Isaacs
|
e615073893
|
Add all html special characters to the escaped characters in bootstrap table
|
3 years ago |
|
Ozzie Isaacs
|
32e27712f0
|
Added lxml to needed requirements
Improved displaying of series title, book of series, comments and custom comments
|
3 years ago |
Daniela Mazza
|
80d3ba42b4
|
Update messages.po
Changed translate of "Read Books": the meaning is exactly "Libri letti", not "Libri da leggere"
|
3 years ago |
|
Ozzie Isaacs
|
d25cfb7499
|
Fix for #2097 (Quotes are now handled properly in UI-editable tables)
|
3 years ago |
cbartondock
|
24ad15be11
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
3 years ago |
|
Ozzie Isaacs
|
a35c635987
|
Update python metadata search
|
3 years ago |
|
Ozzie Isaacs
|
aa9fdd2ada
|
Merge branch 'master' into Develop
|
3 years ago |
|
Ozzie Isaacs
|
afa585eb65
|
Added -f flag for compatibility reasons
|
3 years ago |
|
cbartondock
|
03acb77162
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
3 years ago |
|
Ozzie Isaacs
|
28ca39ca13
|
Add logging of user sessions
|
3 years ago |
|
cbartondock
|
b05c17b8bb
|
Fixed book covers being too wide in search/shelves/discover on mobile
|
3 years ago |
|
cbartondock
|
3839af65c4
|
add python-version to gitignore for managed pyenv compatibility
|
3 years ago |
|
Ozzie Isaacs
|
275e073c42
|
Fix #2085 (Missing spaces between glyphicon and text on sidebar)
|
3 years ago |
|
Ozzie Isaacs
|
c4876010e9
|
Merge remote-tracking branch 'pdf/master'
|
3 years ago |
xlivevil
|
bce69b2dfc
|
Add pdf.js font file
|
3 years ago |
|
xlivevil
|
fb97e39d9f
|
Merge branch 'master' of https://github.com/xlivevil/calibre-web
|
3 years ago |
|
xlivevil
|
913690df78
|
Fix #1913(set lazyload in pdf reader)
Add favicon.ico in pdf reader
|
3 years ago |
|
Ozzie Isaacs
|
e68a3f18fa
|
Merge branch 'master' into Develop
|
3 years ago |
|
Ozzie Isaacs
|
1534827ad7
|
With merge button disabled it's no longer possible to open merge dialog
|
3 years ago |
|
Ozzie Isaacs
|
b36422bc05
|
Update list/grid button action (reverse proxy problem)
|
3 years ago |
|
Ozzie Isaacs
|
1e2335dea0
|
Merge remote-tracking branch 'caliblur/master'
|
3 years ago |
|
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
|
3 years ago |
|
Ozzie Isaacs
|
41ca85268f
|
Update translation files
|
3 years ago |
|
Ozzie Isaacs
|
0e9709f304
|
Make Book-No. of book-range to translatable text
|
3 years ago |
|
Ozzie Isaacs
|
ceec1051d5
|
Added option to save books with no nenglish characters
Imporvements on metadata search
|
3 years ago |
|
cbartondock
|
81ccc11c9c
|
fixed dropdowns going off screen in caliblur
|
3 years ago |
|
Ozzie Isaacs
|
702e96ddd6
|
Update load metadata
|
3 years ago |
|
Ozzie Isaacs
|
53603f79bd
|
Get_meta button unfocused on return to edit books
|
3 years ago |
|
Ozzie Isaacs
|
250cafe814
|
Merge branch 'master' into Develop
|
3 years ago |
|
Ozzie Isaacs
|
16633ef1d3
|
Fix #2029 (Import LDAP User with "." in the name)
|
3 years ago |