Commit Graph

344 Commits (9e5fa45df7cd840d8a26d25f953857a13d6bc5de)

Author SHA1 Message Date
Jack Darlington ff89d9c20d Merge branch 'master' into develop 8 years ago
Jack Darlington 7d31abf920 added jquery.form.js to project locally 8 years ago
Jack Darlington 537977e497 Changed “have read” to checkbox 8 years ago
Jack Darlington 8f2088a3ea Updated use google drive checkbox 8 years ago
Jack Darlington 5a2e77baaf fix for form input ID 8 years ago
OzzieIsaacs 74a3e6842a Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
#	cps/web.py
8 years ago
OzzieIsaacs 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
林檎 2ef4933f7a Merge branch 'feature/download-suffix-20170309' into travis
# Conflicts:
#	cps/templates/detail.html
8 years ago
林檎 045419e880 Fix #146
For WebUI only
OPDS remains previous behaviour
8 years ago
林檎 a766784ef1 Merge branch 'feature/download-suffix-20170308' into travis 8 years ago
林檎 7bae79d826 fix conflict 8 years ago
林檎 8c625dfb93 Fix #146
For WebUI only
OPDS remains previous behaviour
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
OzzieIsaacs 38c782fcf1 Merge remote-tracking branch 'Douban/prod'
# Conflicts:
#	cps/templates/book_edit.html
8 years ago
OzzieIsaacs 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
idalin a6b2977286 add i18n message for getmeta feature. 8 years ago
Jack Darlington 015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
8 years ago
Jack Darlington b6da3c3153 Fix for read/unread for anonymous users 8 years ago
Jack Darlington 8745d65ff6 Merging ignorable columns 8 years ago
Jack Darlington 141eb7901c Add ignorable columns 8 years ago
idalin 54bc299e88 get metadata from douban and google while editing. 8 years ago
idalin e100702345 get metadata from douban and google while editing. 8 years ago
Jack Darlington d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
8 years ago
OzzieIsaacs 679effbaef Bugfix placement of "recent downloads in "edit user section" 8 years ago
OzzieIsaacs 156a653c49 Make better usage of big screens in lists 8 years ago
OzzieIsaacs 00763d6e4c Read book is now tied to the right downlolad books for guest users (fixes #110) 8 years ago
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 8 years ago
OzzieIsaacs 40c6ef3a18 More generic aproach for postion of epub coverfile (#122) 8 years ago
OzzieIsaacs 41a20fe3e1 Added version info of dependencys in about section 8 years ago
idalin a09a2d9ed0 Merge branch 'master' into prod 8 years ago
Jack Darlington 82d01c9001 Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
8 years ago
OzzieIsaacs 7e19e1dd9d Added Publisher and search/advanced search/opds search for publisher 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
idalin 80e6311b93 fetch metadata from douban while editing metadata 8 years ago
OzzieIsaacs 709fa88c62 Navbar reduced to icons on smaller screens
Feedback updater improved (#81)
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 e712649612 Improvement for #83, higher contrast of hamburger menu
Improvement for #84, search is excluded from mobile view
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 ba8e107402 Move vendored css/js to libs folders to fix language stats 8 years ago
janeczku 13919a1d23 Move vendored css/js to libs folders to fix language stats 8 years ago
OzzieIsaacs 18a06e4a25 Fixed typeahead with reverse proxy
fixed marking of tags in advanced search
seperated js and html
8 years ago
OzzieIsaacs d5a64baf13 Bugfix name to id 8 years ago
OzzieIsaacs 4e73b11735 Fix for simplified chinese language 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 ee91fc03ef Bugfix Id instead of names in url 8 years ago
OzzieIsaacs 861920af88 Pubdate is now showing up (#95)
Bugfix links in  detailview
8 years ago
OzzieIsaacs 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
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 b1293c84bc - Implemented autoupdater for testing
- failed logins are logged
- no of backups for log-file increased to 2
8 years ago
OzzieIsaacs 935b6e3143 Code cosmetics
Bugfix download opds
added changable title to opds feed
removed unused search.xml file
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 a2a48515d4 Fixed language and locale preset for new users 8 years ago
OzzieIsaacs 93b020b77c Proper handling for non existing covers in calibre database 8 years ago
OzzieIsaacs afdfb30d80 Update email settings 8 years ago
OzzieIsaacs 12c80800ed Bugfix search in opds feed (#79 again)
Bugfix link generation for calibre-companion with reverse proxy (#79 again)
8 years ago
OzzieIsaacs 4b8fdb04e6 Improvement mimetypes for downloaded files 8 years ago
OzzieIsaacs 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
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 8759edd587 Calibre-companion now working (#79) 8 years ago
OzzieIsaacs 799d54bb24 Download with calibre-companion now working (#79) 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 c6d1c186f0 Metadata viewing should work with calibre-companion now (#79) 8 years ago
OzzieIsaacs 6cf82dc9b9 Loading further items in calibrecompanion should now work (#79) 8 years ago
OzzieIsaacs 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
OzzieIsaacs a16321179d Improvements for OPDS on iOS with Bookari- and Chunky-Reader 8 years ago
OzzieIsaacs 8494cb698c Changed order of checkbox and label for SSL in SMTP Settings 8 years ago
OzzieIsaacs ea2e8205e3 Added code for rearranging shelfs #73 8 years ago
OzzieIsaacs 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
OzzieIsaacs 453d04b566 Final fix for #86 (reverse proxy error)
renamed admin_user to admin
added configuration infos inm admin panel
8 years ago
OzzieIsaacs 0bcdbc4a82 Bugfix Search opds feed
Improvement OPDS feed for displaying covers
8 years ago
OzzieIsaacs 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
OzzieIsaacs e744ccc20e Bugfix for links with reverse proxy and shelfs 8 years ago
OzzieIsaacs a8f7fde333 Bugfix PDF Reader with reverse proxy (#86)
Bugfix Txt Reader
Bugfix for loading covers with reverse proxy
8 years ago
OzzieIsaacs c33a329f08 Add search for series and languages (#56)
Add database migration for shelf ordering (#73)
8 years ago
OzzieIsaacs fac83a10eb Added display and linking of IDs (Amazon, ISBN, and DIO Links are working) 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 c582ccf79c Fix for #78 8 years ago
OzzieIsaacs b878651e4e Bugfix epub-Reader 8 years ago
OzzieIsaacs b86864b407 Made kindlegen working on windows (including paths containing umlauts)
Added back buttons on edit mail, edit user, and edit book
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 a6b6700a73 Removed non working search from epub viewer 8 years ago
OzzieIsaacs 313116dca7 Uploader is working on windows 8 years ago
OzzieIsaacs 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
OzzieIsaacs 7df88e70a3 First step fix for #37 wrong search adress
@ jschuck, @jgillmann, could you please confirm that you can search now?
Do you still have logout/login problems? -> redirects to Hostname instead of hostname/calibre?
(got this too with apache server, where as search worked before)
8 years ago
Cervinko Cera 0f8c308973 Fix for deleting kindle mail adresee #54 9 years ago
wuqi 26c293308c mouse wheel 9 years ago
wuqi b846cc11d8 fix some error
Fix TypeError: 'bool' object is not callable
9 years ago
wuqi 3a54ff0eb4 browser icon change back 9 years ago
wuqi ab97ead264 merge test 9 years ago
wuqi 350f4e21e6 Add txt reader
add txt file reader,and add select for read the book
9 years ago
janeczku d051a1dbeb Fix login/logout redirect with reverse proxy 9 years ago
wuqi 9a8d795eff Update epub reader and pdf reader
Update epub reader and use pdf.js tu view pdf files
9 years ago
janeczku 374cfd866d Disable autocomplete in user edit 9 years ago
Cervinko Cera c26eb6aa08 add exclude tags to advanced search 9 years ago
Cervinko Cera 80c3c19c01 some fixes for advanced search 9 years ago
Cervinko Cera 7fce28790d add search_form.html 9 years ago
Cervinko Cera 431b6009a5 add advanced search 9 years ago
Cervinko Cera f66d7ce29b add permission for changing own password 9 years ago
Cervinko Cera bc35250f28 permission fix in user_edit.html 9 years ago
Cervinko Cera c7b7b3866e add user-permission management 9 years ago
Cervinko Cera b2146ba4b9 add support for is_multiple custom columns 9 years ago
Cervinko Cera 3f1a54ea59 fix typo in detail.html 9 years ago
Cervinko Cera b7f71e563e fix for custom column 'rating' 9 years ago
Cervinko Cera 931981a37a fix for custom column 'rating' 9 years ago
Cervinko Cera a21a9d6510 save rating as rating*2 in db and show rating/2 in interface 9 years ago
Cervinko Cera f57c9c5951 remove if clauses for int and float in edit_book.html 9 years ago
Cervinko Cera 704198655b custom columns unfinished 9 years ago
Cervinko Cera 202cbc26a7 custom columns unfinished 9 years ago
Cervinko Cera 826159c432 show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver 9 years ago
JanB 76c7cdf465 Add config option for upload feature 9 years ago
JanB 952d389dc5 Ship config.ini with defaults; log errors to file; fix OPDS catalog name 9 years ago
Cervinko Cera 1d295eb954 show 'read in browser' only for epubs 9 years ago
Cervinko Cera 4e0621479a don't show upload button for users 9 years ago
Cervinko Cera bda3055a19 improvements for pdf upload function 9 years ago
Cervinko Cera 748dd2ad1f Merge remote-tracking branch 'upstream/master' 9 years ago
Cervinko Cera 3ddecc007c Adding unfinished upload function 9 years ago
Jan Broer 7342837aa3 Merge branch 'html-fixes' 9 years ago
Jan Broer 318d65bf3a Small UI fixes
* Smart truncate long titles in overview pages
* Fix responsive grid in overview
* Update favicon
9 years ago
Cervinko Cera c6500b7eca Merge remote-tracking branch 'upstream/master' 9 years ago
Cervinko Cera cd0aeb2857 Add Typeahead for Author input 9 years ago
Jan Broer 13a024a77d Add logging / Optimize CSS 9 years ago
Jan Broer 34cd613e29 Fixes broken send-to-kindle 9 years ago
Jan Broer f163ef2202 make pretty filenames for downloads; remove random books section on most pages 9 years ago
Jan Broer 350285607b Add HTTP-BASIC Auth for OPDS downloads 9 years ago
Jan Broer 6b4ddbe946 Fix: admin functions were accessible for regular users 9 years ago
Jan Broer e21e974457 Add public account registration 9 years ago
Jan Broer ec7aafe7f0 UI: Details overhaul (buttons, language, tags) 9 years ago
Jan Broer 91c4effcec Rename "Read online" button 9 years ago
Jan Broer 9db94b04b1 Normal size for shelf button 9 years ago
Jan Broer 79e20d13ee Changed title logo 9 years ago
Jan Broer af4f7396cd Fix titles and covers 9 years ago
Jan Broer 2e4117eac2 support for removing books from shelfs 9 years ago
Jan Broer 3c8685c986 Don't strip html tags for book description
Fixes #2
9 years ago
Jan Broer 181a35c7b5 Fix description breakline 10 years ago
Jan Broer 0b5b3b8424 User edit email fix 10 years ago
Jan Broer aef608aa10 Refactor (settings database, etc...) 10 years ago
Jan Broer 64a9cbce2d Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/ 10 years ago