2
0
mirror of https://github.com/janeczku/calibre-web synced 2024-10-31 15:20:28 +00:00
Commit Graph

878 Commits

Author SHA1 Message Date
Ainsley Pereira
993c56d021 Fix syntax error 2017-09-12 21:11:52 +01:00
Ainsley Pereira
1ce6893fa8 Exception isn't thrown until we call serve_forever, so that must be in the try block 2017-09-12 21:06:58 +01:00
Ainsley Pereira
b8b88183c3 Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work 2017-09-12 20:49:38 +01:00
Ainsley Pereira
a75c393922 Merge remote-tracking branch 'upstream/master' 2017-09-12 20:34:11 +01:00
Jonathan Rehm
29f21b148b Translate 10-based rating to 5-based 2017-09-11 09:58:39 -07:00
Jonathan Rehm
e806494b54 Ensure variables exist before they're used 2017-09-11 09:24:20 -07:00
kyos
8937599ba7 Fixed codacy code control 2017-09-11 17:18:11 +02:00
kyos
cbf2bb450d Fixed issue calculating filesize of the uploaded book 2017-09-11 11:47:39 +02:00
kyos
be15f3781f Fixed issue reported by Jkrehm to prevent filesize to fail 2017-09-11 11:17:29 +02:00
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
2017-09-11 10:48:57 +02:00
kyos
e5b4bed01c Fixed codacy requirements 2017-09-11 10:48:30 +02:00
kyos
9086f4e0e7 Added option to upload a new format to a given book 2017-09-11 10:48:30 +02:00
Jonathan Rehm
a4f81dd812 Do not include empty strings in list of bookmarks 2017-09-10 15:38:24 -07:00
OzzieIsaacs
c9f36a4d1a Merge remote-tracking branch 'adv/bookmarks' 2017-09-10 15:00:27 +02:00
Torben Mohrfeldt
94f8cc247c Reflect title in the logo 2017-09-09 23:59:06 +02:00
OzzieIsaacs
b6b5313f2d Fix for #315 2017-09-09 14:23:25 +02:00
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.
2017-09-08 15:47:22 +02:00
Louis Jencka
b3217496d1 Add progress bar to upload form 2017-09-02 11:51:11 -06:00
OzzieIsaacs
81219663fe Update translation 2017-09-01 20:39:56 +02:00
OzzieIsaacs
c959a1ccc6 Merge remote-tracking branch 'iss/typo' 2017-09-01 20:31:01 +02:00
OzzieIsaacs
f860694487 Merge remote-tracking branch 'adv/goodreads-more-by' 2017-09-01 20:29:45 +02:00
OzzieIsaacs
429f4a11a9 Merge remote-tracking branch 'adv/es5-syntax' 2017-09-01 20:12:22 +02:00
OzzieIsaacs
5ee1950828 Merge remote-tracking branch 'adv/sqlalchemy-bool' 2017-09-01 20:11:48 +02:00
Jonathan Rehm
58abc1d024 Fuzzy match book titles to eliminate duplicates
Titles with a Levenshtein ratio of 70% or greater are considered duplicates.
2017-08-29 07:15:33 -07:00
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.
2017-08-29 07:15:33 -07:00
Jonathan Rehm
6b8de017ab Use SQLAlchemy boolean
Seems to make a difference sometimes.

Ref #300
2017-08-29 07:14:57 -07:00
Jonathan Rehm
282837c7c5 Use ES5 syntax 2017-08-29 07:14:32 -07:00
Jonathan Rehm
8e1cfa1cbf Re-apply db_filter
Accidentally removed when the language and content filters were moved to `common_filters`.
2017-08-29 07:13:31 -07:00
Ivan Smirnov
12c98157d5 fix typo:: diffrent -> different 2017-08-27 19:31:58 -07:00
OzzieIsaacs
a8b53ab38a Merge remote-tracking branch 'adv/common-filters' 2017-08-27 09:36:02 +02:00
OzzieIsaacs
517f8d138e Changed readme 2017-08-27 09:32:34 +02:00
OzzieIsaacs
76e0da851a Merge remote-tracking branch 'adv/remove-vendor' 2017-08-27 09:29:07 +02:00
OzzieIsaacs
62f6bb4e64 Remove In author marker on authors page 2017-08-27 09:27:55 +02:00
OzzieIsaacs
d5e1dba0fe Merge remote-tracking branch 'adv/goodreads-more-by' 2017-08-27 09:24:02 +02:00
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.
2017-08-26 08:12:16 -07:00
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.
2017-08-23 08:55:40 -07:00
Jonathan Rehm
b494b6b62a Remove vendor directory from git
Directory will automatically get created when it's used as pip's target.
2017-08-21 09:23:49 -07:00
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.
2017-08-21 08:56:08 -07:00
OzzieIsaacs
193605df4a Fix for #286 2017-08-20 07:47:47 +02:00
OzzieIsaacs
cf5e2f7cd1 search button is displayed in moon reader (#283), search result is not displayed 2017-08-20 07:10:53 +02:00
OzzieIsaacs
f6425a6569 Merge remote-tracking branch 'adv/cache-buster' 2017-08-19 23:10:12 +02:00
Jonathan Rehm
cda733f4a4 Escape special characters in file names
Follows Calibre's convention of using underscores as replacements
2017-08-19 11:56:29 -07:00
Jonathan Rehm
8cbd6a8431 Do not append query string if file_hash is not found 2017-08-19 09:09:12 -07:00
Jonathan Rehm
13c2a53c0f Fix issues with Windows path separators 2017-08-19 08:32:00 -07:00
OzzieIsaacs
6b1f3aa531 Merge remote-tracking branch 'adv/cache-buster' 2017-08-19 08:36:12 +02:00
marblepebble
97f573c41a Set ipv4 address explicitly for docker usage 2017-08-18 21:53:52 +01:00
marblepebble
15895f4055 Specify ip4 address to bind to 2017-08-18 21:38:32 +01:00
OzzieIsaacs
bd02c92162 Merge remote-tracking branch 'adv/get-meta-data' 2017-08-17 15:32:14 +02:00
OzzieIsaacs
e3d416db4c Merge remote-tracking branch 'adv/cover-upload' 2017-08-17 15:27:32 +02:00
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
2017-08-15 22:11:01 -07:00