Commit Graph

228 Commits

Author SHA1 Message Date
3f2a9c8bae Code improvement 2019-03-16 17:33:15 +01:00
9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 2019-03-16 15:48:09 +01:00
a66873a9e2 Added file formats view 2019-03-11 18:42:30 +01:00
da3fcb9a72 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
2019-03-10 08:31:10 +01:00
8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
9144a7ceb9 Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
2019-03-05 17:34:51 +01:00
0be17ed157 Refactored sidebar (some parts are missing) 2019-03-04 19:34:29 +01:00
f0de822ce7 Start refactor sidebar and view settings sidebar 2019-03-03 19:42:17 +01:00
e5bc1ae020 Add new database field for storing max_authors 2019-02-25 19:21:49 +01:00
a0be02e687 Ldap working 2019-02-17 09:09:20 +01:00
237502ae6b Output of errormessage for invalid CALIBRE_PORT value 2019-02-16 10:18:32 +01:00
37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
2019-02-16 10:17:46 +01:00
56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
2019-02-16 08:03:42 +01:00
4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
2019-02-16 07:23:36 +01:00
c1ef1bcd19 User and admin pages are working again 2019-02-09 21:26:17 +01:00
f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
2019-02-09 18:46:41 +01:00
d6ee8f75e9 More refactoring 2019-02-08 20:12:16 +01:00
a00d93a2d9 Working again (basically) 2019-02-06 21:52:32 +01:00
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
3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 2019-01-27 11:18:08 +01:00
836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
d763168dec Merge branch 'master' of https://github.com/Krakinou/calibre-web 2019-01-13 11:04:32 +01:00
7ccc40cf5b Moving import LDAP
Correct optional-requirements-ldap.txt spelling
2019-01-13 11:02:03 +01:00
aafb267787 Merge branch 'master' into master 2019-01-12 23:46:59 +01:00
2e37c14d94 Clean some comment 2019-01-12 18:40:32 +01:00
91f0908059 insert into db
connect via LDAP config
2019-01-12 18:07:03 +01:00
8d284b151d Edit html config 2019-01-12 12:52:27 +01:00
36030b559c Choosing Theme is now a global setting 2019-01-11 08:36:28 +01:00
30954cc27f Initial LDAP support 2019-01-10 23:51:01 +01:00
6ec9bc9e5c Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
404 messages on non existing categorys, languages, series
Updated Testresult
2018-10-28 21:33:12 +01:00
1abbcfa3c6 Add OAuth support: GitHub & Google 2018-10-14 16:51:00 +08:00
5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 2018-09-30 18:30:24 +02:00
3f35200a0b Merge remote-tracking branch 'Comic/comic_server'
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive.js
#	cps/static/js/io.js
#	cps/static/js/kthoom.js
#	cps/static/js/unrar.js
#	cps/static/js/untar.js
#	cps/static/js/unzip.js
#	cps/templates/config_edit.html
#	cps/templates/detail.html
#	cps/templates/readcbr.html
#	cps/templates/stats.html
#	cps/ub.py
#	cps/web.py
#	optional-requirements.txt
2018-08-31 10:47:58 +02:00
cedc183987 Fix #590, #589.
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
2018-08-27 22:08:55 +02:00
d414bf3263 Massadd of books to shelfs (#203, #404) from advanced search
Code cosmetics
bugfix error message on failed emails
refactored language name generation
2018-08-19 10:14:20 +02:00
cdb1b52652 Bugfix Get gdrive instances (#554, #525)
Metadata.db download works again
removed DEVELOPMENT constant
removed db logging in debug mode (too, noisy, to less information)
code refactoring url_for_other_page
feed languge set to en-EN
update status shos local time instead of UTC
Error handling (back to index page) in case of gdrive authenticate aborted
Mistyping page register fixed
Mistyping bokk fixed
Added uploaded books to tasklist (#442)
Error handling for failed file update added
Code refactoring worker thread
Tasks now never show any decimal values
Converter function unified
removed shell from subprocess call
preparation for limiting domain for registering emails
Book series can now increased in 0.1 steps (#562)
Accordion panels in config are now usable on touch devices like iPad (#545)
Gdrive authenticate button only visible after logged in (#525)
Fixed misstyping in german translation
2018-08-16 21:17:26 +02:00
b0cbd0a37a Added feature to send emails in a background-task 2018-07-30 20:12:41 +02:00
2449b4049b Code cleaning Stats page
Enable calibre's ebook-convert as converter for mobi files (#411, #533)
2018-07-18 20:21:44 +02:00
ae0c5d7ec2 Fix for #549 2018-07-18 18:48:41 +02:00
0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature #409 (linking read status from calibre)
2018-07-15 15:08:06 +02:00
a8040ad3fa #538:
-Refactoring gdrive and file handling
-Improved error handling for gdrive
-bugfix "gdrive stopping after a while"
- Renaming book title working
- Still Bugs in upload file to gdrive and renaming author
2018-07-14 08:31:52 +02:00
c66bb54478 Fix #534 2018-07-03 19:34:29 +02:00
204cd504a9 - Completly new setup of GDrive (every data is taken from client_secret.json file)
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
2018-06-02 10:59:34 +02:00
671bf5cf8d Integrated #454 (css is loaded remote) 2018-04-02 10:09:19 +02:00
af5a897d1d Added SSL Options (#416) 2018-03-30 21:20:47 +02:00
f6ece5fe72 Fix for #448 2018-03-27 20:18:11 +02:00