Commit Graph

1682 Commits (44d5adc16f4aa3ece7cc5df0e41d39ffcb7b40d6)

Author SHA1 Message Date
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
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 6 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 6 years ago
Ozzieisaacs 1fc4bc5204 Fix routes
Fix error page
6 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
Ozzieisaacs d58d792f56 Catch Imagemagick policy error 6 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 6 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 6 years ago
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop 6 years ago
Ozzieisaacs 6fc4b318e8 cover folders beautified 6 years ago
Ozzieisaacs 36229076f7 Refactor subprocess calls 6 years ago
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
6 years ago
Ozzieisaacs ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
6 years ago
Ozzieisaacs b75b91606c Fix config oauth-UI 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 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 6 years ago
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
6 years ago
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
6 years ago
Ozzieisaacs 9128615f48 Fix #424
Fix #425
6 years ago
Ozzieisaacs ec81a3cd92 Fix Authors page pagination
Update infinite scroll plugin
6 years ago
Ozzieisaacs 97064db2a4 Restart python3 fix, stop and restart python2 working again 6 years ago
Ozzieisaacs 341dd77b9d Bugfix Restart and Stop server on python3 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 62574939b2 Fix #770 6 years ago
Matt b1d2b68bb1 Revert "Merge pull request #1 from hexeth/reader-theme"
This reverts commit fb7bd0c49b, reversing
changes made to ae55dd6c27.
6 years ago
hexeth 3ba9e4d96e
reader theme 6 years ago
leram84 ae55dd6c27 Update caliBlur.min.css 6 years ago
Matt 7341819606 Revert "Update caliBlur.min.css"
This reverts commit df8806e182.
6 years ago
Matt 68f143dc30 Revert "Create dark-reader.css"
This reverts commit a69e43922a.
6 years ago
Matt ae14236698 Revert "Add Dark-Reader"
This reverts commit 7e9d6a3cf9.
6 years ago
Matt 9ee4b7f77c Revert "Not ready for commit"
This reverts commit 6a2ebba85b.
6 years ago
hexeth 6a2ebba85b
Not ready for commit 6 years ago
hexeth 7e9d6a3cf9
Add Dark-Reader 6 years ago
leram84 a69e43922a
Create dark-reader.css 6 years ago
leram84 df8806e182
Update caliBlur.min.css 6 years ago
hexeth 83a905bfe1
Don't remove the dropdown toggle 6 years ago
Matt e01872fc79 Revert "Update caliBlur.min.css"
This reverts commit 2b7b55846b.
6 years ago
leram84 2b7b55846b
Update caliBlur.min.css 6 years ago
hexeth c0792b7225
Add .sendtokindle-drop to click-off 6 years ago
Matt 8825352af6 Revert "Add sendtokindle-drop to click-off array"
This reverts commit d83ba315f0.
6 years ago
hexeth d83ba315f0
Add sendtokindle-drop to click-off array 6 years ago
hexeth 16e23cb1fe
Fix upload tooltip not appearing 6 years ago
leram84 df2b1ba09d
fix for send button dropdown 6 years ago
hexeth 9a12e60b1c
Toggle for dropdown 6 years ago
hexeth c620453ebf
UL positioning 6 years ago
hexeth 4988e3b631
add tooltip and move UL higher in DOM 6 years ago
Matt aa27e0e476 Revert "Update ID of button from sendbtn2 to sendbtn"
This reverts commit a9277da85a.
6 years ago
Ozzie Isaacs 9e5fa45df7
Removed unnecessary wait message 6 years ago
leram84 d5ff3b6a0b smtp setup page (#774)
fix for https://github.com/janeczku/calibre-web/issues/773
6 years ago
Ozzie Isaacs cc618ecee7
Fix Limiting domains (related to #773) 6 years ago
Ozzieisaacs f4977c3767 Merge remote-tracking branch 'theme/master' 6 years ago
hexeth a9277da85a
Update ID of button from sendbtn2 to sendbtn
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
6 years ago
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
6 years ago
Krakinou d48cdcc789 Correct authentication in case LDAP not activated 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 c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
6 years ago
hexeth 4ace3a5e27
test 6 years ago
leram84 db83fb3bd7
minified 6 years ago
hexeth 883633a045
Remove beta from caliBlur selection 6 years ago
Matt 84fdf9143b Revert "Update web.py"
This reverts commit a388f03b99.
6 years ago
Matt 7a069ad72e Revert "Update web.py"
This reverts commit 1bcc0698d5.
6 years ago
leram84 f897491070
Update caliBlur.min.css 6 years ago
Ozzieisaacs f053508013 Fix #764 6 years ago
hexeth 2ab10bb070
Update caliBlur.js 6 years ago
hexeth 1bcc0698d5
Update web.py 6 years ago
hexeth a388f03b99
Update web.py 6 years ago
hexeth 9c75eb7016
Update caliBlur.js 6 years ago
hexeth 6c37aafae9
Update caliBlur.js 6 years ago
hexeth 550262e651
Further fix 6 years ago
hexeth edb4cedc65
Update about page to target new body class 6 years ago
hexeth 40e45c7272
Add files via upload 6 years ago
hexeth 7032f311d5
Update caliBlur.js 6 years ago
Ozzieisaacs 66fcd71685 Merge remote-tracking branch 'origin/master' 6 years ago
Ozzieisaacs 36030b559c Choosing Theme is now a global setting 6 years ago
Krakinou 30954cc27f Initial LDAP support 6 years ago
hexeth e1205b75cd Fix targeting for language support (#761)
Some other languages use 'description :' instead of 'description:' .
6 years ago
Ozzieisaacs d5a913e195 Merge remote-tracking branch 'origin/master' 6 years ago
leram84 dba5680121 1.0 for the merge (#758)
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
6 years ago
Ozzieisaacs b03f4bb5e5 Merge remote-tracking branch 'origin/master' 6 years ago
hexeth 23396af83c Add .random-books class to random books div (#757)
Assist caliBlur in targeting this element
6 years ago
hexeth 418e98d1f8 update .published-date to .publishing-date (#756) 6 years ago
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
Ozzieisaacs fa3426aa08 Merge remote-tracking branch 'origin/master' 6 years ago
hexeth eb1c87fbae Patch 4 (#752)
* Target new class 

Target new class for caliblur language support

* Move publishing date into div

Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.

* Target newly created div
6 years ago
hexeth c77825371d Add classes to shelves for easier css selection (#751)
proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.
6 years ago
Ozzieisaacs fa4918a2db File renaming according to title and author (#654) - gdrive is missing 6 years ago
Ozzieisaacs 8db2b62b39 Merge remote-tracking branch 'origin/master' 6 years ago
Ozzieisaacs 98134616b6 Fix #661 (authors are shown according to the authors sort order) 6 years ago
Ozzieisaacs 4dcac07582 Partly fixed #661: Right order of Authors is still not shown 6 years ago
hexeth 29c9d55498 Remove leading space in span (#749)
Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span
6 years ago
hexeth ece11de942 Fix publisher not formatting correct (#747) 6 years ago
Ozzieisaacs f821580b50 #Fix 745 6 years ago
Ozzieisaacs 7086c8d1bf Merge remote-tracking branch 'language_edit/master' 6 years ago
Ozzieisaacs 013f7bf53e Merge remote-tracking branch 'lang/patch-1' 6 years ago
Adrian Petrescu 5341910ea5
Deal gracefully with invalid Accept-Languages header
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).

This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.

Fixes #743 among others.
6 years ago
Ozzieisaacs 9cfe1dce20 Fix #739 6 years ago
Ozzieisaacs cb0f3cd074 Fix #696 6 years ago
Ozzieisaacs d0fd1a4601 Merged new caliblur theme
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
6 years ago
grunjol 462cf20a34 Process all custom columns on editing 6 years ago
grunjol 00ba231fbf fix adding an existing language to a book 6 years ago
Ozzieisaacs 677264950d Merge remote-tracking branch 'ru-translation/master' 6 years ago
Anton Konyshev e6b1c8cf36 Updated Russian translation 6 years ago
Ozzieisaacs 9057a3a0d7 Merge remote-tracking branch 'dutchtranslation/master' 6 years ago
Ed Driesen 45d97d277a Update Dutch translation
Some lines where still untranslated, fixed it.
6 years ago
Ozzieisaacs 81e3afbcc4 Fix #714 (advanced search for ratings) 6 years ago
Ozzieisaacs 7526b0dcb4 Fix #623, #715 6 years ago
Ozzieisaacs 64b1b830d6 Fix #712 6 years ago
Ozzieisaacs 863b77a5d7 Fix #711
Fixing for send to kindle after uploading
codecleaning
6 years ago
Ozzieisaacs b78130e3b1 Merge remote-tracking branch '681/681-fix' 6 years ago
Ozzieisaacs 47424e5c1a Merge remote-tracking branch 'swedish/master'
Improved server stop command
6 years ago
Jony bc0d19f33d
Fix typo 6 years ago
Jony cbc9169973
Update messages.po 6 years ago
haseo e1b6fa25e9 A better solution to #681 6 years ago
Ozzieisaacs dfa17956c9 Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
Changed function for 295, azw3 is preferred format for sending to kindle
6 years ago
Ozzieisaacs a2b612c9ab Merge remote-tracking branch 'ssl/verify-ssl-paths' 6 years ago
Ozzieisaacs 2422f782de Fix #701 6 years ago
Ozzieisaacs c574b779fb Added swedish translation 6 years ago
Ozzieisaacs 07d7be176c Merge remote-tracking branch 'lang/master' 6 years ago
André Santos c6a5ac7f25 Fix wrong variable usage 6 years ago
André Santos af216e3697 Verify if certfile and keyfile are paths to actual files
This allow to try to not use ssl if the key file path or the certificate file are broken. The files might be missing because the user intentionally removed them but didn't  update the settings first. In that situation, this change won't make the app crash, the warning is logged and that way the user has the chance to update the settings.
6 years ago
dalin 947622800c Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese. 6 years ago
Ozzieisaacs 399dffba5a log file name in case of filename not found (#691) 6 years ago
Ozzieisaacs 8d6d28eb57 Merge remote-tracking branch 'titlelink/titles-links'
Fix for #694
6 years ago
Ozzieisaacs 89bddead35 Merge remote-tracking branch 'http_error/beautify-http-errors' 6 years ago
Ozzieisaacs 38c180a9ea Update translation files 6 years ago
Ozzieisaacs c05687b896 Fix #668 6 years ago
Ozzieisaacs c3bec48bc7 Fix #617
Additional texts translated
6 years ago
Ozzieisaacs c582a70498 Merge remote-tracking branch 'bbb/617' 6 years ago
Ozzieisaacs 0df35dcfea Update Updater 6 years ago
Ozzieisaacs cc7dcfb35a Update Updater
Bugfix author in opds-feed
6 years ago
Ozzieisaacs c1818e8f36 Fix for #672 6 years ago
Ozzieisaacs ee85492c7d Fix #662 6 years ago
Ozzieisaacs 5fc742c9c4 Fix #690 6 years ago
Ozzieisaacs 3f83be00fd Fix #687 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
Ozzieisaacs e080c74032 Merge remote-tracking branch 'ru-translation/patch-2' 6 years ago
OzzieIsaacs 58df19972f Merge remote-tracking branch 'hungarian/loc-hu'
Update spanish language
6 years ago
Jim Ma 4b76b8400d Add OAuth link&unlink in user profile 6 years ago
Jim Ma 1abbcfa3c6 Add OAuth support: GitHub & Google 6 years ago
otapi 9b4ca22254
Update shelf.html 6 years ago
otapi c6d3613e57
Add UI link button to shelves 6 years ago
otapi 1201d4086f
Few termchanges 6 years ago
otapi e0229c917c
Download only shelf
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
6 years ago
Chintogtokh Batbold 13883db5a0 Add anchor tags to titles 6 years ago
otapi 922e21438c
Minor fix 6 years ago
otapi 32366ab1ba
HU translation fixes 6 years ago
otapi 62d172f1e0
Delete dummy 6 years ago
otapi 67ecc2c088
HU translation 6 years ago
otapi 81a3b85c07
Create dummy 6 years ago
Victorhck c09b7f39a5 spanish translation finished 6 years ago
Victorhck b32ee84d4f update Spanish translation (WIP 6 years ago
bodybybuddha ee686b5379 Fix for #617
Task table: Status column and task messages have been localized
	Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
6 years ago
Ozzie Isaacs 7253f583cf Fix #650
Improved testablility
Added feedback for book_edit -> stay on edit page
6 years ago
bodybybuddha 54f8680058 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 6 years ago
OzzieIsaacs 40cc25de7a Merge remote-tracking branch 'bbb/621'
Fixes after testing
6 years ago
bodybybuddha d8107fb50f Addressed Codacy trailing space items ... again 6 years ago
bodybybuddha 46b2c9919a Fix for #295
Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first
6 years ago
bodybybuddha 1144d97bc1 Fixed updating new book format to be all caps in database
This keeps us inline with calibre's behavior.
6 years ago
bodybybuddha 5d34fd7fec Send to Kindle button precheck added
Based on existing book formats and which converter (if any) determine if button can be seen.
6 years ago
Virgil Grigoras a798dc94a9 Satisfy "Codacy/PR Quality Review" 6 years ago
Virgil Grigoras 60e9d01d27 Beautify http errors 6 years ago
Virgil Grigoras 1ac9b3d837 Update OPDS-part to display publishers 6 years ago
Virgil Grigoras 6a007ec881 fix indentations 6 years ago
Virgil Grigoras 5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 6 years ago
bodybybuddha 1b363ac720 Merged master into 617 - fixed import copy conflict 6 years ago
Virgil Grigoras 016c7b4b1c Add ability to store and edit publishers 6 years ago
OzzieIsaacs 5a2ed58d06 Improved message for non configured ebook converter
Gdrive cleared interface (drive variable)
refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function
rearanged imports
added Wand and pytz Version info to stats Page
6 years ago
OzzieIsaacs ffe3dd3de3 Show version of Werkzeug and Jinja2 in stats page 6 years ago
bodybybuddha a7386ecb8b Merge branch 'master' of https://github.com/janeczku/calibre-web into 621 6 years ago
bodybybuddha 9b1954f2f0 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 6 years ago
Ozzie Isaacs c36b1ed58a Added additional ids and classes for easier testing 6 years ago
Ozzie Isaacs cd0fc917d7 Bugfix template rights at creating user
Added errormessages for shelf actions
Additional ids for better testability
6 years ago
bodybybuddha 29efcf8358 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 6 years ago
bodybybuddha d2e74a27cd Merge branch 'master' of https://github.com/janeczku/calibre-web into 621 6 years ago
OzzieIsaacs ba7c734657 Fixes from testing:
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
6 years ago
OzzieIsaacs cab98a9165 Update translation files 6 years ago
OzzieIsaacs aa5127cd16 Merge remote-tracking branch 'lxml/master' 6 years ago
OzzieIsaacs b841baf714 Comment for adding publishers 6 years ago
eddriesen 522e897fee
Updated Dutch translation to current codebase
As requested,
A Dutch update
6 years ago
Fatih Ka 76e3be58e6
Delete book fixed
There was an incorrect parameter.
6 years ago
bodybybuddha b4122e9858 Partial fix to #617. Local status messages now work. 6 years ago
trasba 3fa41d0e4a
added formats for upload and conversion
added formats for upload and conversion (html, rtf, odt)
6 years ago
bodybybuddha be0ddf25e4 Fix for #621 - Login page always in english 6 years ago
OzzieIsaacs 80e1a6910d Fix Updater 6 years ago
OzzieIsaacs b5ef63d327 Removed fixed update Informations 6 years ago
OzzieIsaacs 4eeeb02b1d Merge remote-tracking branch 'update_check/master' 6 years ago
OzzieIsaacs 36d26f2089 Merge remote-tracking branch '625/625'
Update russian translation
6 years ago
bodybybuddha 03dc179bc3 Fixed Codacy Issues 6 years ago
bodybybuddha 89c0904ac9 Fix to #625 - Check to see if target book format already exists before executing conversion. 6 years ago
Admiral Laser Beard 21582f097e
update translation 6 years ago
OzzieIsaacs 968cddf2b0 Fix for #620 6 years ago
Virgil Grigoras e08eccba5a Satisfy "Codacy/PR Quality Review" 6 years ago
Virgil Grigoras 50ded1afc1 typo fix 6 years ago
Virgil Grigoras b2b092c190 Bugfix for not displaying information when there is no update available + simplification 6 years ago
Virgil Grigoras f7872aded0 Own function for getting the current commit hash and datetime 6 years ago
Virgil Grigoras cb5adb3a31 Display "what's new" information for newer versions than the current one 6 years ago
OzzieIsaacs 01fb8ee681 Fix #609
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
6 years ago
Virgil Grigoras 9616562a76 Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block) 6 years ago
Virgil Grigoras cfae6e893a Move update relevant parts to own section 6 years ago
Virgil Grigoras 1047859424 Place general information (db location, amount of books...) on top 6 years ago
Virgil Grigoras 354eac1512 fix html errors and formating 6 years ago
Virgil Grigoras 6e2dbb7cd6 move current commit hash to its own file 6 years ago
Virgil Grigoras f477d48c7c More robust handling while checking for new updates 6 years ago
OzzieIsaacs bb7d2c6273 Update Language translation table (now including the locale language)
Fix #602
Fix for #593
6 years ago
OzzieIsaacs 79ee07ea54 Fix for python3 and pickle 6 years ago
OzzieIsaacs ce6cde545b Update french language 6 years ago
OzzieIsaacs 919de60e8d Final fix #615 6 years ago
OzzieIsaacs a5d15a19de Update Translation "->' 6 years ago
Ozzie Isaacs 2de41a5c86 improvement for #615 6 years ago
OzzieIsaacs 9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
6 years ago
OzzieIsaacs 2f1fe60cd6 Merge remote-tracking branch 'chinese_translation/master' 6 years ago
OzzieIsaacs 0091006aad Fix #611
Fix for #615
6 years ago
OzzieIsaacs b48de7dc77 Fix for #609 6 years ago
idalin b103ecdb5c update simplified Chinese 6 years ago
OzzieIsaacs 0bcb20f674 Fix #604
Added missing translation for "select option"
6 years ago
Virgil Grigoras db9561db89
Show add to shelf button only when there is a result 6 years ago
OzzieIsaacs 0e1711631c Fix for #600
publisher-info  is shown on edit page (#599)
6 years ago
OzzieIsaacs 3f2d0ea7bb Fix #601
Removed trailing comma on edit page
6 years ago
OzzieIsaacs 66824ff4e4 Fix #576 6 years ago
OzzieIsaacs 06ffa5e66d Fix displaying random books with no author entry
Code cosmentics for opds feed
Narrowed exceptions on language not found
Fix password changing
6 years ago
OzzieIsaacs a4190f39de Fix #577 6 years ago
OzzieIsaacs 4dd6c55c38 Fix for #587 (Better handling of errors in sending email) 6 years ago
OzzieIsaacs c3b0492834 Refactored make_mobi and convert_ebook functions 6 years ago
OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
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 9c889d1681 Fix #597
Updated language files
6 years ago
bodybybuddha 22ecdfd2bc Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button 6 years ago
bodybybuddha 4b006fba99 Re-commit: #584 & #587 Convert any book format to another format 6 years ago
bodybybuddha fc78d1ee07 Added exception catching for file format check 6 years ago
bodybybuddha 4f386c8a00 Updated GUI buttons for ebook-convert feature 6 years ago
bodybybuddha 3ec000ad85 Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any 6 years ago
OzzieIsaacs a7a91ae54c Added posibility to upload cover from local drive (#439)
Updated language files
6 years ago
OzzieIsaacs 3a37183e25 Included khmer language
Further unified naming
6 years ago
OzzieIsaacs 2453786174 Limit registering domains 6 years ago
bodybybuddha e160efbdac Add GUI functions for ebookconvert any format feature 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 f6ab724020 Fix generating links on tasks pafge 6 years ago
OzzieIsaacs 72fff2a297 Update for running calibre-convert in docker 6 years ago
OzzieIsaacs 7917347508 Revert accidently commited change in admin.html (#580) 6 years ago
OzzieIsaacs 5889535355 Bugfix gdrive download Books
Bugfix pagination
Fix Error messages massadd of books to shelf
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
Ozzie Isaacs 34abf95fb2 Fix for empty filename during edit 6 years ago
OzzieIsaacs 7dac87fa5d Code cosmetics unrar 6 years ago
OzzieIsaacs d2ea10e90e Improved OPDS compability (#579)
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
6 years ago
OzzieIsaacs 9ace4d3372 Updated german translation
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
6 years ago
OzzieIsaacs 273b1c3fa8 Fix calibre-converter/kindlegen handling on windows and python3 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 f8132f4d02 Fix for #574 6 years ago
OzzieIsaacs bb5d7d7bc0 Fix for #574 6 years ago
OzzieIsaacs c38f331b6f Fix for #575
Fix no pydrive dependency installed
Fix sending email on python3
6 years ago
OzzieIsaacs fac0921acf Fix in exception of emailing 6 years ago
OzzieIsaacs 5ef70890d9 Search for custom columns implemented #494
Search for ratings related to #559
Search description #572
code cosmetics
6 years ago
OzzieIsaacs 791f4a8078 Fix #455 6 years ago
Ozzie Isaacs 7be328c535 Converting ebooks in background
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
OzzieIsaacs 11b798a01c Fix #571 6 years ago
OzzieIsaacs 1e5cb29fc9 #571 (temporary fix) 6 years ago
OzzieIsaacs 5ec9051f2e Add charset to opds feed for read books 6 years ago
Unknown fdabb804cf Call print as a function 6 years ago
Ozzie Isaacs 3db682cd15 Merge remote-tracking branch 'del_books/delete-book-formats'
# Conflicts:
#	cps/helper.py

Implemented delete on gdrive
6 years ago
Ozzie Isaacs f81fbaf542 Fix #568 (encoding problem in fb2 upload) 6 years ago
Ozzie Isaacs 82fe282e9b Converting books from gdrive implemented 6 years ago
Ozzie Isaacs ff1b479188 Added name of book emailed to task list
Implemented emailing of books from gdrive (converting not implemented yet)
6 years ago
OzzieIsaacs dbf55d6f41 Fix #565 7 years ago
Ozzie Isaacs 7a38c05f12 Stop e-mail-thread on quit or restart 7 years ago
OzzieIsaacs b0cbd0a37a Added feature to send emails in a background-task 7 years ago
Ozzie Isaacs 4d6299f0d5 Improved gdrive error messages (#554) 7 years ago
Ozzie Isaacs 6a76dce870 Fix change user (in case of reboot required)
Fix no existing database
Update required version for sqlalchemy
7 years ago
OzzieIsaacs 9d161129d9 Fix for #554 7 years ago
OzzieIsaacs f8c9777668 Merge remote-tracking branch 'show_url/url-links' 7 years ago
OzzieIsaacs ab63d08d71 Fix for linux subprocess calibre-convert 7 years ago
Ben Bennett b271b5f686 Changed the args to subprocess.Popen to pass args to the command
Before the command was not working correctly to check the calibre version since it seemed to be treating the entire string as the command.  So when ' --version' was added it was breaking.  I changed the format to pass the command and args as a list and it seems to work correctly.
7 years ago
PJ Eby 83db0f9ad5 Render 'url:' ID type as a link
Calibre allows 'url:' as a kind of book identifier
and shows it in the UI as a link; this change
makes calibre-web do the same.
7 years ago
OzzieIsaacs 2449b4049b Code cleaning Stats page
Enable calibre's ebook-convert as converter for mobi files (#411, #533)
7 years ago
OzzieIsaacs ae0c5d7ec2 Fix for #549 7 years ago
OzzieIsaacs 3a9a59b751 Fix #497 7 years ago
OzzieIsaacs a53b7908f3 Fix #417 7 years ago
OzzieIsaacs aaa706069c Implemented #417 7 years ago
OzzieIsaacs 8896b3c5d2 Requests from #454 7 years ago
OzzieIsaacs 6f36eef51d Fix #544 (missed some config options)
Added lxml to stats sceen
7 years ago
OzzieIsaacs f0459d577b Bugfix #409 7 years ago
OzzieIsaacs 0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature #409 (linking read status from calibre)
7 years ago
OzzieIsaacs 694620790c #543
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
7 years ago
OzzieIsaacs 8d406117ce Fix #432 added more checks for deleting books 7 years ago
OzzieIsaacs eb65647774 Fix #539
Update Translations
7 years ago
OzzieIsaacs 31b703db62 Delete on gdrive working
Moving author on gdrive working
bugfix delete on normal folders
7 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
7 years ago
OzzieIsaacs 413b10c58e Bugfix gdrive
Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled
7 years ago
OzzieIsaacs 404b29b979 Refactored WSGIServer handling
Restart of gevent server now working
7 years ago
OzzieIsaacs a298470479 Fix #526. Books are now initially stored according to their id. 7 years ago
OzzieIsaacs 4f1754c1e4 Improved errorhandling during editing of books 7 years ago
OzzieIsaacs fbe2f5384b Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive 7 years ago
OzzieIsaacs 76d8cbdf57 Logging of details for gdrive integration only on debug level
fix generic cover path
browser reading for cbx and epub files no longer creates temp files on server
browser reading for cbx and epub files working (#502, #520)
7 years ago
OzzieIsaacs 420f685fd9 Added logging information for errors 7 years ago
OzzieIsaacs 30d9991daf Merge remote-tracking branch 'Goodread_fix/patch-test' 7 years ago
OzzieIsaacs 9ca454730c Bugfix finding settings.yaml and dgrive_credentials file 7 years ago
OzzieIsaacs 7d3fadb685 Improved compability for gevent (version 1.3.x & Windows)
Bugfix gdrive naming of client_secrets.json
Bugfix handling of gdrive with working folder not cps root folder
7 years ago
OzzieIsaacs c66bb54478 Fix #534 7 years ago
Ozzie Isaacs a06748e348
Update settings.yaml file 7 years ago
SiphonSquirrel 30799996c9 Merge remote-tracking branch 'remotes/origin/goodreads-fix' into patch-test 7 years ago
SiphonSquirrel 274d2d9d21 Improve rename logic for directory name collisions. 7 years ago
Ozzie Isaacs 7d5302b47f
Fix accidentially deleted gevent ds 7 years ago
OzzieIsaacs bf44774f22 Tags in detail view are sorted now 7 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
7 years ago
Charles 7142836622 Adding exception handling to GoodreadsClient if site is down 7 years ago
OzzieIsaacs 43a391d1bd Redownloaded glyphicon font files #515 7 years ago
Eric Le Lay 513355e2e5 fix #513 OPDS updated date format invalid per Atom specification
replace space separating date from time with 'T'
7 years ago
Ozzie Isaacs 9867959916
Changed calibre to calibre-web 7 years ago
OzzieIsaacs 1f9527f0e1 Fix #496 7 years ago
Andriy Zasypkin b2ba8bceb2
tags in detail view are sorted 7 years ago
OzzieIsaacs 66c1966b44 Update french translation 7 years ago
OzzieIsaacs c27805b4e7 Bugfix Updater python3
Bugfix Updater in case of error
7 years ago
OzzieIsaacs 7a20c14dea Integrated caliblur css 7 years ago
OzzieIsaacs 671bf5cf8d Integrated #454 (css is loaded remote) 7 years ago
OzzieIsaacs e24f837007 missing file from last commit 7 years ago
OzzieIsaacs 62f7674761 fixed #410 advanced search for publishing date
fixed misstyping in italian language
removed next to "me" after login
7 years ago
OzzieIsaacs 6a2449ffaf Fix for SSL/NonSSL and gevent 7 years ago
OzzieIsaacs 691a4a88e6 Added support for svg in comics (not working in IE11) 7 years ago
OzzieIsaacs 8bfd3c7e4f Fix #476 7 years ago
OzzieIsaacs 97adb36f1b Bugfix Upload Message
Improved errorhandling at import imagemagick
7 years ago
OzzieIsaacs af5a897d1d Added SSL Options (#416) 7 years ago
OzzieIsaacs d01d7b91a8 Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449 7 years ago
OzzieIsaacs f6ece5fe72 Fix for #448 7 years ago
OzzieIsaacs ea6a957c05 Changed mulitple books upload to single button 7 years ago
OzzieIsaacs ee5677f376 Merge remote-tracking branch 'multiload/master' 7 years ago
Mingyue Gao c6f568534f fix(template): download book with capital ext by kindle's browser 7 years ago
OzzieIsaacs f019d58b4d Fix for unicode search (#426) 7 years ago
Faisal Alghamdi 0afa7cbafd duplicate code removed 7 years ago
Faisal Alghamdi 78caf3379d remove unused code 7 years ago
Faisal Alghamdi 43eb3b6f9c button names fixed 7 years ago
Faisal Alghamdi ff9ee82451 adding multiple files upload feature 7 years ago
OzzieIsaacs ff2d53b998 Integrated japapanese translation.
Updated german translation
7 years ago
OzzieIsaacs 0b92a718ba Merge remote-tracking branch 'Translation/master' 7 years ago
SpaceWhite 51fbb07124 Add japanese translation 7 years ago
OzzieIsaacs 21c2ee4d63 Fix for #443 7 years ago
OzzieIsaacs 7371803184 Fix for #444 7 years ago
OzzieIsaacs 4346e947e3 Fix for #447 7 years ago
OzzieIsaacs 199b1c4820 Changed gdrive base uri handling (#431) 7 years ago
Andriy Zasypkin 6b4d7674b5
use isinstance instead of type 7 years ago
OzzieIsaacs e99e93db1f #424, #437 Added "apple-touch-icon" for apple devices 7 years ago
OzzieIsaacs 8716054dcf Fix #436 7 years ago
Andriy Zasypkin fb41aa8b57
removed debug statement from production 7 years ago
Andriy Zasypkin 28dac34119
auto select format if only one 7 years ago
OzzieIsaacs 2850a84bbc Fix for deleting books if book path contains no path (#432) 7 years ago
OzzieIsaacs 07d6ba094b Fix for deleting books in shelfs (#419) 7 years ago
OzzieIsaacs 0329306031 Favicon replaced (#424) with hiher resolution 7 years ago
Andriy Zasypkin e66068d699
should fix testing error 7 years ago
Andriy Zasypkin 6b6a457a9d
comic reader updated extentions 7 years ago
Andriy Zasypkin 9249390043
comic book read file order fixed 7 years ago
OzzieIsaacs 03e2a1e73b Restored click on progressbar 7 years ago
Yury Tilis 2fe03961bb -Added a more subtle progress bar which only shows the page number on hover
-Added Current page indicator to the thumbnail list, as well as a hover state
-Thumbnail list now scrolls to the current page on open or page change
-Added @andy29485's request for controlling page with space/shift+space
-Added the book title to the top of the page -Fixed IE11 failing on imagecallback
7 years ago
OzzieIsaacs 4c05b3db67 Present dates for updater in local date format 7 years ago
OzzieIsaacs 319077aea9 Import covers from comic files during upload 7 years ago
OzzieIsaacs 5809acfa9e anonymous user now have always the right to read books (as any other user, too)
(Fix  #287)
7 years ago
OzzieIsaacs b74a075aa6 Added posibility to change settings db via command line for multiple instances (#247) 7 years ago
OzzieIsaacs 152f7857c9 Fix #397 7 years ago
OzzieIsaacs 4e11272023 Working on IE11 7 years ago
OzzieIsaacs cbb236ba7b Added visiblilty of shelfs to opds catalog (#267) 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 f890fc1553 New progress bar 7 years ago
OzzieIsaacs b4aede78bc Fix for the piping problem (#395) 7 years ago
OzzieIsaacs 03ab03f06e Code cosmetics 7 years ago
OzzieIsaacs 0943d50876 Code cosmetics
Bugfix click on progressbar
7 years ago
OzzieIsaacs aae9e285a8 Code cosmetics 7 years ago
OzzieIsaacs d76f812310 Fixed empty return on getcomic
Python 3 compability (the easy way)
7 years ago
OzzieIsaacs e7b6963afd Small improvements for comic reader calls 7 years ago
Andriy Zasypkin 6ab4ff9a3b
Merge branch 'comic_server' into comic_server 7 years ago
OzzieIsaacs 5756785073 Error handling rarfiles 7 years ago
Andriy Zasypkin ec12181803
added python3 compatibility for comic reader 7 years ago
OzzieIsaacs 9f8cbe8c1f Merge enhanced UI from ytilis repro 7 years ago
OzzieIsaacs 8c573ff6d8 Unrar/tar and unzip on server side 7 years ago
OzzieIsaacs 6e714f3f16 Fix #391 7 years ago
OzzieIsaacs 211c3b16dd Fix fror #388 7 years ago
OzzieIsaacs f045c16c4e Fix #386 7 years ago
OzzieIsaacs 01d0083fe6 Fix for #376 7 years ago
OzzieIsaacs b8d45b664a Typeahead working again
Fix for replacing characters in filenames
7 years ago
OzzieIsaacs ad16194798 Error on deleting non existing book fixed (#382) 7 years ago
OzzieIsaacs 09f86ee8d4 Fix #385 7 years ago
OzzieIsaacs 8388df202f Merge remote-tracking branch 'dutch/dutchupdate' 7 years ago
OzzieIsaacs 798cbc7505 Merge remote-tracking branch 'opds/master' 7 years ago
OzzieIsaacs 78744b19d8 Fix #377 7 years ago
OzzieIsaacs ba54b9a357 Fix #365 7 years ago
OzzieIsaacs fd39cbaa6f Fix #363 7 years ago
Thijs van Ulden 5b13171060 Updated Dutch translation 7 years ago
OzzieIsaacs af8d908bba Fix #371, #372 7 years ago
OzzieIsaacs ae1e7c57d5 Update french translation 7 years ago
Yamakuni f5e1b38e63 French translation correction 7 years ago
unknown b4bd7507b6 Merge branch 'master' of git://github.com/janeczku/calibre-web 7 years ago
unknown 674baad49e lowercasing the input 7 years ago
unknown 4a04ec898e case-insensitive search for non-ASCII - improved 7 years ago
unknown d2ea3a6c19 case-insensitive search for non-ASCII 7 years ago
OzzieIsaacs 9182d89128 # Fix 361 7 years ago
Cory Sitko 5e4c8c6c65 fixed is_authenticated check 7 years ago
Cory Sitko 8fd67fb1fc UserBase methods should be properties not classmethods 7 years ago
Cory Sitko cc758517e7 updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin 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
OzzieIsaacs 1eb10be253 Code cosmetics comic reader 7 years ago
OzzieIsaacs 90729de87f Fix #354
Fix #355
Fix #353
Fix #352
Fix #351
7 years ago
unknown 6855deceef added corresponding content-type for a downloaded book, otherwise default text/html is used 7 years ago
unknown 0f0c6dde09 changed application/xml to application/atom+xml 7 years ago
unknown 1ada1704b0 excluded read/unread when exposing the catalog to an anonymous user 7 years ago
unknown 3c9f8b151d added check for anonymous session in read_books, otherwise current_user.id is not defined 7 years ago
unknown d336f9faa6 fixed OPDS templates 7 years ago
unknown 7ddfa1881b added FB2 mime type 7 years ago
unknown 70d093b193 unicode gave an NameError with python3 7 years ago
Jonathan Rehm 56c71dd4bf Disable bookmarking when anonymous users are reading 7 years ago
OzzieIsaacs 0512e5a940 Fix #342 7 years ago
OzzieIsaacs c56a02bab6 Fix #339 7 years ago
OzzieIsaacs 031a175474 Fix Comic reader 7 years ago
Andriy Zasypkin 442fb23b18
python3 compatibility 7 years ago
OzzieIsaacs 2302db4e06 Merge remote-tracking branch 'adv/fix-douban-rating' 7 years ago
OzzieIsaacs 299cf82921 Merge remote-tracking branch 'translation/master'
# Conflicts:
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
7 years ago
Yamakuni 85ec9cba1f New correction of translation 7 years ago
OzzieIsaacs a6dfcedfdb Code cosmetics 7 years ago
OzzieIsaacs 0405cec4ac Code cosmetics
Bugfix "Error load settings"
7 years ago
OzzieIsaacs 378a0ca662 Merge remote-tracking branch 'adv/bookmarks' 7 years ago
OzzieIsaacs 2a78a02e0b Code cosmetics 7 years ago
OzzieIsaacs 34e9ef35f5 Code cosmetics 7 years ago
OzzieIsaacs a159bb0b97 Code Csmetics kthoom integration 7 years ago
OzzieIsaacs 5b9b36f997 Code cosmetics 7 years ago
OzzieIsaacs 85068d75bf Update comic reader 7 years ago
OzzieIsaacs fe4d11fea8 Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63, #126) 7 years ago
OzzieIsaacs 4582aebec1 Bugfix gdriveutils 7 years ago
OzzieIsaacs b6b73d39c2 Fix #329
Code cosmetics
7 years ago
OzzieIsaacs b6f06658a2 Merge remote-tracking branch 'ipv6/ipv4only' 7 years ago
OzzieIsaacs dfd3b40865 Fix #325 7 years ago
OzzieIsaacs bde92113d4 Bugfix Datepicker 7 years ago
OzzieIsaacs f87800d11c Merge remote-tracking branch 'meta/upload_new_format_of_existing_book' 7 years ago
OzzieIsaacs 7acf4d40a4 Merge remote-tracking branch 'adv/escape-filename' 7 years ago
OzzieIsaacs 2ef6dc30bd Added italian translation 7 years ago
OzzieIsaacs abadaa3f1d Merge remote-tracking branch 'l/master' 7 years ago
OzzieIsaacs b30a73c505 Merge remote-tracking branch 'adv/def-variables' 7 years ago
OzzieIsaacs af0cefa4ac Update translations 7 years ago
OzzieIsaacs e26c8a1e46 Merge remote-tracking branch 'd/patch-1' 7 years ago
OzzieIsaacs 5e370fb4b3 Merge remote-tracking branch 'y/master' 7 years ago
Yamakuni f147c072c6 French translation
Add and correct
7 years ago
Wouter Dijk c048a96e07 Updated Dutch translations
I've added some missing translations and edit some faulty ones. Not finished yet, will continue later on! ;-)
7 years ago
Ainsley Pereira 993c56d021 Fix syntax error 7 years ago
Ainsley Pereira 1ce6893fa8 Exception isn't thrown until we call serve_forever, so that must be in the try block 7 years ago
Ainsley Pereira b8b88183c3 Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work 7 years ago
Ainsley Pereira a75c393922 Merge remote-tracking branch 'upstream/master' 7 years ago
Jonathan Rehm 29f21b148b Translate 10-based rating to 5-based 7 years ago
Jonathan Rehm e806494b54 Ensure variables exist before they're used 7 years ago
kyos 8937599ba7 Fixed codacy code control 7 years ago
kyos cbf2bb450d Fixed issue calculating filesize of the uploaded book 7 years ago
kyos be15f3781f Fixed issue reported by Jkrehm to prevent filesize to fail 7 years ago
kyos 3366aae6c7 Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book
# Conflicts:
#	cps/static/css/style.css
7 years ago
kyos e5b4bed01c Fixed codacy requirements 7 years ago
kyos 9086f4e0e7 Added option to upload a new format to a given book 7 years ago
Jonathan Rehm a4f81dd812 Do not include empty strings in list of bookmarks 7 years ago
OzzieIsaacs c9f36a4d1a Merge remote-tracking branch 'adv/bookmarks' 7 years ago
Torben Mohrfeldt 94f8cc247c Reflect title in the logo 7 years ago
OzzieIsaacs b6b5313f2d Fix for #315 7 years ago
teflontoni 4527693fe3 Move "Show mature content" Checkbox
In order to make the option safe and sane we move the corresponding checkbox to the settings that need administrator privileges.
7 years ago
Louis Jencka b3217496d1 Add progress bar to upload form 7 years ago
OzzieIsaacs 81219663fe Update translation 7 years ago
OzzieIsaacs c959a1ccc6 Merge remote-tracking branch 'iss/typo' 7 years ago
OzzieIsaacs f860694487 Merge remote-tracking branch 'adv/goodreads-more-by' 7 years ago
OzzieIsaacs 429f4a11a9 Merge remote-tracking branch 'adv/es5-syntax' 7 years ago
OzzieIsaacs 5ee1950828 Merge remote-tracking branch 'adv/sqlalchemy-bool' 7 years ago
Jonathan Rehm 58abc1d024 Fuzzy match book titles to eliminate duplicates
Titles with a Levenshtein ratio of 70% or greater are considered duplicates.
7 years ago
Jonathan Rehm 53c687251e Show "More by" on author page
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.

Requires the Goodreads dependency and API information.
7 years ago
Jonathan Rehm 6b8de017ab Use SQLAlchemy boolean
Seems to make a difference sometimes.

Ref #300
7 years ago
Jonathan Rehm 282837c7c5 Use ES5 syntax 7 years ago
Jonathan Rehm 8e1cfa1cbf Re-apply `db_filter`
Accidentally removed when the language and content filters were moved to `common_filters`.
7 years ago
Ivan Smirnov 12c98157d5 fix typo:: diffrent -> different 7 years ago
OzzieIsaacs a8b53ab38a Merge remote-tracking branch 'adv/common-filters' 7 years ago
OzzieIsaacs 62f6bb4e64 Remove In author marker on authors page 7 years ago
OzzieIsaacs d5e1dba0fe Merge remote-tracking branch 'adv/goodreads-more-by' 7 years ago
Jonathan Rehm 3213bf50b3 Move common filters into function
Instead of duplicating functionality across lots of functions, combine it into one common function. It makes reading and modifying it much easier.
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 a682c95ec1 Show "More by" on author page
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.

Requires the Goodreads dependency and API information.
7 years ago
OzzieIsaacs 193605df4a Fix for #286 7 years ago
OzzieIsaacs cf5e2f7cd1 search button is displayed in moon reader (#283), search result is not displayed 7 years ago
OzzieIsaacs f6425a6569 Merge remote-tracking branch 'adv/cache-buster' 7 years ago
Jonathan Rehm cda733f4a4 Escape special characters in file names
Follows Calibre's convention of using underscores as replacements
7 years ago
Jonathan Rehm 8cbd6a8431 Do not append query string if file_hash is not found 7 years ago
Jonathan Rehm 13c2a53c0f Fix issues with Windows path separators 7 years ago
OzzieIsaacs 6b1f3aa531 Merge remote-tracking branch 'adv/cache-buster' 7 years ago
marblepebble 97f573c41a Set ipv4 address explicitly for docker usage 7 years ago
OzzieIsaacs bd02c92162 Merge remote-tracking branch 'adv/get-meta-data' 7 years ago
OzzieIsaacs e3d416db4c Merge remote-tracking branch 'adv/cover-upload' 7 years ago
Jonathan Rehm 866f7944eb Meta data improvements
* Add buttons to show/hide results from Douban & Google
* Trigger search with "Enter" key
* Use Underscore.js template instead of build HTML strings in JavaScript
* Keep click event handler in JavaScript instead of using HTML's `onclick`
* Normalize Douban & Google results
* Update cover image & add cover URL to the form input
7 years ago
OzzieIsaacs a1538e12e8 Bugfix typeahead on advanced serach page 7 years ago
OzzieIsaacs de112b0b05 Merge remote-tracking branch 'adv/eslint' 7 years ago
Jonathan Rehm a27848b351 Add static asset cache busting
Calculates MD5 hash of static assets on server start. These are appended to the file name's when url_for is used, telling browsers to download the latest version of the files, e.g. style.css?q=81cf0ee.

Inspired by https://github.com/ChrisTM/Flask-CacheBust but uses query strings instead of rewriting the path because fonts inside CSS files break when the path is rewritten.
7 years ago
Jonathan Rehm 08d0404e9c Add mature_content property to Anonymous class 7 years ago
Jonathan Rehm 8171943b8e Update to ES5 standards
Also fix ESLint issues
7 years ago
OzzieIsaacs 91cdb5f60f Merge remote-tracking branch 'Upper_case/master' 7 years ago
OzzieIsaacs 2f7177742d Update chinese translation 7 years ago
OzzieIsaacs dd6c928e2c Merge remote-tracking branch 'translation/master' 7 years ago
OzzieIsaacs fb8ce693f3 Bugfix mature content
Update german translation
7 years ago
OzzieIsaacs b596734c36 Merge remote-tracking branch 'adv/mature-content' 7 years ago
idalin 274d0f6577 update Chinese translations 7 years ago
idalin 2b27d6570f Merge branch 'janeczku-master' 7 years ago
idalin b5cca553b3 update Chinese translations 7 years ago
kyos 9a17a09cc7 Fixed codacy requirements 7 years ago
Ruben Herold 68e3867af3 fix books with uppercase extension 7 years ago
kyos aa4a5dc3ef Added option to upload a new format to a given book 7 years ago
Jonathan Rehm 6f797ba478 Check if JPEG via response content-type header instead of URL extension
That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.
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
Carlos Clavero 8f5bc2a484 Merge pull request #9 from Kyosfonica/add_css_separation_for_tags_in_advance_search
Added a 5px separation for all input labels in advanced search
8 years ago
kyos e948844ea4 Added a 5px separation for all input labels in advanced search to improve readability 8 years ago
Carlos Clavero 1500e0f54f Merge pull request #8 from Kyosfonica/add_css_separation_for_tags_in_advance_search
Added a 5px separation for all input labels in advanced search
8 years ago
kyos b6f097f673 Added a 5px separation for all input labels in advanced search to improve readability 8 years ago
Carlos Clavero 5f78ec4e83 Merge pull request #7 from Kyosfonica/add_css_separation_for_tags_in_advance_search
Added a 5px separation for all input labels in advanced search
8 years ago
kyos 6048bf3c79 Added a 5px separation for all input labels in advanced search to improve readability 8 years ago
Carlos Clavero 80c021939e Merge pull request #6 from Kyosfonica/master
Update dev with latests changes from master
8 years ago
kyos 51bc0e82a4 Added series and series_index metadata handler 8 years ago
kyos 4bba3558b7 Added tags metadata handler for epubs 8 years ago
OzzieIsaacs fe52de6b4b Merge remote-tracking branch 'adv/lighthouse-audit' 8 years ago
OzzieIsaacs cd2e27d7ad Merge remote-tracking branch 'adv/previous-pagination' 8 years ago
OzzieIsaacs 82165a67a1 Merge remote-tracking branch 'mail/master' 8 years ago
OzzieIsaacs 626e2e393e Merge remote-tracking branch 'adv/edit-publish-date' 8 years ago
Mikhail Akushsky 4313910ba0 Fix hmac creation in send_test_email function 8 years ago
Jonathan Rehm ec118c2254 Move scripts to bottom of body to prevent execution from delaying DOM rendering 8 years ago
Jonathan Rehm dde4f6afe2 Add missing label 8 years ago
Jonathan Rehm 0b47958fad Add lang attribute to html tag 8 years ago
Jonathan Rehm c86fa268c2 Fix/remove duplicate id's 8 years ago
Jonathan Rehm 5162e2eed7 Add img alt attributes 8 years ago
Jonathan Rehm 5465b8e8b7 Add "Previous" pagination button
I imagine these buttons are still in use when JavaScript is disabled or not loading.
8 years ago
Jonathan Rehm 0afc8f94da Use TinyMCE's API to update the description's content 8 years ago
Jonathan Rehm dd124ab356 Make change requested by Codacy 8 years ago
Jonathan Rehm 59afc7eb9f Make changes requested by Codacy 8 years ago
Jonathan Rehm 3258f4fb79 Make changes requested by Codacy 8 years ago
Jonathan Rehm 61e0405f75 Move TinyMCE into edit_books.js 8 years ago
Jonathan Rehm 5715d27c97 Show localized date over top of date input
Also move datepicker logic into edit_books.js and edit_books.js below the datepicker file declaration(s)
8 years ago
Jonathan Rehm 36c2b35588 Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in 8 years ago
Jonathan Rehm cc916a4eb4 Add timestamp to default publishing date 8 years ago
Jonathan Rehm a07798b0db Standardize indentation 8 years ago
Jonathan Rehm 04b04e200f Add ability to edit publish date
If a date is not set, default to “0101-01-01”
8 years ago
Jonathan Rehm cf7196ae5e Refactor to remove nested if-statements 8 years ago
Jonathan Rehm a95e6aab6b Do not attempt to create the YAML file when Google Drive is disabled (#246) 8 years ago
OzzieIsaacs cb5f196f4b Merge remote-tracking branch 'adv/modal-details'
# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html
8 years ago
OzzieIsaacs 1e2edcf753 Merge remote-tracking branch 'adv/author-info' 8 years ago
OzzieIsaacs df1b503c2d Update Translation 8 years ago
OzzieIsaacs c403fdfa2e Merge remote-tracking branch 'adv/sorting' 8 years ago
OzzieIsaacs 97d577ef2e Merge remote-tracking branch 'adv/add-to-shelf-ajax' 8 years ago
OzzieIsaacs 4311091d7d Merge remote-tracking branch 'adv/python3-fix' 8 years ago
Jonathan Rehm 693c26c2b3 Attach events to button toolbar
Since this is closer to the elements, we can be more sure that we won't have events fire when we don't want them to. For example, if we're viewing the page in a modal, we don't want the event handler living longer than the content itself.
8 years ago
Jonathan Rehm d85e0b96dc Prevent jQuery from cache busting static assets
If the HTML that's returned from the `$.get` request contains a `<script src="..."/>` tag it loads the JavaScript file via ajax, and by default it attaches a timestamp to it to bust cache. That means the file loads every time the modal is opened, and the browser treats it as a new file each time. The result is that code fires multiple times and events listeners are added multiple times.
8 years ago
Jonathan Rehm e1a88aa0ab Make change requested by Codacy 8 years ago
Jonathan Rehm 5c3a5b6c39 Use ajax to add/remove books from shelves
Gracefully fall back to standard requests if JavaScript is disabled
8 years ago
Ozzie Isaacs 2e8a268dfa Fix #241 No1 8 years ago
OzzieIsaacs 6a9d8efc93 Fixes for #233 (detection of permission errors) 8 years ago
Jonathan Rehm 85ce06850c Fix for Python 3 8 years ago
Jonathan Rehm 91ba0f0362 Resolve issues with unicode characters in author's name
I've been unable to reproduce the issue on macOS with Python 2.7/3.6 and Fedora with Python 2.7, but if it happens for others, then it's worth the change.
8 years ago
Jonathan Rehm 51bd2f89df Use dot notation 8 years ago
Jonathan Rehm c9c6529567 Use SECRET_KEY from environment variable (#232) 8 years ago
OzzieIsaacs 5985342b79 Bugfix for typeahead in search function and on edit books page 8 years ago
OzzieIsaacs a8aa1e7623 Merge remote-tracking branch 'button_padding/limit-typeahead-requests' 8 years ago
OzzieIsaacs cfa69ff4f2 Merge remote-tracking branch 'button_padding/smtp-from' 8 years ago
Jonathan Rehm 9683d50f36 Send mail from the FROM address instead of the login
When SMTP is configured to use a service that doesn't use an email address to log in – e.g. AWS SES or Postmark – the sendmail request fails saying the FROM address is invalid.
8 years ago
Ozzie Isaacs f79fb420ba Removed whitespaces 8 years ago
Jonathan Rehm 802eb628c8 Split event listener and selector string
Event and selectors appear to have been accidentally combined. The result is that typing in any input triggers a call to the `/get_matching_tags` route. We can probably limit the selector farther to only fire when `#tags` is typed into.
8 years ago
Jonathan Rehm 66231c8737 Associate label with correct input (#228) 8 years ago
Ozzie Isaacs 92f634b6a6 Bugfix link admin section 8 years ago
OzzieIsaacs 74e93e1cdf Code cosmetics 8 years ago
OzzieIsaacs 1fdb7dc497 Epub Viewer Bugfix Retenia Ipad devices 8 years ago
OzzieIsaacs 16ce7799a2 Improvement of margins in epub reader (fix #210) 8 years ago
OzzieIsaacs 470aea6106 Fix #214
Update epub.js lib
8 years ago
OzzieIsaacs 979bcdffd4 Bugfix non working download links
Bugfix missing divider in detail page
8 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
8 years ago
OzzieIsaacs 31e0025099 Update Translation 8 years ago
OzzieIsaacs 5a6ad970d8 Merge remote-tracking branch 'button_padding/magic-link' 8 years ago
Jonathan Rehm d799b859ea Make changes suggested by codacy 8 years ago
Jonathan Rehm 649579eccd Move jquery.form to layout.html
This prevents it from getting loaded each time the details are viewed in a modal dialog.
8 years ago
Jonathan Rehm 675e8dd5cd Show book details in modal dialog
With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place.
8 years ago
OzzieIsaacs 93dfb96174 Added Translation of title for read/unread books 8 years ago
OzzieIsaacs f446e29276 Updater now uses correct "gid" instead of "uid" for change ownership of files (Fix for #213 ) -> update should now working if user id differs from groupid 8 years ago
OzzieIsaacs 2929d95b26 Display all authors names in shelf, like on all other pages (#202) 8 years ago
OzzieIsaacs aed626b91b Merge remote-tracking branch 'button_padding/read-unread-counts' 8 years ago
OzzieIsaacs 254e1f5262 Merge remote-tracking branch 'button_padding/simplify-read-code'
# Conflicts:
#	cps/static/css/style.css
8 years ago
OzzieIsaacs 15531324ea Add translation of rich text editor 8 years ago
OzzieIsaacs 77c4da0f07 Merge remote-tracking branch 'button_padding/tinymce' 8 years ago
OzzieIsaacs 4f08608d75 Move download button to top of detail page (#174) 8 years ago
OzzieIsaacs b876a03f26 - Changed link color on download button to white
- removed file icons on download button
- removed shadow style on download button
8 years ago
OzzieIsaacs 6b71e77436 Merge remote-tracking branch 'Download/feature/download-icon-20170410' 8 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.
8 years ago
Jonathan Rehm b138c9edd5 Show read/unread counts 8 years ago
Jonathan Rehm 7631eea32e Add sort options when viewing books
Default view still shows the most recently added books, but adds ability to sort by newest/oldest books and books sorted alphabetically (ascending & descending).

I did not include translations for the next text, but they are split up for easy translating and are otherwise ready for translating.
8 years ago
OzzieIsaacs 5276bda153 Merge remote-tracking branch 'button_padding/pad-buttons' 8 years ago
Jonathan Rehm 4fe1536b7e Simplify the read functionality's code
* Use block label to toggle the checkbox
* Submit form when checkbox's value changes (regardless of whether mouse is used or not)
* Remove unused code
8 years ago
Jonathan Rehm d25300a7fb Add padding to bottom of buttons on shelf page
This adds some space between the buttons when viewing them on a mobile device.
8 years ago
OzzieIsaacs 752b813119 Added copyright for language names translations 8 years ago
OzzieIsaacs 0e8d5f158c Dutch translation included (#207) 8 years ago
Jonathan Rehm 7853cb2602 Add TinyMCE to provide rich-text editing for descriptions 8 years ago
OzzieIsaacs 4ea9df753e For failed logins the source ip-adress is logged now ( #201) 8 years ago
OzzieIsaacs e6c6c26fd1 No error 500 if kindlegen is not excecutable 8 years ago
OzzieIsaacs 0a08a07193 Fixed Deleting user 8 years ago
OzzieIsaacs 7ab8a5877b read PDF/TXT without temporary files (#197) 8 years ago
OzzieIsaacs 1366b36c32 Added integer-field to supported custom colums 8 years ago
nanu-c 3acf80c42b remove debuggingtool 8 years ago
nanu-c 26f314d371 support int custom fields 8 years ago
OzzieIsaacs 5f4d839895 Better output messages for failed kindlegen conversions (fix #191) 8 years ago
OzzieIsaacs 38fa9ce206 At deleting a book, the book is also deleted from all Shelfs, Download list and read list (#192) 8 years ago
OzzieIsaacs 2b50dea304 Updated pdf.js to 1.7.225 (Fix #193) 8 years ago
OzzieIsaacs a73372d71a Make kindlegen work again 8 years ago
OzzieIsaacs 6d597f96e5 Integrate Iso639 language name translations to russian translation 8 years ago
Pavel Korovin a305b65299 Added Russian translation 8 years ago
Murat L b6fccbd486 Added Google Books and Kobo links (#189)
* Added Google Books and Kobo links

* International link to google
8 years ago
Ozzie Isaacs 4259aa69df Get rid of shel=true again 8 years ago
Ozzie Isaacs 2d918bfb72 Fix for invalid db path 8 years ago
林檎 95f22aa4b5 add drop shadow to distinct the fixed area 8 years ago
林檎 f6076bc337 media tweak for better download placement 8 years ago
林檎 720c07b9ee remove empty style 8 years ago
林檎 45eeb6588a Change Download Style. 8 years ago
Ozzie Isaacs b8fa748c49 Fix #187 on linux 8 years ago
Ozzie Isaacs 651961ac5e Fix #187 8 years ago
Matt Hazinski 6f7a240ce2 Ensure file paths in uploads are non-empty, fix #183 (#184)
* Ensure file paths in uploads are non-empty, fix #183

* Fix AttributeError in process(), handle strings of spaces
8 years ago
Ozzie Isaacs ede8ae6742 Fix #182, #176 8 years ago
OzzieIsaacs c80e517c28 Delete books prepared for deleting on doogle drive 8 years ago
OzzieIsaacs 195e581aef Missing file for deletion of books 8 years ago
OzzieIsaacs 7667da6e12 Books now really deleted from hard disk (#119) 8 years ago
OzzieIsaacs 2b8c29c535 Further fix delete books (#119) 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 daaee5b67e remove unused variables 8 years ago
林檎 b51afe3ead Code Fix
Fix pagination logic.

_ is gettext , use __ as dummy variable instead of _

Need more test.

Test on following
http://localhost:8083/opds/new
http://localhost:8083/opds/new?offset=60
http://localhost:8083/opds/new?offset=120
8 years ago
OzzieIsaacs 7a07edaff4 Update polish translation 8 years ago
Radosław Kierznowski 3c3720aa0f Update polish translation (POT: 2017-04-11 22:51) 8 years ago
Radosław Kierznowski ccf563023b Merge remote-tracking branch 'refs/remotes/janeczku/master' 8 years ago
林檎 622b1435f1 Fix #172 8 years ago
OzzieIsaacs fb43110f1c Merge remote-tracking branch 'spanish_translation/master' 8 years ago
OzzieIsaacs 699bd036e8 Code cosmetics 8 years ago
Gonzalo Cao Cabeza de Vaca 286196fa1d Updated spanish translations 8 years ago
OzzieIsaacs dc45b53b24 code cosmetics 8 years ago
OzzieIsaacs 8c7a8a954a Code cosmetics 8 years ago
OzzieIsaacs d59be5faf4 Code cosmetics
Bugfix upload
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 79d5bab4ba Code cosmetics 8 years ago
OzzieIsaacs 5044b78b08 Code cosmetics 8 years ago
OzzieIsaacs 00462237fe Merge remote-tracking branch 'chinese_translation/master' 8 years ago
OzzieIsaacs 986f40b80a Code cosmetics 8 years ago
OzzieIsaacs 78067b87bc Code cosmetics 8 years ago
OzzieIsaacs 395c6679b7 Fix #163 8 years ago
林檎 ebb3acecca Fix Download Bug. 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
idalin 4d8b43bd54 update Simplified Chinese translation 8 years ago
Radosław Kierznowski 55ee323ca1 Merge remote-tracking branch 'refs/remotes/janeczku/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
8 years ago
OzzieIsaacs cbc807f3ff Fix #138 8 years ago
OzzieIsaacs 60f3fefaec Added Read/Unread to feed
Prevent books from getting multiple times added to shelf
Updated German Translation
8 years ago
OzzieIsaacs 33427d7610 Bugfix opds feed for lists 8 years ago
OzzieIsaacs 0e0e72fb71 Fixes for gevent/gdrive 8 years ago
Radosław Kierznowski 9c5fe444e6 POT: 2017-03-12 19:10 8 years ago
Jack Darlington 3916205a95 Gdrive optional 8 years ago
Jack Darlington b352bbfd14 Fix for gevent as optional 8 years ago
Jack Darlington 06a4af44cc Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
8 years ago
OzzieIsaacs a87fab8774 - Smaller cover picturees on small devices
- filename for download with underscore
8 years ago
Jack Darlington ff89d9c20d Merge branch 'master' into develop 8 years ago
Kennyl 59bf568f7e Merge branch 'master' into fix/python3-patch-20170308 8 years ago
Jack Darlington 29462e2278 Fix for updater 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 b081bc8672 Fix #157 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
Jack Darlington 2ffa847803 Merge branch 'master' into develop 8 years ago
Jack Darlington dad251d02c Fix for revoking already expired channel (drive) 8 years ago
Radosław Kierznowski 89fa9eb02f Update polish translation
Calibre Web - polski (POT: 2017-03-11 09:09)
8 years ago
OzzieIsaacs dbf07cb593 Updated translations 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
林檎 d7d29827f4 fix behind 8 years ago
林檎 7bae79d826 fix conflict 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
Jack Darlington e3a2bd348c Merge branch 'develop' into personal 8 years ago
Jack Darlington 6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 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 a752e62963 Fix Import problem on python2 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 80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
8 years ago
OzzieIsaacs 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
OzzieIsaacs 72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 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
林檎 53cc84ec18 #fix 148 8 years ago
Kennyl 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
idalin bdf28e1475 fix bug for metadata searching result. 8 years ago