Ozzieisaacs
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
5 years ago
Daniel Pavel
e254565901
support binding the http server to a unix socket file instead of TCP socket
5 years ago
Ozzieisaacs
f40fc5aa75
Update LDAP
5 years ago
Ozzieisaacs
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
5 years ago
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
...
Solve typo
5 years ago
Krakinou
304db0d20e
Solve typo
5 years ago
Ozzieisaacs
26949970d8
Revert logging functions
...
Fix access logger for tornado
5 years ago
Ozzieisaacs
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
Krakinou
9a5ab97d78
Merge branch 'master' into master
5 years ago
Daniel Pavel
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
Krakinou
97d12b94f6
Correct settings update
5 years ago
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
5 years ago
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
5 years ago
Ozzieisaacs
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
5 years ago
Ozzieisaacs
ed91048a63
Fix for magic link with python 3
5 years ago
Ozzieisaacs
f70c839014
Added additional permission viewer
5 years ago
Ozzieisaacs
0c80f5c63a
Update Teststatus
5 years ago
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
6 years ago
Ozzieisaacs
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
6 years ago
Ozzieisaacs
4552208c02
Fix #848
6 years ago
tomjmul
8e8486497f
Restirct a user to a set of tags
6 years ago
Ozzieisaacs
3f2a9c8bae
Code improvement
6 years ago
Ozzieisaacs
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
6 years ago
Ozzieisaacs
a66873a9e2
Added file formats view
6 years ago
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
6 years ago
Ozzieisaacs
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
Ozzieisaacs
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
Ozzieisaacs
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
Ozzieisaacs
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
Ozzieisaacs
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
Virgil Grigoras
e5bc1ae020
Add new database field for storing max_authors
6 years ago
Ozzieisaacs
a0be02e687
Ldap working
6 years ago
Ozzieisaacs
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
6 years ago
Ozzieisaacs
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
Ozzieisaacs
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
Ozzieisaacs
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
6 years ago
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
6 years ago
Ozzieisaacs
c1ef1bcd19
User and admin pages are working again
6 years ago
Ozzieisaacs
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
Ozzieisaacs
d6ee8f75e9
More refactoring
6 years ago
Ozzieisaacs
a00d93a2d9
Working again (basically)
6 years ago
Ozzieisaacs
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
6 years ago
Ozzieisaacs
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
6 years ago
Ozzieisaacs
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
Ozzieisaacs
bacb6fb561
New updater with default setting -> only stable releases #653
6 years ago
Ozzieisaacs
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
Krakinou
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
6 years ago
Krakinou
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
6 years ago
Krakinou
aafb267787
Merge branch 'master' into master
6 years ago
Krakinou
2e37c14d94
Clean some comment
6 years ago
Krakinou
91f0908059
insert into db
...
connect via LDAP config
6 years ago
Krakinou
8d284b151d
Edit html config
6 years ago
Ozzieisaacs
36030b559c
Choosing Theme is now a global setting
6 years ago
Krakinou
30954cc27f
Initial LDAP support
6 years ago
Ozzieisaacs
6ec9bc9e5c
Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
...
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
Jim Ma
1abbcfa3c6
Add OAuth support: GitHub & Google
6 years ago
Virgil Grigoras
5129bc3601
Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
6 years ago
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
6 years ago
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
6 years ago
OzzieIsaacs
d414bf3263
Massadd of books to shelfs ( #203 , #404 ) from advanced search
...
Code cosmetics
bugfix error message on failed emails
refactored language name generation
6 years ago
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
6 years ago
OzzieIsaacs
b0cbd0a37a
Added feature to send emails in a background-task
6 years ago
OzzieIsaacs
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
6 years ago
OzzieIsaacs
ae0c5d7ec2
Fix for #549
6 years ago
OzzieIsaacs
0e83546d40
- Updated translation (it's now always Google Drive)
...
- Integrated feature #409 (linking read status from calibre)
6 years ago
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
6 years ago
OzzieIsaacs
c66bb54478
Fix #534
6 years ago
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
6 years ago
OzzieIsaacs
671bf5cf8d
Integrated #454 (css is loaded remote)
7 years ago
OzzieIsaacs
af5a897d1d
Added SSL Options ( #416 )
7 years ago
OzzieIsaacs
f6ece5fe72
Fix for #448
7 years ago
OzzieIsaacs
b74a075aa6
Added posibility to change settings db via command line for multiple instances ( #247 )
7 years ago
OzzieIsaacs
aee5ca0e06
#396 implemented
7 years ago
OzzieIsaacs
f1fac28203
Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)
7 years ago
OzzieIsaacs
8c573ff6d8
Unrar/tar and unzip on server side
7 years ago
OzzieIsaacs
ba54b9a357
Fix #365
7 years ago
OzzieIsaacs
af8d908bba
Fix #371 , #372
7 years ago
Cory Sitko
8fd67fb1fc
UserBase methods should be properties not classmethods
7 years ago
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
7 years ago
OzzieIsaacs
366bf9739b
Fix for #360 and guest accounts
7 years ago
unknown
70d093b193
unicode gave an NameError with python3
7 years ago
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.
7 years ago
Jonathan Rehm
08d0404e9c
Add mature_content property to Anonymous class
7 years ago
OzzieIsaacs
fb8ce693f3
Bugfix mature content
...
Update german translation
7 years ago
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
7 years ago
OzzieIsaacs
1e2edcf753
Merge remote-tracking branch 'adv/author-info'
7 years ago
OzzieIsaacs
74e93e1cdf
Code cosmetics
7 years ago
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
7 years ago
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.
7 years ago
OzzieIsaacs
6d597f96e5
Integrate Iso639 language name translations to russian translation
8 years ago
OzzieIsaacs
9c679c8908
Delete books should now work ( #119 )
8 years ago
OzzieIsaacs
cd0d450829
Allow deleting books ( fixes #119 )
8 years ago
OzzieIsaacs
ab534b21c1
Code cosmetics
8 years ago
OzzieIsaacs
7dd70db837
Code cosmetics
8 years ago
OzzieIsaacs
7c6d527a55
Code cosmetics
8 years ago
OzzieIsaacs
66181daf6d
Merge remote-tracking branch 'custom-dbpath'
8 years ago
OzzieIsaacs
986f40b80a
Code cosmetics
8 years ago
OzzieIsaacs
78067b87bc
Code cosmetics
8 years ago
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)
8 years ago
OzzieIsaacs
cbc807f3ff
Fix #138
8 years ago
OzzieIsaacs
0e0e72fb71
Fixes for gevent/gdrive
8 years ago
Jack Darlington
b352bbfd14
Fix for gevent as optional
8 years ago
Jack Darlington
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
8 years ago
Jack Darlington
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
OzzieIsaacs
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
8 years ago
林檎
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
8 years ago
林檎
1da3b57f5a
no need future module for python2
...
fix missing StringIO
8 years ago
林檎
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
8 years ago
Jack Darlington
c702b14340
Fixes for READ/UNREAD
8 years ago
Jack Darlington
27cbab6cb7
Fixes for READ/UNREAD
8 years ago
Jack Darlington
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
.
8 years ago
Jack Darlington
8745d65ff6
Merging ignorable columns
8 years ago
Jack Darlington
141eb7901c
Add ignorable columns
8 years ago
Jack Darlington
d9c48a6203
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/web.py
8 years ago
OzzieIsaacs
1a83ad713c
Additional version info for sqlite database
8 years ago
Jack Darlington
7b709c15c2
GitIgnore update + fixes for initial setup
8 years ago
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
8 years ago
Jack Darlington
d29d079d15
Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books)
8 years ago
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
8 years ago
OzzieIsaacs
1692044d46
Merge remote-tracking branch 'default_user_settings/master' ( #105 )
8 years ago
idalin
bff86f02ca
settings for default role of new register user
8 years ago
OzzieIsaacs
7957827b2d
Merge branch 'env-port'
8 years ago
janeczku
0e883f0b46
Allow overriding default port with environment variable
8 years ago
janeczku
8d9ed56864
Fix typo; raise exception when creating database
8 years ago
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
8 years ago
OzzieIsaacs
176c7dce70
- Fix for #100
...
- Fix migration of shelf order
- fix show random books in detail view for authors and series
8 years ago
OzzieIsaacs
f21c65ac50
- Bugfix Migration of database for config_log_level
...
- Bugfix Updater deleting temporary sourcefolder
8 years ago
OzzieIsaacs
e9d0bff559
- added statistics for Tags and series
...
- Loglevel is displayed as text instead of value
8 years ago
OzzieIsaacs
2c615fdf05
Finalize graphical setup for calibre-web
8 years ago
OzzieIsaacs
75c89c28e1
Bugfix for accessing config database
...
Title now displaed on every page
Title can be changed from within application
8 years ago
OzzieIsaacs
4eee58c21c
Started migration of config to app database
8 years ago
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
8 years ago
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
8 years ago
OzzieIsaacs
f434511db8
Fixed lout issue with redirects
...
fixed database migration problem which was introduced with the shelf order commit
8 years ago
OzzieIsaacs
c33a329f08
Add search for series and languages ( #56 )
...
Add database migration for shelf ordering (#73 )
8 years ago
OzzieIsaacs
e0459eb62b
Removed unused wishlist code
...
Added renaming of shelf name
Added sorting abilty to shelfs
jquery is loaded locally now
8 years ago
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
8 years ago
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
8 years ago
OzzieIsaacs
59136a9cc2
Linux path problem solved (finally)
8 years ago
janeczku
1e2a6f2ffb
Fix session.rollback on admin account creation
9 years ago
Cervinko Cera
3833079973
assign admin all rights in create_admin_user()
9 years ago
Cervinko Cera
f66d7ce29b
add permission for changing own password
9 years ago
Cervinko Cera
c7b7b3866e
add user-permission management
9 years ago
JanB
df480160da
Handle race in database creation when running multiple WSGI instances
9 years ago
Jan Broer
34cd613e29
Fixes broken send-to-kindle
9 years ago
Jan Broer
a5fe21c9e0
Add APP_DB_ROOT config variable
9 years ago
Jan Broer
0b5b3b8424
User edit email fix
9 years ago
Jan Broer
aef608aa10
Refactor (settings database, etc...)
9 years ago
Jan Broer
64a9cbce2d
Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/
9 years ago