Ozzieisaacs
561d40f8ff
Merge branch 'master' into Develop
2019-02-03 20:30:37 +01:00
Ozzieisaacs
6fc4b318e8
cover folders beautified
2019-02-03 20:29:16 +01:00
Ozzieisaacs
36229076f7
Refactor subprocess calls
2019-02-03 18:32:27 +01:00
Ozzieisaacs
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
2019-02-03 17:33:54 +01:00
Ozzieisaacs
ea98323c06
Fixes Google Drive
...
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
2019-02-03 16:38:27 +01:00
Ozzieisaacs
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
2019-01-27 11:22:22 +01:00
Ozzieisaacs
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
2019-01-27 11:18:08 +01:00
Ozzieisaacs
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
2019-01-27 11:16:11 +01:00
Ozzieisaacs
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
2019-01-27 11:14:38 +01:00
Ozzieisaacs
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
2019-01-26 19:06:54 +01:00
Ozzieisaacs
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
2019-01-25 21:58:19 +01:00
Ozzieisaacs
97064db2a4
Restart python3 fix, stop and restart python2 working again
2019-01-23 18:14:45 +01:00
Ozzieisaacs
341dd77b9d
Bugfix Restart and Stop server on python3
2019-01-21 21:01:16 +01:00
Ozzieisaacs
836c6fd245
Updated translations
...
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs
bacb6fb561
New updater with default setting -> only stable releases #653
2019-01-20 17:46:26 +01:00
Ozzieisaacs
62574939b2
Fix #770
2019-01-19 16:48:04 +01:00
Ozzieisaacs
32568c9009
Update testing
...
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Krakinou
d48cdcc789
Correct authentication in case LDAP not activated
2019-01-13 11:21:11 +01:00
Krakinou
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
2019-01-13 11:04:32 +01:00
Krakinou
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
2019-01-13 11:02:03 +01:00
Krakinou
aafb267787
Merge branch 'master' into master
2019-01-12 23:46:59 +01:00
Krakinou
2e37c14d94
Clean some comment
2019-01-12 18:40:32 +01:00
Krakinou
91f0908059
insert into db
...
connect via LDAP config
2019-01-12 18:07:03 +01:00
Ozzieisaacs
f053508013
Fix #764
2019-01-11 22:24:48 +01:00
Ozzieisaacs
36030b559c
Choosing Theme is now a global setting
2019-01-11 08:36:28 +01:00
Krakinou
30954cc27f
Initial LDAP support
2019-01-10 23:51:01 +01:00
Ozzieisaacs
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
2019-01-08 07:58:22 +01:00
Ozzieisaacs
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
2019-01-06 15:00:34 +01:00
Ozzieisaacs
98134616b6
Fix #661 (authors are shown according to the authors sort order)
2019-01-06 14:16:52 +01:00
Ozzieisaacs
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
2019-01-05 21:44:29 +01:00
Ozzieisaacs
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
2019-01-03 20:52:46 +01:00
Ozzieisaacs
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
2019-01-03 20:47:46 +01:00
Adrian Petrescu
5341910ea5
Deal gracefully with invalid Accept-Languages header
...
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).
This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.
Fixes #743 among others.
2019-01-03 11:45:15 -05:00
Ozzieisaacs
9cfe1dce20
Fix #739
2018-12-30 14:25:03 +01:00
Ozzieisaacs
d0fd1a4601
Merged new caliblur theme
...
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
2018-12-27 10:53:19 +01:00
grunjol
462cf20a34
Process all custom columns on editing
2018-12-24 13:05:47 -03:00
grunjol
00ba231fbf
fix adding an existing language to a book
2018-12-24 12:32:22 -03:00
Ozzieisaacs
81e3afbcc4
Fix #714 (advanced search for ratings)
2018-12-02 12:48:12 +01:00
Ozzieisaacs
7526b0dcb4
Fix #623 , #715
2018-11-28 18:28:55 +01:00
Ozzieisaacs
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
Ozzieisaacs
b78130e3b1
Merge remote-tracking branch '681/681-fix'
2018-11-25 07:19:00 +01:00
haseo
e1b6fa25e9
A better solution to #681
2018-11-19 15:54:28 +08:00
Ozzieisaacs
dfa17956c9
Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
...
Changed function for 295, azw3 is preferred format for sending to kindle
2018-11-18 17:09:13 +01:00
Ozzieisaacs
2422f782de
Fix #701
2018-11-17 16:51:30 +01:00
Ozzieisaacs
07d7be176c
Merge remote-tracking branch 'lang/master'
2018-11-17 16:32:55 +01:00
dalin
947622800c
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
2018-11-14 18:14:11 +08:00
Ozzieisaacs
399dffba5a
log file name in case of filename not found ( #691 )
2018-11-03 18:37:38 +01:00
Ozzieisaacs
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
2018-11-03 17:38:52 +01:00
Ozzieisaacs
c3bec48bc7
Fix #617
...
Additional texts translated
2018-11-03 13:43:38 +01:00
Ozzieisaacs
c582a70498
Merge remote-tracking branch 'bbb/617'
2018-11-03 10:40:00 +01:00
