29462e2278
Fix for updater
8 years ago
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
8 years ago
b081bc8672
Fix #157
8 years ago
16cac6ac4f
Merge remote-tracking branch 'polish_update/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
Fix for #147
8 years ago
dad251d02c
Fix for revoking already expired channel (drive)
8 years ago
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
8 years ago
d7d29827f4
fix behind
8 years ago
a7d361a0ff
merge conflict
8 years ago
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
8 years ago
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
d7afbdc349
use quote instead of urllib.quote
8 years ago
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
8 years ago
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
8 years ago
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
8 years ago
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
8 years ago
acac0570e5
Merge remote-tracking branch 'use_pip/use-pip'
...
# Conflicts:
# cps.py
# readme.md
# vendor/wand/api.py
# vendor/wand/drawing.py
# vendor/wand/exceptions.py
# vendor/wand/image.py
# vendor/wand/version.py
8 years ago
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
8 years ago
edadf84710
Added editing star rating graphically
...
Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)
8 years ago
53cc84ec18
#fix 148
8 years ago
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
8 years ago
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
8 years ago
e4a27be1a9
Made stream download for normal download as well as odds
8 years ago
e3e26d418d
Finished code to chunk successfully.
8 years ago
10b129cb07
add timestamps
8 years ago
76e8117b0c
initial version
8 years ago
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
8 years ago
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
8 years ago
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
8 years ago
26438f97ab
Bugfix Filename without unidecode dependency
8 years ago
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
297a08cd5f
xrange fix
...
range to xrange
8 years ago
dc985e76df
python3 fix
8 years ago
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
8 years ago
0c9eacb024
fix opds
8 years ago
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
8 years ago
4dfa157161
use condition rather than try/catch
8 years ago
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
8 years ago
0bc4f52783
Fix except clause
...
except: will catch specific error.
8 years ago
80bcf131ee
add requirement.txt
8 years ago
1da3b57f5a
no need future module for python2
...
fix missing StringIO
8 years ago
bf8688fee1
missing urllib migration
8 years ago
da8d0c2a9f
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
c3fd205b7d
fix /stat
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
2c32696417
Merge branch 'fix/slugify-filename-20170305' into travis
8 years ago
35b9e423ec
Merge branch 'fix/attachment-patch-20170305' into travis
8 years ago
9ca88840eb
“-“ is removed at helper ,
...
so use “_” instead
8 years ago
e845bdbd56
Fix attachment filename
...
File attachment should be url encode rather than utf-8 format
8 years ago
29f21480ab
Reuse original code logic.
...
iteration loop dc:* add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
8 years ago
27cbab6cb7
Fixes for READ/UNREAD
8 years ago
8c7ba2ccdf
Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
...
# Conflicts:
# cps/epub.py
8 years ago
1a10859a57
When upload pub, add description to comment accord opf file
8 years ago
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
8 years ago
b6da3c3153
Fix for read/unread for anonymous users
8 years ago
fb6a37eec3
Update for covers download via opds + inserts permissions if needed (only available with a link)
8 years ago
879510da82
Upload support detection of language
8 years ago
df9124f78b
Fix OPDS download
8 years ago
b8137d2c70
Fixing error with uploading new book / metadata as file was being backed up
8 years ago
8e85d1b5bd
Merge branch 'develop' into personal
8 years ago
78abf81b2f
Fix for editing metadata and uploading for GDrive
8 years ago
583380e71a
path join bug
...
, instead of + because get_main_dir is not endswith os.sep
8 years ago
8745d65ff6
Merging ignorable columns
8 years ago
141eb7901c
Add ignorable columns
8 years ago
d9c48a6203
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/web.py
8 years ago
00763d6e4c
Read book is now tied to the right downlolad books for guest users ( fixes #110 )
8 years ago
1a83ad713c
Additional version info for sqlite database
8 years ago
41a20fe3e1
Added version info of dependencys in about section
8 years ago
0277d08706
Merged #123 .
...
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94 )
8 years ago
3dcfebca60
update translations
8 years ago
51bd888765
Fix registering watch callback
8 years ago
82d01c9001
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
8 years ago
7b709c15c2
GitIgnore update + fixes for initial setup
8 years ago
7e19e1dd9d
Added Publisher and search/advanced search/opds search for publisher
8 years ago
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
6ec4e0a651
Bugfix Updater
...
Improved logging
8 years ago
709fa88c62
Navbar reduced to icons on smaller screens
...
Feedback updater improved (#81 )
8 years ago
f71fa5d935
Accidentally committed WIP google drive integration
8 years ago
d29d079d15
Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books)
8 years ago
ad40a2b5a6
Bugfix parsing publishing date with milliseconds ( #114 )
8 years ago
ed459ddb9b
Bugfix display of commit date
8 years ago
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
1692044d46
Merge remote-tracking branch 'default_user_settings/master' ( #105 )
8 years ago
bff86f02ca
settings for default role of new register user
8 years ago
63379fe5db
Fix for #101
8 years ago
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
e46320b12f
folders now relying on ids not names (removes all encoding issues on link folders)
...
Language filter working in opds feed
removed redundant code
authos now paginating in opds feed
8 years ago
176c7dce70
- Fix for #100
...
- Fix migration of shelf order
- fix show random books in detail view for authors and series
8 years ago
c45968a1ed
Bugfix Updater
8 years ago
296d2615fe
Code cosmetics
8 years ago
1d3be7f4c6
Bugfix Git ident id
8 years ago
b1293c84bc
- Implemented autoupdater for testing
...
- failed logins are logged
- no of backups for log-file increased to 2
8 years ago
935b6e3143
Code cosmetics
...
Bugfix download opds
added changable title to opds feed
removed unused search.xml file
8 years ago
e9d0bff559
- added statistics for Tags and series
...
- Loglevel is displayed as text instead of value
8 years ago
2c615fdf05
Finalize graphical setup for calibre-web
8 years ago
75c89c28e1
Bugfix for accessing config database
...
Title now displaed on every page
Title can be changed from within application
8 years ago
4eee58c21c
Started migration of config to app database
8 years ago
a2a48515d4
Fixed language and locale preset for new users
8 years ago
afdfb30d80
Update email settings
8 years ago
0967b03a22
Merge branch 'master' into patch1
8 years ago
5a8dd19b4b
Bugfix Authentication for opds search calibre companion
8 years ago
9f1f678bef
reset to last commit url_for without _external
8 years ago
4a2f67bc00
fixed url_for return without port when port is not the standard port.
8 years ago
eb22fbf9fa
fixed url_for return without port when port is not the standard port.
8 years ago
e5d881edf8
Bugfix empty search for opds feed
8 years ago
4b8fdb04e6
Improvement mimetypes for downloaded files
8 years ago
99430fc98e
Bugfix ( #79 ).
...
- Fixed download with anonymous user in opds feed
- Added mor filetypes to opds feed, if unknown filetype, nothing is published instead of mobi
8 years ago
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
8759edd587
Calibre-companion now working ( #79 )
8 years ago
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
beca61a596
Nonexisting books are deleted from downloaded list ( #91 )
8 years ago
c6d1c186f0
Metadata viewing should work with calibre-companion now ( #79 )
8 years ago
6cf82dc9b9
Loading further items in calibrecompanion should now work ( #79 )
8 years ago
9f65eae024
add default language configuration
8 years ago
9927a6cc71
Covers should now be downloadable with calibre-companion ( #79 )
8 years ago
c13a2a4557
OPDS Marvin (and Marvin 3) now really work ( #79 )
...
OPDS should now also work with reverse proxy configuration
Changed readme (reverse proxy configuration)
No progress for calibre companion
8 years ago
a16321179d
Improvements for OPDS on iOS with Bookari- and Chunky-Reader
8 years ago
c7b35250c6
Bugfix E-Mailsettings
8 years ago
ea2e8205e3
Added code for rearranging shelfs #73
8 years ago
490f8ef5f2
Shelfs of diffrent users can have the same name now
...
Removing ratings by giving a rating of zero is now possible (like in calibre)
8 years ago
453d04b566
Final fix for #86 (reverse proxy error)
...
renamed admin_user to admin
added configuration infos inm admin panel
8 years ago
0bcdbc4a82
Bugfix Search opds feed
...
Improvement OPDS feed for displaying covers
8 years ago
f434511db8
Fixed lout issue with redirects
...
fixed database migration problem which was introduced with the shelf order commit
8 years ago
157a2e6e4a
Renamed feed to opds for better compatibility with some readers
...
added clickable links to feed (should hopefully solve #79 )
updated readme
8 years ago
c33a329f08
Add search for series and languages ( #56 )
...
Add database migration for shelf ordering (#73 )
8 years ago
e0459eb62b
Removed unused wishlist code
...
Added renaming of shelf name
Added sorting abilty to shelfs
jquery is loaded locally now
8 years ago
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
811975f1a4
Added french translation
8 years ago
0aa3ff4f6d
Remove trailing spaces from username during login
...
Upload of books working on windows without errors
8 years ago
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
a6b6700a73
Removed non working search from epub viewer
8 years ago
313116dca7
Uploader is working on windows
8 years ago
12db39523c
Merge branch 'master' of https://github.com/wuqi/calibre-web
...
# Conflicts:
# .gitignore
# cps/static/css/colors.css
# cps/static/css/style.css
# cps/web.py
8 years ago
05189f78bc
Fix for #67
8 years ago
753a0a82a1
Fix for #66 advanced search
8 years ago
897c1648bb
Add fix for #58 remove trailing spaces
8 years ago
8a9b4e7fc7
remove print
8 years ago
0f8c308973
Fix for deleting kindle mail adresee #54
8 years ago
52ba2adf73
Merge pull request #48 from OzzieIsaacs/patch-1
...
Fix for #45 DB_ROOT not found
8 years ago
2b2d485730
upload more than pdf fixes
8 years ago
f5773cc75f
resolve conflicts with PR 30
8 years ago
59136a9cc2
Linux path problem solved (finally)
8 years ago
b846cc11d8
fix some error
...
Fix TypeError: 'bool' object is not callable
8 years ago
ab97ead264
merge test
8 years ago
350f4e21e6
Add txt reader
...
add txt file reader,and add select for read the book
8 years ago
f95ac38c54
Fix redirects with reverse proxy
...
See #36
8 years ago
34e11fab79
Support reverse proxy subdirectory
...
Closes #19
8 years ago
9a8d795eff
Update epub reader and pdf reader
...
Update epub reader and use pdf.js tu view pdf files
8 years ago
62f9120a0f
Merge branch 'zip-check'
9 years ago
e42f768909
Check if epub file exists before trying to extract
9 years ago
46c83bbe8b
Fix recursive path creation
9 years ago
43d6077815
cleanup
9 years ago
44df873f33
logging, tmp cleanup
9 years ago
027e103ce3
refactoring to make adding new formats possible
9 years ago
c26eb6aa08
add exclude tags to advanced search
9 years ago
80c3c19c01
some fixes for advanced search
9 years ago
7fce28790d
add search_form.html
9 years ago
431b6009a5
add advanced search
9 years ago
3719b7e4eb
Add ANON_BROWSE configuration option
9 years ago
8f4c444929
add basic auth for feed sites
9 years ago
f66d7ce29b
add permission for changing own password
9 years ago
c7b7b3866e
add user-permission management
9 years ago
b2146ba4b9
add support for is_multiple custom columns
9 years ago
931981a37a
fix for custom column 'rating'
9 years ago
a21a9d6510
save rating as rating*2 in db and show rating/2 in interface
9 years ago
27d5a79efb
remove some commented code and debug prints
9 years ago
704198655b
custom columns unfinished
9 years ago
202cbc26a7
custom columns unfinished
9 years ago
0ee46e4b5e
custom columns unfinished
9 years ago
2207622bbf
fix for edit page after upload
9 years ago
8d2a865436
Catch file permission errors when uploading PDF
9 years ago
826159c432
show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver
9 years ago
76c7cdf465
Add config option for upload feature
9 years ago
952d389dc5
Ship config.ini with defaults; log errors to file; fix OPDS catalog name
9 years ago
51f1453917
check if wand is available, add dummy cover.jpg otherwise
9 years ago
e4ffc9f2a0
set last_modified when pdf is uploaded
9 years ago
4e0621479a
don't show upload button for users
9 years ago
bda3055a19
improvements for pdf upload function
9 years ago
3324669702
improvements for pdf upload function
9 years ago
748dd2ad1f
Merge remote-tracking branch 'upstream/master'
9 years ago
3ddecc007c
Adding unfinished upload function
9 years ago
7342837aa3
Merge branch 'html-fixes'
9 years ago
318d65bf3a
Small UI fixes
...
* Smart truncate long titles in overview pages
* Fix responsive grid in overview
* Update favicon
9 years ago
cb2ac4d142
for for editing Author
9 years ago
a96417f2a5
fix for password edit at the admin page
9 years ago
a395e9f301
remove orphaned authors
9 years ago
c6500b7eca
Merge remote-tracking branch 'upstream/master'
9 years ago
1a922d4552
Fix crash when 'view book after edit' is not checked
9 years ago
cd0aeb2857
Add Typeahead for Author input
9 years ago
13a024a77d
Add logging / Optimize CSS
9 years ago
d979ed89c6
Fixes for editing Authors
9 years ago
34cd613e29
Fixes broken send-to-kindle
9 years ago
17622c1fbf
Fix download error when book title contains non-latin characters (e.g. Chinese)
9 years ago
f163ef2202
make pretty filenames for downloads; remove random books section on most pages
9 years ago
2b846b1e6b
Make shelf names required unique
9 years ago
350285607b
Add HTTP-BASIC Auth for OPDS downloads
9 years ago
6b4ddbe946
Fix: admin functions were accessible for regular users
9 years ago
e21e974457
Add public account registration
9 years ago
af4f7396cd
Fix titles and covers
9 years ago
2e4117eac2
support for removing books from shelfs
9 years ago
c92de6e539
Fix filename of book download (was pre- and suffixed with single quotes)
9 years ago
0b5b3b8424
User edit email fix
9 years ago
aef608aa10
Refactor (settings database, etc...)
9 years ago
64a9cbce2d
Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/
9 years ago
Jack Darlington