Commit Graph

766 Commits (72fff2a297f5bc555db4a1559f44c6b21d6d65f6)

Author SHA1 Message Date
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
7 years ago
kyos e948844ea4 Added a 5px separation for all input labels in advanced search to improve readability 7 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
7 years ago
kyos b6f097f673 Added a 5px separation for all input labels in advanced search to improve readability 7 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
7 years ago
kyos 6048bf3c79 Added a 5px separation for all input labels in advanced search to improve readability 7 years ago
Carlos Clavero 80c021939e Merge pull request #6 from Kyosfonica/master
Update dev with latests changes from master
7 years ago
kyos 51bc0e82a4 Added series and series_index metadata handler 7 years ago
kyos 4bba3558b7 Added tags metadata handler for epubs 7 years ago
OzzieIsaacs fe52de6b4b Merge remote-tracking branch 'adv/lighthouse-audit' 7 years ago
OzzieIsaacs cd2e27d7ad Merge remote-tracking branch 'adv/previous-pagination' 7 years ago
OzzieIsaacs 82165a67a1 Merge remote-tracking branch 'mail/master' 7 years ago
OzzieIsaacs 626e2e393e Merge remote-tracking branch 'adv/edit-publish-date' 7 years ago
Mikhail Akushsky 4313910ba0 Fix hmac creation in send_test_email function 7 years ago
Jonathan Rehm ec118c2254 Move scripts to bottom of body to prevent execution from delaying DOM rendering 7 years ago
Jonathan Rehm dde4f6afe2 Add missing label 7 years ago
Jonathan Rehm 0b47958fad Add lang attribute to html tag 7 years ago
Jonathan Rehm c86fa268c2 Fix/remove duplicate id's 7 years ago
Jonathan Rehm 5162e2eed7 Add img alt attributes 7 years ago
Jonathan Rehm 5465b8e8b7 Add "Previous" pagination button
I imagine these buttons are still in use when JavaScript is disabled or not loading.
7 years ago
Jonathan Rehm 0afc8f94da Use TinyMCE's API to update the description's content 7 years ago
Jonathan Rehm dd124ab356 Make change requested by Codacy 7 years ago
Jonathan Rehm 59afc7eb9f Make changes requested by Codacy 7 years ago
Jonathan Rehm 3258f4fb79 Make changes requested by Codacy 7 years ago
Jonathan Rehm 61e0405f75 Move TinyMCE into edit_books.js 7 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)
7 years ago
Jonathan Rehm 36c2b35588 Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in 7 years ago
Jonathan Rehm cc916a4eb4 Add timestamp to default publishing date 7 years ago
Jonathan Rehm a07798b0db Standardize indentation 7 years ago
Jonathan Rehm 04b04e200f Add ability to edit publish date
If a date is not set, default to “0101-01-01”
7 years ago
Jonathan Rehm cf7196ae5e Refactor to remove nested if-statements 7 years ago
Jonathan Rehm a95e6aab6b Do not attempt to create the YAML file when Google Drive is disabled (#246) 7 years ago
OzzieIsaacs cb5f196f4b Merge remote-tracking branch 'adv/modal-details'
# Conflicts:
#	cps/static/js/main.js
#	cps/templates/detail.html
7 years ago
OzzieIsaacs 1e2edcf753 Merge remote-tracking branch 'adv/author-info' 7 years ago
OzzieIsaacs df1b503c2d Update Translation 7 years ago
OzzieIsaacs c403fdfa2e Merge remote-tracking branch 'adv/sorting' 7 years ago
OzzieIsaacs 97d577ef2e Merge remote-tracking branch 'adv/add-to-shelf-ajax' 7 years ago
OzzieIsaacs 4311091d7d Merge remote-tracking branch 'adv/python3-fix' 7 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.
7 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.
7 years ago
Jonathan Rehm e1a88aa0ab Make change requested by Codacy 7 years ago
Jonathan Rehm 5c3a5b6c39 Use ajax to add/remove books from shelves
Gracefully fall back to standard requests if JavaScript is disabled
7 years ago
Ozzie Isaacs 2e8a268dfa Fix #241 No1 7 years ago
OzzieIsaacs 6a9d8efc93 Fixes for #233 (detection of permission errors) 7 years ago
Jonathan Rehm 85ce06850c Fix for Python 3 7 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.
7 years ago
Jonathan Rehm 51bd2f89df Use dot notation 7 years ago
Jonathan Rehm c9c6529567 Use SECRET_KEY from environment variable (#232) 7 years ago
OzzieIsaacs 5985342b79 Bugfix for typeahead in search function and on edit books page 7 years ago
OzzieIsaacs a8aa1e7623 Merge remote-tracking branch 'button_padding/limit-typeahead-requests' 7 years ago
OzzieIsaacs cfa69ff4f2 Merge remote-tracking branch 'button_padding/smtp-from' 7 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.
7 years ago
Ozzie Isaacs f79fb420ba Removed whitespaces 7 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.
7 years ago
Jonathan Rehm 66231c8737 Associate label with correct input (#228) 7 years ago
Ozzie Isaacs 92f634b6a6 Bugfix link admin section 7 years ago
OzzieIsaacs 74e93e1cdf Code cosmetics 7 years ago
OzzieIsaacs 1fdb7dc497 Epub Viewer Bugfix Retenia Ipad devices 7 years ago
OzzieIsaacs 16ce7799a2 Improvement of margins in epub reader (fix #210) 7 years ago
OzzieIsaacs 470aea6106 Fix #214
Update epub.js lib
7 years ago
OzzieIsaacs 979bcdffd4 Bugfix non working download links
Bugfix missing divider in detail page
7 years ago
Jonathan Rehm fe68c8a7f8 Add support for displaying author information from Goodreads
Requires the "goodread" module (added to optional-requirements.txt) and an API key

Retrieves Goodreads author information and displays their photo and "about" text
7 years ago
OzzieIsaacs 31e0025099 Update Translation 7 years ago
OzzieIsaacs 5a6ad970d8 Merge remote-tracking branch 'button_padding/magic-link' 7 years ago
Jonathan Rehm d799b859ea Make changes suggested by codacy 7 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.
7 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.
7 years ago
OzzieIsaacs 93dfb96174 Added Translation of title for read/unread books 7 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 7 years ago
OzzieIsaacs 2929d95b26 Display all authors names in shelf, like on all other pages (#202) 7 years ago
OzzieIsaacs aed626b91b Merge remote-tracking branch 'button_padding/read-unread-counts' 7 years ago
OzzieIsaacs 254e1f5262 Merge remote-tracking branch 'button_padding/simplify-read-code'
# Conflicts:
#	cps/static/css/style.css
7 years ago
OzzieIsaacs 15531324ea Add translation of rich text editor 7 years ago
OzzieIsaacs 77c4da0f07 Merge remote-tracking branch 'button_padding/tinymce' 7 years ago
OzzieIsaacs 4f08608d75 Move download button to top of detail page (#174) 7 years ago
OzzieIsaacs b876a03f26 - Changed link color on download button to white
- removed file icons on download button
- removed shadow style on download button
7 years ago
OzzieIsaacs 6b71e77436 Merge remote-tracking branch 'Download/feature/download-icon-20170410' 7 years ago
Jonathan Rehm 623f5c8ef0 Add "magic link" functionality
When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device.

Configuration was added and is disabled by default.
7 years ago
Jonathan Rehm b138c9edd5 Show read/unread counts 7 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.
7 years ago
OzzieIsaacs 5276bda153 Merge remote-tracking branch 'button_padding/pad-buttons' 7 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
7 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.
7 years ago
OzzieIsaacs 752b813119 Added copyright for language names translations 7 years ago
OzzieIsaacs 0e8d5f158c Dutch translation included (#207) 7 years ago
Jonathan Rehm 7853cb2602 Add TinyMCE to provide rich-text editing for descriptions 7 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
idalin a6b2977286 add i18n message for getmeta feature. 8 years ago
idalin f8e4bed8bf Merge branch 'janeczku-master' 8 years ago
Jack Darlington a1cb349fda Merge branch 'develop' into personal 8 years ago
Jack Darlington e4a27be1a9 Made stream download for normal download as well as odds 8 years ago
Jack Darlington e3e26d418d Finished code to chunk successfully. 8 years ago
Jack Darlington 10b129cb07 add timestamps 8 years ago
Jack Darlington 76e8117b0c initial version 8 years ago
Jack Darlington 3ba76526ee Merge branch 'master' into feature/ignorable_columns 8 years ago
Jack Darlington 475daaec75 Merge branch 'develop' into personal 8 years ago
Jack Darlington fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
8 years ago
OzzieIsaacs 789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 8 years ago
OzzieIsaacs e0c35b7420 Merge remote-tracking branch 'polish_translation/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
8 years ago
OzzieIsaacs 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