1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-05 17:46:22 +00:00
Commit Graph

283 Commits

Author SHA1 Message Date
Ozzieisaacs
0c80f5c63a Update Teststatus 2019-05-12 19:44:52 +02:00
Ozzieisaacs
406d1c76c9 Sorting and filtering of lists working (except file formats)
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
2019-04-22 19:11:35 +02:00
Ozzieisaacs
4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
2019-04-14 18:18:39 +02:00
Ozzieisaacs
4552208c02 Fix #848 2019-04-14 16:37:57 +02:00
tomjmul
8e8486497f Restirct a user to a set of tags 2019-03-19 13:53:41 +00:00
Ozzieisaacs
3f2a9c8bae Code improvement 2019-03-16 17:33:15 +01:00
Ozzieisaacs
9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 2019-03-16 15:48:09 +01:00
Ozzieisaacs
a66873a9e2 Added file formats view 2019-03-11 18:42:30 +01:00
Ozzieisaacs
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
Ozzieisaacs
8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
Ozzieisaacs
9144a7ceb9 Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
Ozzieisaacs
f483ca3214 Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
2019-03-05 17:34:51 +01:00
Ozzieisaacs
0be17ed157 Refactored sidebar (some parts are missing) 2019-03-04 19:34:29 +01:00
Ozzieisaacs
f0de822ce7 Start refactor sidebar and view settings sidebar 2019-03-03 19:42:17 +01:00
Virgil Grigoras
e5bc1ae020 Add new database field for storing max_authors 2019-02-25 19:21:49 +01:00
Ozzieisaacs
a0be02e687 Ldap working 2019-02-17 09:09:20 +01:00
Ozzieisaacs
237502ae6b Output of errormessage for invalid CALIBRE_PORT value 2019-02-16 10:18:32 +01:00
Ozzieisaacs
37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
2019-02-16 10:17:46 +01:00
Ozzieisaacs
56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
Ozzieisaacs
0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
2019-02-16 08:03:42 +01:00
Ozzieisaacs
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
Ozzieisaacs
c1ef1bcd19 User and admin pages are working again 2019-02-09 21:26:17 +01:00
Ozzieisaacs
f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
2019-02-09 18:46:41 +01:00
Ozzieisaacs
d6ee8f75e9 More refactoring 2019-02-08 20:12:16 +01:00
Ozzieisaacs
a00d93a2d9 Working again (basically) 2019-02-06 21:52:32 +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
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
32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +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
Krakinou
8d284b151d Edit html config 2019-01-12 12:52:27 +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
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
Jim Ma
1abbcfa3c6 Add OAuth support: GitHub & Google 2018-10-14 16:51:00 +08:00
Virgil Grigoras
5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 2018-09-30 18:30:24 +02:00
OzzieIsaacs
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
OzzieIsaacs
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
OzzieIsaacs
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
OzzieIsaacs
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
OzzieIsaacs
b0cbd0a37a Added feature to send emails in a background-task 2018-07-30 20:12:41 +02:00
OzzieIsaacs
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
OzzieIsaacs
ae0c5d7ec2 Fix for #549 2018-07-18 18:48:41 +02:00
OzzieIsaacs
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
OzzieIsaacs
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
OzzieIsaacs
c66bb54478 Fix #534 2018-07-03 19:34:29 +02:00
OzzieIsaacs
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
OzzieIsaacs
671bf5cf8d Integrated #454 (css is loaded remote) 2018-04-02 10:09:19 +02:00
OzzieIsaacs
af5a897d1d Added SSL Options (#416) 2018-03-30 21:20:47 +02:00
OzzieIsaacs
f6ece5fe72 Fix for #448 2018-03-27 20:18:11 +02:00
OzzieIsaacs
b74a075aa6 Added posibility to change settings db via command line for multiple instances (#247) 2017-12-02 11:15:51 +01:00
OzzieIsaacs
aee5ca0e06 #396 implemented 2017-11-30 20:12:13 +01:00
OzzieIsaacs
f1fac28203 Improved error handling for renaming authors and titles (changes related to filesystem and not only to database) 2017-11-30 16:49:46 +01:00
OzzieIsaacs
8c573ff6d8 Unrar/tar and unzip on server side 2017-11-18 10:34:21 +01:00
OzzieIsaacs
ba54b9a357 Fix #365 2017-11-12 14:06:33 +01:00
OzzieIsaacs
af8d908bba Fix #371, #372 2017-11-01 16:55:51 +01:00
Cory Sitko
8fd67fb1fc UserBase methods should be properties not classmethods 2017-10-10 18:14:19 -04:00
Cory Sitko
7ade2ecd35 make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing 2017-10-10 10:18:28 -04:00
OzzieIsaacs
366bf9739b Fix for #360 and guest accounts 2017-10-09 22:36:47 +02:00
unknown
70d093b193 unicode gave an NameError with python3 2017-10-01 17:14:20 +02:00
Jonathan Rehm
374b5f4c6e Save ePub bookmarks to database
Save ePub bookmark to database. Also use library's built-in restore feature to restore all information from localStorage.
2017-08-23 08:55:40 -07:00
Jonathan Rehm
08d0404e9c Add mature_content property to Anonymous class 2017-08-13 07:05:45 -07:00
OzzieIsaacs
fb8ce693f3 Bugfix mature content
Update german translation
2017-08-12 18:52:56 +02:00
Jonathan Rehm
aee8aad976 Add option to hide mature content from some users
Uses a configurable list of tags to denote what is mature and hides those books from the user
2017-08-08 10:38:28 -07:00
OzzieIsaacs
1e2edcf753 Merge remote-tracking branch 'adv/author-info' 2017-07-23 13:36:50 +02:00
OzzieIsaacs
74e93e1cdf Code cosmetics 2017-07-09 20:15:15 +02:00
Jonathan Rehm
fe68c8a7f8 Add support for displaying author information from Goodreads
Requires the "goodread" module (added to optional-requirements.txt) and an API key

Retrieves Goodreads author information and displays their photo and "about" text
2017-07-08 16:07:45 -07:00
Jonathan Rehm
623f5c8ef0 Add "magic link" functionality
When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device.

Configuration was added and is disabled by default.
2017-07-07 18:29:16 -07:00
OzzieIsaacs
6d597f96e5 Integrate Iso639 language name translations to russian translation 2017-05-01 16:24:20 +02:00
OzzieIsaacs
9c679c8908 Delete books should now work (#119) 2017-04-15 11:35:05 +02:00
OzzieIsaacs
cd0d450829 Allow deleting books (fixes #119) 2017-04-14 20:29:11 +02:00
OzzieIsaacs
ab534b21c1 Code cosmetics 2017-04-02 10:42:33 +02:00
OzzieIsaacs
7dd70db837 Code cosmetics 2017-04-02 10:27:37 +02:00
OzzieIsaacs
7c6d527a55 Code cosmetics 2017-04-02 10:05:07 +02:00
OzzieIsaacs
66181daf6d Merge remote-tracking branch 'custom-dbpath' 2017-04-02 08:45:47 +02:00
OzzieIsaacs
986f40b80a Code cosmetics 2017-03-30 21:17:18 +02:00
OzzieIsaacs
78067b87bc Code cosmetics 2017-03-29 21:43:55 +02:00
Ivan Smirnov
2c173f9848 Read dbpath from $CALIBRE_DBPATH if present
This is an exploration in potentially enabling multiple libraries to run using the same engine. 

Since app config is all in the db, we should get no port conflicts and be able to run multiple instances of this app with no issues.

Using os.getenv instead of os.environ.get allows us to provide CALIBRE_DBPATH inline with the invocation of the file (`CALIBRE_DBPATH=/foo/bar/` python cps.py)
2017-03-25 13:05:44 -07:00
OzzieIsaacs
cbc807f3ff Fix #138 2017-03-19 20:29:35 +01:00
OzzieIsaacs
0e0e72fb71 Fixes for gevent/gdrive 2017-03-19 17:14:16 +01:00
Jack Darlington
b352bbfd14 Fix for gevent as optional 2017-03-16 21:02:49 +00:00
Jack Darlington
21b1a45023 Merge branch 'develop' into personal
# Conflicts:
#	cps/web.py
2017-03-07 22:05:56 +00:00
Jack Darlington
cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs
c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 2017-03-07 20:36:43 +01:00
林檎
6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
2017-03-06 11:53:17 +08:00
林檎
1da3b57f5a no need future module for python2
fix missing StringIO
2017-03-05 19:23:49 +08:00
林檎
b70191ca2a Least change to adapt with python3
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1  (0 is meaningless)

add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)

refer to
http://python-future.org/compatible_idioms.html
2017-03-05 17:40:39 +08:00
Jack Darlington
c702b14340 Fixes for READ/UNREAD 2017-03-03 21:38:54 +00:00
Jack Darlington
27cbab6cb7 Fixes for READ/UNREAD 2017-03-03 21:09:53 +00:00
Jack Darlington
015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
2017-03-03 00:03:46 +00:00
Jack Darlington
8745d65ff6 Merging ignorable columns 2017-02-28 23:53:32 +00:00
Jack Darlington
141eb7901c Add ignorable columns 2017-02-28 23:42:46 +00:00
Jack Darlington
d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
2017-02-26 19:49:49 +00:00
OzzieIsaacs
1a83ad713c Additional version info for sqlite database 2017-02-25 09:02:59 +01:00
Jack Darlington
7b709c15c2 GitIgnore update + fixes for initial setup 2017-02-22 22:06:59 +00:00
Jack Darlington
6d30382ae0 Initial gdrive commit
Work on watching metadata

More efficient storing folder keys to database

Nearly completed. Need to do final touches to callback for when metadata.db updated on real server, as cannot test locally

Changed callback for file changes from being hard coded to mine

used url_for in template as apposed to hard coded links

Fix to drive template

First attempt at redownload metadata.db

Fixed incorrect call to downloadFile

Added logging

Fixed call to copy file

Added exception logging to gdriveutils + fixed string long concat

Fix file download

Fix backup metadata

Added slashes to paths

Removed threading temporarily

Fix for reloading database

Fix reinitialising of variables

Fix check to see if custom column already setup

Update to showing authenticate google drive callback + fix for reinitialising database

Fixed logic for showing authenticate with google drive
2017-02-22 11:20:41 +00:00
Jack Darlington
d29d079d15 Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books) 2017-02-19 20:08:22 +00:00
OzzieIsaacs
93b19165cf Added polish in readme to supported UI languages
Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing
2017-02-15 18:09:17 +01:00
OzzieIsaacs
1692044d46 Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00
idalin
bff86f02ca settings for default role of new register user 2017-02-09 13:46:07 +08:00
OzzieIsaacs
7957827b2d Merge branch 'env-port' 2017-02-06 17:47:36 +01:00
janeczku
0e883f0b46 Allow overriding default port with environment variable 2017-02-06 16:00:29 +01:00
janeczku
8d9ed56864 Fix typo; raise exception when creating database 2017-02-06 15:34:31 +01:00
OzzieIsaacs
241c4cef8f - added best rated section in normal view
- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files
2017-02-04 14:28:18 +01:00
OzzieIsaacs
176c7dce70 - Fix for #100
- Fix migration of shelf order
- fix show random books in detail view for authors and series
2017-02-02 19:36:31 +01:00
OzzieIsaacs
f21c65ac50 - Bugfix Migration of database for config_log_level
- Bugfix Updater deleting temporary sourcefolder
2017-01-31 20:48:01 +01:00
OzzieIsaacs
e9d0bff559 - added statistics for Tags and series
- Loglevel is displayed as text instead of value
2017-01-28 20:54:31 +01:00
OzzieIsaacs
2c615fdf05 Finalize graphical setup for calibre-web 2017-01-28 20:16:40 +01:00
OzzieIsaacs
75c89c28e1 Bugfix for accessing config database
Title now displaed on every page
Title can be changed from within application
2017-01-22 21:30:36 +01:00
OzzieIsaacs
4eee58c21c Started migration of config to app database 2017-01-22 16:44:37 +01:00
OzzieIsaacs
2335252b1f Merge branch 'Chinese_tanslation' (#90)
Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards
2017-01-14 15:05:49 +01:00
OzzieIsaacs
0107c52b66 Anonymous account now can also be configured like normal user (e.g. download permissions, change visibility of sidebar) (#35)
Search now working for calibre-companion (#79), download not working yet
metadata view 80% finished
2017-01-12 20:43:36 +01:00
OzzieIsaacs
f434511db8 Fixed lout issue with redirects
fixed database migration problem which was introduced with the shelf order commit
2016-12-29 10:30:42 +01:00
OzzieIsaacs
c33a329f08 Add search for series and languages (#56)
Add database migration for shelf ordering (#73)
2016-12-27 16:07:25 +01:00
OzzieIsaacs
e0459eb62b Removed unused wishlist code
Added renaming of shelf name
Added sorting abilty to shelfs
jquery is loaded locally now
2016-12-26 11:33:32 +01:00
OzzieIsaacs
ba44a15891 changes for #77
Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail
2016-12-23 09:53:39 +01:00
OzzieIsaacs
bbf6d9b026 Translation of UI (german and english)
Bugfix for feeds
    - removed categories related and up
    - load new books now working
    - category random now working
login page is free of non accessible elements
boolean custom column is vivible in UI
books with only with certain languages can be shown
book shelfs can be deleted from UI
Anonymous user view is more resticted
Added browse of series in sidebar
Dependencys in vendor folder are updated to newer versions (licencs files are now present)
Bugfix editing Authors names
Made upload on windows working
2016-11-09 19:24:33 +01:00
OzzieIsaacs
59136a9cc2 Linux path problem solved (finally) 2016-08-07 10:32:45 +02:00
janeczku
1e2a6f2ffb Fix session.rollback on admin account creation 2016-04-29 22:54:38 +02:00
Cervinko Cera
3833079973 assign admin all rights in create_admin_user() 2016-04-27 19:50:04 +02:00
Cervinko Cera
f66d7ce29b add permission for changing own password 2016-04-27 16:00:58 +02:00
Cervinko Cera
c7b7b3866e add user-permission management 2016-04-27 10:35:23 +02:00
JanB
df480160da Handle race in database creation when running multiple WSGI instances 2016-04-17 17:30:55 +02:00
Jan Broer
34cd613e29 Fixes broken send-to-kindle 2016-03-27 23:41:55 +02:00
Jan Broer
a5fe21c9e0 Add APP_DB_ROOT config variable 2015-08-04 01:44:05 +02:00
Jan Broer
0b5b3b8424 User edit email fix 2015-08-02 21:43:33 +02:00
Jan Broer
aef608aa10 Refactor (settings database, etc...) 2015-08-02 21:23:24 +02:00
Jan Broer
64a9cbce2d Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/ 2015-08-02 20:59:11 +02:00