OzzieIsaacs
9f8cbe8c1f
Merge enhanced UI from ytilis repro
2017-11-19 13:20:59 +01:00
OzzieIsaacs
8c573ff6d8
Unrar/tar and unzip on server side
2017-11-18 10:34:21 +01:00
OzzieIsaacs
6e714f3f16
Fix #391
2017-11-17 18:29:29 +01:00
OzzieIsaacs
211c3b16dd
Fix fror #388
2017-11-15 07:40:17 +01:00
OzzieIsaacs
f045c16c4e
Fix #386
2017-11-13 21:33:36 +01:00
OzzieIsaacs
01d0083fe6
Fix for #376
2017-11-12 19:08:20 +01:00
OzzieIsaacs
b8d45b664a
Typeahead working again
...
Fix for replacing characters in filenames
2017-11-12 18:48:44 +01:00
OzzieIsaacs
ad16194798
Error on deleting non existing book fixed ( #382 )
2017-11-12 18:08:13 +01:00
OzzieIsaacs
09f86ee8d4
Fix #385
2017-11-12 14:56:49 +01:00
OzzieIsaacs
8388df202f
Merge remote-tracking branch 'dutch/dutchupdate'
2017-11-12 14:52:31 +01:00
OzzieIsaacs
798cbc7505
Merge remote-tracking branch 'opds/master'
2017-11-12 14:46:19 +01:00
OzzieIsaacs
78744b19d8
Fix #377
2017-11-12 14:10:08 +01:00
OzzieIsaacs
ba54b9a357
Fix #365
2017-11-12 14:06:33 +01:00
OzzieIsaacs
fd39cbaa6f
Fix #363
2017-11-12 13:40:56 +01:00
Thijs van Ulden
5b13171060
Updated Dutch translation
2017-11-05 10:24:35 +01:00
OzzieIsaacs
af8d908bba
Fix #371 , #372
2017-11-01 16:55:51 +01:00
OzzieIsaacs
ae1e7c57d5
Update french translation
2017-11-01 16:10:05 +01:00
Yamakuni
f5e1b38e63
French translation correction
2017-10-26 22:44:16 +02:00
unknown
b4bd7507b6
Merge branch 'master' of git://github.com/janeczku/calibre-web
2017-10-22 14:41:23 +02:00
unknown
674baad49e
lowercasing the input
2017-10-21 22:07:39 +02:00
unknown
4a04ec898e
case-insensitive search for non-ASCII - improved
2017-10-21 21:50:47 +02:00
unknown
d2ea3a6c19
case-insensitive search for non-ASCII
2017-10-20 23:23:16 +02:00
OzzieIsaacs
9182d89128
# Fix 361
2017-10-13 19:31:03 +02:00
Cory Sitko
5e4c8c6c65
fixed is_authenticated check
2017-10-10 20:48:50 -04:00
Cory Sitko
8fd67fb1fc
UserBase methods should be properties not classmethods
2017-10-10 18:14:19 -04:00
Cory Sitko
cc758517e7
updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin
2017-10-10 14:13:28 -04:00
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
2017-10-10 10:18:28 -04:00
OzzieIsaacs
366bf9739b
Fix for #360 and guest accounts
2017-10-09 22:36:47 +02:00
OzzieIsaacs
1eb10be253
Code cosmetics comic reader
2017-10-08 10:41:43 +02:00
OzzieIsaacs
90729de87f
Fix #354
...
Fix #355
Fix #353
Fix #352
Fix #351
2017-10-06 08:51:34 +02:00
unknown
6855deceef
added corresponding content-type for a downloaded book, otherwise default text/html is used
2017-10-01 20:48:01 +02:00
unknown
0f0c6dde09
changed application/xml to application/atom+xml
2017-10-01 20:24:24 +02:00
unknown
1ada1704b0
excluded read/unread when exposing the catalog to an anonymous user
2017-10-01 18:42:35 +02:00
unknown
3c9f8b151d
added check for anonymous session in read_books, otherwise current_user.id is not defined
2017-10-01 18:41:19 +02:00
unknown
d336f9faa6
fixed OPDS templates
2017-10-01 17:16:57 +02:00
unknown
7ddfa1881b
added FB2 mime type
2017-10-01 17:15:44 +02:00
unknown
70d093b193
unicode gave an NameError with python3
2017-10-01 17:14:20 +02:00
Jonathan Rehm
56c71dd4bf
Disable bookmarking when anonymous users are reading
2017-09-30 10:51:20 -07:00
OzzieIsaacs
0512e5a940
Fix #342
2017-09-30 16:25:29 +02:00
OzzieIsaacs
c56a02bab6
Fix #339
2017-09-30 15:24:18 +02:00
OzzieIsaacs
031a175474
Fix Comic reader
2017-09-24 19:38:15 +02:00
Andriy Zasypkin
442fb23b18
python3 compatibility
2017-09-24 07:52:59 -04:00
OzzieIsaacs
2302db4e06
Merge remote-tracking branch 'adv/fix-douban-rating'
2017-09-22 20:57:24 +02:00
OzzieIsaacs
299cf82921
Merge remote-tracking branch 'translation/master'
...
# Conflicts:
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
2017-09-22 20:56:36 +02:00
Yamakuni
85ec9cba1f
New correction of translation
2017-09-21 12:34:06 +02:00
OzzieIsaacs
a6dfcedfdb
Code cosmetics
2017-09-20 21:13:32 +02:00
OzzieIsaacs
0405cec4ac
Code cosmetics
...
Bugfix "Error load settings"
2017-09-18 18:59:08 +02:00
OzzieIsaacs
378a0ca662
Merge remote-tracking branch 'adv/bookmarks'
2017-09-17 20:26:58 +02:00
OzzieIsaacs
2a78a02e0b
Code cosmetics
2017-09-17 19:16:29 +02:00
OzzieIsaacs
34e9ef35f5
Code cosmetics
2017-09-17 15:33:22 +02:00
OzzieIsaacs
a159bb0b97
Code Csmetics kthoom integration
2017-09-17 15:06:01 +02:00
OzzieIsaacs
5b9b36f997
Code cosmetics
2017-09-17 14:51:17 +02:00
OzzieIsaacs
85068d75bf
Update comic reader
2017-09-17 13:37:21 +02:00
OzzieIsaacs
fe4d11fea8
Basi comic reader implementation for cbr, cbz, cbt files based on kthoom ( #63 , #126 )
2017-09-17 12:36:32 +02:00
OzzieIsaacs
4582aebec1
Bugfix gdriveutils
2017-09-17 10:54:23 +02:00
OzzieIsaacs
b6b73d39c2
Fix #329
...
Code cosmetics
2017-09-17 07:15:08 +02:00
OzzieIsaacs
b6f06658a2
Merge remote-tracking branch 'ipv6/ipv4only'
2017-09-16 20:18:34 +02:00
OzzieIsaacs
dfd3b40865
Fix #325
2017-09-16 19:57:00 +02:00
OzzieIsaacs
bde92113d4
Bugfix Datepicker
2017-09-16 19:30:49 +02:00
OzzieIsaacs
f87800d11c
Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'
2017-09-16 18:55:34 +02:00
OzzieIsaacs
7acf4d40a4
Merge remote-tracking branch 'adv/escape-filename'
2017-09-16 18:53:33 +02:00
OzzieIsaacs
2ef6dc30bd
Added italian translation
2017-09-16 16:58:42 +02:00
OzzieIsaacs
abadaa3f1d
Merge remote-tracking branch 'l/master'
2017-09-16 08:06:35 +02:00
OzzieIsaacs
b30a73c505
Merge remote-tracking branch 'adv/def-variables'
2017-09-16 07:55:44 +02:00
OzzieIsaacs
af0cefa4ac
Update translations
2017-09-16 07:52:53 +02:00
OzzieIsaacs
e26c8a1e46
Merge remote-tracking branch 'd/patch-1'
2017-09-16 07:40:29 +02:00
OzzieIsaacs
5e370fb4b3
Merge remote-tracking branch 'y/master'
2017-09-16 07:38:50 +02:00
Yamakuni
f147c072c6
French translation
...
Add and correct
2017-09-14 12:03:36 +02:00
Wouter Dijk
c048a96e07
Updated Dutch translations
...
I've added some missing translations and edit some faulty ones. Not finished yet, will continue later on! ;-)
2017-09-14 10:36:39 +02:00
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
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
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
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
OzzieIsaacs
a1538e12e8
Bugfix typeahead on advanced serach page
2017-08-14 20:30:23 +02:00
OzzieIsaacs
de112b0b05
Merge remote-tracking branch 'adv/eslint'
2017-08-14 20:21:52 +02:00
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.
2017-08-13 09:32:29 -07:00
Jonathan Rehm
08d0404e9c
Add mature_content property to Anonymous class
2017-08-13 07:05:45 -07:00
Jonathan Rehm
8171943b8e
Update to ES5 standards
...
Also fix ESLint issues
2017-08-12 22:46:27 -07:00
OzzieIsaacs
91cdb5f60f
Merge remote-tracking branch 'Upper_case/master'
2017-08-12 19:02:57 +02:00
OzzieIsaacs
2f7177742d
Update chinese translation
2017-08-12 18:59:57 +02:00
OzzieIsaacs
dd6c928e2c
Merge remote-tracking branch 'translation/master'
2017-08-12 18:55:08 +02:00
OzzieIsaacs
fb8ce693f3
Bugfix mature content
...
Update german translation
2017-08-12 18:52:56 +02:00
OzzieIsaacs
b596734c36
Merge remote-tracking branch 'adv/mature-content'
2017-08-12 18:16:45 +02:00
idalin
274d0f6577
update Chinese translations
2017-08-11 09:32:01 +08:00
idalin
2b27d6570f
Merge branch 'janeczku-master'
2017-08-11 09:26:36 +08:00
idalin
b5cca553b3
update Chinese translations
2017-08-11 09:25:39 +08:00
kyos
9a17a09cc7
Fixed codacy requirements
2017-08-10 12:34:54 +02:00
Ruben Herold
68e3867af3
fix books with uppercase extension
2017-08-10 12:29:08 +02:00
kyos
aa4a5dc3ef
Added option to upload a new format to a given book
2017-08-09 19:56:46 +02:00
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.
2017-08-09 10:03:02 -07:00
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
2017-08-08 10:38:28 -07:00
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
2017-08-01 17:53:07 +02:00
kyos
e948844ea4
Added a 5px separation for all input labels in advanced search to improve readability
2017-08-01 17:51:38 +02:00
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
2017-08-01 17:50:24 +02:00
kyos
b6f097f673
Added a 5px separation for all input labels in advanced search to improve readability
2017-08-01 17:49:14 +02:00
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
2017-08-01 17:46:13 +02:00
kyos
6048bf3c79
Added a 5px separation for all input labels in advanced search to improve readability
2017-07-31 20:01:55 +02:00
Carlos Clavero
80c021939e
Merge pull request #6 from Kyosfonica/master
...
Update dev with latests changes from master
2017-07-31 18:17:59 +02:00
kyos
51bc0e82a4
Added series and series_index metadata handler
2017-07-31 09:00:09 +02:00
kyos
4bba3558b7
Added tags metadata handler for epubs
2017-07-31 08:46:29 +02:00
OzzieIsaacs
fe52de6b4b
Merge remote-tracking branch 'adv/lighthouse-audit'
2017-07-30 06:59:12 +02:00
OzzieIsaacs
cd2e27d7ad
Merge remote-tracking branch 'adv/previous-pagination'
2017-07-30 06:51:05 +02:00
OzzieIsaacs
82165a67a1
Merge remote-tracking branch 'mail/master'
2017-07-30 06:44:10 +02:00
OzzieIsaacs
626e2e393e
Merge remote-tracking branch 'adv/edit-publish-date'
2017-07-30 06:37:18 +02:00
Mikhail Akushsky
4313910ba0
Fix hmac creation in send_test_email function
2017-07-29 18:06:16 +03:00
Jonathan Rehm
ec118c2254
Move scripts to bottom of body to prevent execution from delaying DOM rendering
2017-07-28 20:07:10 -07:00
Jonathan Rehm
dde4f6afe2
Add missing label
2017-07-28 20:03:43 -07:00
Jonathan Rehm
0b47958fad
Add lang attribute to html tag
2017-07-28 20:03:23 -07:00
Jonathan Rehm
c86fa268c2
Fix/remove duplicate id's
2017-07-28 20:02:53 -07:00
Jonathan Rehm
5162e2eed7
Add img alt attributes
2017-07-28 20:01:31 -07:00
Jonathan Rehm
5465b8e8b7
Add "Previous" pagination button
...
I imagine these buttons are still in use when JavaScript is disabled or not loading.
2017-07-28 07:38:35 -07:00
Jonathan Rehm
0afc8f94da
Use TinyMCE's API to update the description's content
2017-07-25 13:16:12 -07:00
Jonathan Rehm
dd124ab356
Make change requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
59afc7eb9f
Make changes requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
3258f4fb79
Make changes requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
61e0405f75
Move TinyMCE into edit_books.js
2017-07-23 13:36:21 -07:00
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)
2017-07-23 13:36:21 -07:00
Jonathan Rehm
36c2b35588
Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in
2017-07-23 13:35:35 -07:00
Jonathan Rehm
cc916a4eb4
Add timestamp to default publishing date
2017-07-23 13:35:35 -07:00
Jonathan Rehm
a07798b0db
Standardize indentation
2017-07-23 13:35:35 -07:00
Jonathan Rehm
04b04e200f
Add ability to edit publish date
...
If a date is not set, default to “0101-01-01”
2017-07-23 13:35:35 -07:00
Jonathan Rehm
cf7196ae5e
Refactor to remove nested if-statements
2017-07-23 13:35:35 -07:00
Jonathan Rehm
a95e6aab6b
Do not attempt to create the YAML file when Google Drive is disabled ( #246 )
2017-07-23 22:26:43 +02:00
OzzieIsaacs
cb5f196f4b
Merge remote-tracking branch 'adv/modal-details'
...
# Conflicts:
# cps/static/js/main.js
# cps/templates/detail.html
2017-07-23 14:03:02 +02:00
OzzieIsaacs
1e2edcf753
Merge remote-tracking branch 'adv/author-info'
2017-07-23 13:36:50 +02:00
OzzieIsaacs
df1b503c2d
Update Translation
2017-07-23 13:25:54 +02:00
OzzieIsaacs
c403fdfa2e
Merge remote-tracking branch 'adv/sorting'
2017-07-23 13:18:24 +02:00
OzzieIsaacs
97d577ef2e
Merge remote-tracking branch 'adv/add-to-shelf-ajax'
2017-07-23 13:16:20 +02:00
OzzieIsaacs
4311091d7d
Merge remote-tracking branch 'adv/python3-fix'
2017-07-23 13:11:37 +02:00
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.
2017-07-22 11:24:47 -07:00
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.
2017-07-22 11:11:14 -07:00
Jonathan Rehm
e1a88aa0ab
Make change requested by Codacy
2017-07-22 07:34:38 -07:00
Jonathan Rehm
5c3a5b6c39
Use ajax to add/remove books from shelves
...
Gracefully fall back to standard requests if JavaScript is disabled
2017-07-21 21:15:03 -07:00
Ozzie Isaacs
2e8a268dfa
Fix #241 No1
2017-07-18 20:39:35 +02:00
OzzieIsaacs
6a9d8efc93
Fixes for #233 (detection of permission errors)
2017-07-16 22:04:40 +02:00
Jonathan Rehm
85ce06850c
Fix for Python 3
2017-07-13 21:28:00 -07:00
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.
2017-07-13 21:22:34 -07:00
Jonathan Rehm
51bd2f89df
Use dot notation
2017-07-13 18:09:33 -07:00
Jonathan Rehm
c9c6529567
Use SECRET_KEY from environment variable ( #232 )
2017-07-11 18:35:55 +02:00
OzzieIsaacs
5985342b79
Bugfix for typeahead in search function and on edit books page
2017-07-11 18:08:12 +02:00
OzzieIsaacs
a8aa1e7623
Merge remote-tracking branch 'button_padding/limit-typeahead-requests'
2017-07-11 17:48:33 +02:00
OzzieIsaacs
cfa69ff4f2
Merge remote-tracking branch 'button_padding/smtp-from'
2017-07-11 17:38:52 +02:00
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.
2017-07-11 07:16:19 -07:00
Ozzie Isaacs
f79fb420ba
Removed whitespaces
2017-07-11 16:13:33 +02:00
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.
2017-07-10 13:03:58 -07:00
Jonathan Rehm
66231c8737
Associate label with correct input ( #228 )
2017-07-10 19:26:57 +02:00
Ozzie Isaacs
92f634b6a6
Bugfix link admin section
2017-07-10 12:04:15 +02:00
OzzieIsaacs
74e93e1cdf
Code cosmetics
2017-07-09 20:15:15 +02:00
OzzieIsaacs
1fdb7dc497
Epub Viewer Bugfix Retenia Ipad devices
2017-07-09 16:28:22 +02:00
OzzieIsaacs
16ce7799a2
Improvement of margins in epub reader ( fix #210 )
2017-07-09 15:49:47 +02:00
OzzieIsaacs
470aea6106
Fix #214
...
Update epub.js lib
2017-07-09 13:27:56 +02:00
OzzieIsaacs
979bcdffd4
Bugfix non working download links
...
Bugfix missing divider in detail page
2017-07-09 12:41:09 +02:00
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
2017-07-08 16:07:45 -07:00
OzzieIsaacs
31e0025099
Update Translation
2017-07-08 19:50:44 +02:00
OzzieIsaacs
5a6ad970d8
Merge remote-tracking branch 'button_padding/magic-link'
2017-07-08 19:26:08 +02:00
Jonathan Rehm
d799b859ea
Make changes suggested by codacy
2017-07-08 09:15:40 -07:00
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.
2017-07-08 09:15:40 -07:00
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.
2017-07-08 09:15:40 -07:00
OzzieIsaacs
93dfb96174
Added Translation of title for read/unread books
2017-07-08 16:47:07 +02:00
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
2017-07-08 14:57:39 +02:00
OzzieIsaacs
2929d95b26
Display all authors names in shelf, like on all other pages ( #202 )
2017-07-08 13:50:21 +02:00
OzzieIsaacs
aed626b91b
Merge remote-tracking branch 'button_padding/read-unread-counts'
2017-07-08 11:26:07 +02:00
OzzieIsaacs
254e1f5262
Merge remote-tracking branch 'button_padding/simplify-read-code'
...
# Conflicts:
# cps/static/css/style.css
2017-07-08 11:25:20 +02:00
OzzieIsaacs
15531324ea
Add translation of rich text editor
2017-07-08 11:19:36 +02:00
OzzieIsaacs
77c4da0f07
Merge remote-tracking branch 'button_padding/tinymce'
2017-07-08 11:03:21 +02:00
OzzieIsaacs
4f08608d75
Move download button to top of detail page ( #174 )
2017-07-08 11:01:40 +02:00
OzzieIsaacs
b876a03f26
- Changed link color on download button to white
...
- removed file icons on download button
- removed shadow style on download button
2017-07-08 10:57:40 +02:00
OzzieIsaacs
6b71e77436
Merge remote-tracking branch 'Download/feature/download-icon-20170410'
2017-07-08 09:35:09 +02:00
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.
2017-07-07 18:29:16 -07:00
Jonathan Rehm
b138c9edd5
Show read/unread counts
2017-07-06 22:33:57 -07:00
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.
2017-07-06 21:14:45 -07:00
OzzieIsaacs
5276bda153
Merge remote-tracking branch 'button_padding/pad-buttons'
2017-07-06 20:31:25 +02:00
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
2017-07-06 10:33:47 -07:00
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.
2017-07-06 07:44:28 -07:00
OzzieIsaacs
752b813119
Added copyright for language names translations
2017-06-24 13:08:57 +02:00
OzzieIsaacs
0e8d5f158c
Dutch translation included ( #207 )
2017-06-24 13:04:09 +02:00
Jonathan Rehm
7853cb2602
Add TinyMCE to provide rich-text editing for descriptions
2017-06-22 08:59:28 -07:00
OzzieIsaacs
4ea9df753e
For failed logins the source ip-adress is logged now ( #201 )
2017-06-07 18:08:15 +02:00
OzzieIsaacs
e6c6c26fd1
No error 500 if kindlegen is not excecutable
2017-05-25 09:30:20 +02:00
OzzieIsaacs
0a08a07193
Fixed Deleting user
2017-05-25 09:09:35 +02:00
OzzieIsaacs
7ab8a5877b
read PDF/TXT without temporary files ( #197 )
2017-05-25 08:46:33 +02:00
OzzieIsaacs
1366b36c32
Added integer-field to supported custom colums
2017-05-25 08:20:19 +02:00
nanu-c
3acf80c42b
remove debuggingtool
2017-05-22 23:06:55 +02:00
nanu-c
26f314d371
support int custom fields
2017-05-22 22:54:53 +02:00
OzzieIsaacs
5f4d839895
Better output messages for failed kindlegen conversions ( fix #191 )
2017-05-19 21:30:39 +02:00
OzzieIsaacs
38fa9ce206
At deleting a book, the book is also deleted from all Shelfs, Download list and read list ( #192 )
2017-05-19 20:36:58 +02:00
OzzieIsaacs
2b50dea304
Updated pdf.js to 1.7.225 (Fix #193 )
2017-05-13 14:01:52 +02:00
OzzieIsaacs
a73372d71a
Make kindlegen work again
2017-05-05 21:05:52 +02:00
OzzieIsaacs
6d597f96e5
Integrate Iso639 language name translations to russian translation
2017-05-01 16:24:20 +02:00
Pavel Korovin
a305b65299
Added Russian translation
2017-04-30 22:54:16 +03:00
Murat L
b6fccbd486
Added Google Books and Kobo links ( #189 )
...
* Added Google Books and Kobo links
* International link to google
2017-04-27 14:32:30 +01:00
Ozzie Isaacs
4259aa69df
Get rid of shel=true again
2017-04-26 19:39:45 +01:00
Ozzie Isaacs
2d918bfb72
Fix for invalid db path
2017-04-26 19:21:40 +01:00
林檎
95f22aa4b5
add drop shadow to distinct the fixed area
2017-04-26 17:14:18 +08:00
林檎
f6076bc337
media tweak for better download placement
2017-04-26 17:14:18 +08:00
林檎
720c07b9ee
remove empty style
2017-04-26 17:14:18 +08:00
林檎
45eeb6588a
Change Download Style.
2017-04-26 17:14:18 +08:00
Ozzie Isaacs
b8fa748c49
Fix #187 on linux
2017-04-25 22:04:08 +01:00
Ozzie Isaacs
651961ac5e
Fix #187
2017-04-25 20:07:54 +01:00
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
2017-04-23 07:22:10 +01:00
Ozzie Isaacs
ede8ae6742
Fix #182 , #176
2017-04-21 20:44:17 +02:00
OzzieIsaacs
c80e517c28
Delete books prepared for deleting on doogle drive
2017-04-15 18:24:48 +02:00
OzzieIsaacs
195e581aef
Missing file for deletion of books
2017-04-15 18:18:33 +02:00
OzzieIsaacs
7667da6e12
Books now really deleted from hard disk ( #119 )
2017-04-15 18:18:08 +02:00
OzzieIsaacs
2b8c29c535
Further fix delete books ( #119 )
2017-04-15 18:07:53 +02:00
OzzieIsaacs
9c679c8908
Delete books should now work ( #119 )
2017-04-15 11:35:05 +02:00
OzzieIsaacs
cd0d450829
Allow deleting books ( fixes #119 )
2017-04-14 20:29:11 +02:00
OzzieIsaacs
daaee5b67e
remove unused variables
2017-04-14 19:16:39 +02:00
林檎
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
2017-04-14 21:57:27 +08:00
OzzieIsaacs
7a07edaff4
Update polish translation
2017-04-14 09:42:15 +02:00
Radosław Kierznowski
3c3720aa0f
Update polish translation (POT: 2017-04-11 22:51)
2017-04-12 14:27:57 +02:00
Radosław Kierznowski
ccf563023b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
2017-04-12 14:00:30 +02:00
林檎
622b1435f1
Fix #172
2017-04-06 22:50:05 +08:00
OzzieIsaacs
fb43110f1c
Merge remote-tracking branch 'spanish_translation/master'
2017-04-04 19:07:20 +02:00
OzzieIsaacs
699bd036e8
Code cosmetics
2017-04-04 19:05:09 +02:00
Gonzalo Cao Cabeza de Vaca
286196fa1d
Updated spanish translations
2017-04-04 15:10:54 +02:00
OzzieIsaacs
dc45b53b24
code cosmetics
2017-04-03 21:05:28 +02:00
OzzieIsaacs
8c7a8a954a
Code cosmetics
2017-04-03 20:05:55 +02:00
OzzieIsaacs
d59be5faf4
Code cosmetics
...
Bugfix upload
2017-04-03 19:57:45 +02:00
OzzieIsaacs
ab534b21c1
Code cosmetics
2017-04-02 10:42:33 +02:00
OzzieIsaacs
7dd70db837
Code cosmetics
2017-04-02 10:27:37 +02:00
OzzieIsaacs
7c6d527a55
Code cosmetics
2017-04-02 10:05:07 +02:00
OzzieIsaacs
66181daf6d
Merge remote-tracking branch 'custom-dbpath'
2017-04-02 08:45:47 +02:00
OzzieIsaacs
79d5bab4ba
Code cosmetics
2017-03-31 18:41:05 +02:00
OzzieIsaacs
5044b78b08
Code cosmetics
2017-03-31 18:31:16 +02:00
OzzieIsaacs
00462237fe
Merge remote-tracking branch 'chinese_translation/master'
2017-03-31 16:52:25 +02:00
OzzieIsaacs
986f40b80a
Code cosmetics
2017-03-30 21:17:18 +02:00
OzzieIsaacs
78067b87bc
Code cosmetics
2017-03-29 21:43:55 +02:00
OzzieIsaacs
395c6679b7
Fix #163
2017-03-29 20:59:37 +02:00
林檎
ebb3acecca
Fix Download Bug.
2017-03-29 12:59:20 +08:00
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)
2017-03-25 13:05:44 -07:00
idalin
4d8b43bd54
update Simplified Chinese translation
2017-03-21 10:16:40 +08:00
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
2017-03-20 22:01:25 +01:00
OzzieIsaacs
cbc807f3ff
Fix #138
2017-03-19 20:29:35 +01:00
OzzieIsaacs
60f3fefaec
Added Read/Unread to feed
...
Prevent books from getting multiple times added to shelf
Updated German Translation
2017-03-19 19:22:45 +01:00
OzzieIsaacs
33427d7610
Bugfix opds feed for lists
2017-03-19 17:32:49 +01:00
OzzieIsaacs
0e0e72fb71
Fixes for gevent/gdrive
2017-03-19 17:14:16 +01:00
Radosław Kierznowski
9c5fe444e6
POT: 2017-03-12 19:10
2017-03-19 16:35:37 +01:00
Jack Darlington
3916205a95
Gdrive optional
2017-03-16 23:36:37 +00:00
Jack Darlington
b352bbfd14
Fix for gevent as optional
2017-03-16 21:02:49 +00:00
Jack Darlington
06a4af44cc
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
2017-03-16 21:02:11 +00:00
OzzieIsaacs
a87fab8774
- Smaller cover picturees on small devices
...
- filename for download with underscore
2017-03-14 19:48:17 +01:00
Jack Darlington
ff89d9c20d
Merge branch 'master' into develop
2017-03-13 14:56:51 +00:00
Kennyl
59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
2017-03-13 15:52:08 +08:00
Jack Darlington
29462e2278
Fix for updater
2017-03-13 00:44:20 +00:00
Jack Darlington
7d31abf920
added jquery.form.js to project locally
2017-03-12 21:20:09 +00:00
Jack Darlington
537977e497
Changed “have read” to checkbox
2017-03-12 21:13:14 +00:00
Jack Darlington
8f2088a3ea
Updated use google drive checkbox
2017-03-12 21:03:01 +00:00
Jack Darlington
5a2e77baaf
fix for form input ID
2017-03-12 20:52:56 +00:00
OzzieIsaacs
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
2017-03-12 21:13:25 +01:00
OzzieIsaacs
b081bc8672
Fix #157
2017-03-12 20:01:20 +01:00
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
2017-03-12 19:12:17 +01:00
Jack Darlington
2ffa847803
Merge branch 'master' into develop
2017-03-12 12:37:38 +00:00
Jack Darlington
dad251d02c
Fix for revoking already expired channel (drive)
2017-03-12 00:24:53 +00:00
Radosław Kierznowski
89fa9eb02f
Update polish translation
...
Calibre Web - polski (POT: 2017-03-11 09:09)
2017-03-11 15:35:38 +01:00
OzzieIsaacs
dbf07cb593
Updated translations
2017-03-11 09:11:19 +01:00
林檎
2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
2017-03-09 12:38:55 +08:00
林檎
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
2017-03-09 12:32:10 +08:00
林檎
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
2017-03-09 12:19:46 +08:00
林檎
d7d29827f4
fix behind
2017-03-08 23:59:56 +08:00
林檎
7bae79d826
fix conflict
2017-03-08 23:56:20 +08:00
林檎
a7d361a0ff
merge conflict
2017-03-08 23:52:41 +08:00
林檎
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
2017-03-08 23:50:14 +08:00
林檎
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
2017-03-08 13:56:13 +08:00
林檎
d7afbdc349
use quote instead of urllib.quote
2017-03-08 13:26:52 +08:00
林檎
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
2017-03-08 11:48:12 +08:00
Jack Darlington
e3a2bd348c
Merge branch 'develop' into personal
2017-03-08 00:30:00 +00:00
Jack Darlington
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
2017-03-08 00:26:15 +00:00
Jack Darlington
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
2017-03-07 22:05:56 +00:00
Jack Darlington
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs
a752e62963
Fix Import problem on python2
2017-03-07 21:08:28 +01:00
OzzieIsaacs
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
2017-03-07 20:36:43 +01:00
OzzieIsaacs
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
2017-03-07 20:30:55 +01:00
OzzieIsaacs
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
2017-03-07 20:22:28 +01:00
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
2017-03-07 19:46:23 +01:00
OzzieIsaacs
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
2017-03-07 19:15:40 +01:00
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)
2017-03-07 19:10:17 +01:00
林檎
53cc84ec18
#fix 148
2017-03-07 16:32:55 +08:00
Kennyl
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
2017-03-07 14:06:29 +08:00
林檎
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
2017-03-07 13:33:27 +08:00
idalin
bdf28e1475
fix bug for metadata searching result.
2017-03-07 09:49:59 +08:00
idalin
a6b2977286
add i18n message for getmeta feature.
2017-03-07 09:46:09 +08:00
idalin
f8e4bed8bf
Merge branch 'janeczku-master'
2017-03-07 09:01:56 +08:00
Jack Darlington
a1cb349fda
Merge branch 'develop' into personal
2017-03-06 23:18:29 +00:00
Jack Darlington
e4a27be1a9
Made stream download for normal download as well as odds
2017-03-06 23:17:57 +00:00
Jack Darlington
e3e26d418d
Finished code to chunk successfully.
2017-03-06 22:50:24 +00:00
Jack Darlington
10b129cb07
add timestamps
2017-03-06 21:05:21 +00:00
Jack Darlington
76e8117b0c
initial version
2017-03-06 20:58:15 +00:00
Jack Darlington
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
2017-03-06 19:24:24 +00:00
Jack Darlington
475daaec75
Merge branch 'develop' into personal
2017-03-06 19:23:36 +00:00
Jack Darlington
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
2017-03-06 19:17:00 +00:00
OzzieIsaacs
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
2017-03-06 19:25:49 +01:00
OzzieIsaacs
e0c35b7420
Merge remote-tracking branch 'polish_translation/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-03-06 19:21:17 +01:00
OzzieIsaacs
26438f97ab
Bugfix Filename without unidecode dependency
2017-03-06 19:19:14 +01:00
林檎
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
2017-03-06 20:06:00 +08:00
林檎
297a08cd5f
xrange fix
...
range to xrange
2017-03-06 19:47:58 +08:00
林檎
dc985e76df
python3 fix
2017-03-06 18:23:33 +08:00
林檎
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
2017-03-06 18:22:02 +08:00
林檎
0c9eacb024
fix opds
2017-03-06 16:35:00 +08:00
林檎
376eb8752e
wrong conflict merge
2017-03-06 14:46:44 +08:00
林檎
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
2017-03-06 14:27:18 +08:00
林檎
4dfa157161
use condition rather than try/catch
2017-03-06 13:42:00 +08:00
林檎
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
2017-03-06 11:53:17 +08:00
林檎
0bc4f52783
Fix except clause
...
except: will catch specific error.
2017-03-06 11:44:54 +08:00
林檎
80bcf131ee
add requirement.txt
2017-03-05 22:53:59 +08:00
林檎
1da3b57f5a
no need future module for python2
...
fix missing StringIO
2017-03-05 19:23:49 +08:00
林檎
bf8688fee1
missing urllib migration
2017-03-05 18:48:59 +08:00
林檎
da8d0c2a9f
Merge branch 'fix/syntax-python3-20170305' into travis
2017-03-05 18:19:38 +08:00
林檎
c3fd205b7d
fix /stat
2017-03-05 18:18:22 +08:00
林檎
b70191ca2a
Least change to adapt with python3
...
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1 (0 is meaningless)
add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)
refer to
http://python-future.org/compatible_idioms.html
2017-03-05 17:40:39 +08:00
林檎
2c32696417
Merge branch 'fix/slugify-filename-20170305' into travis
2017-03-05 15:36:07 +08:00
林檎
35b9e423ec
Merge branch 'fix/attachment-patch-20170305' into travis
2017-03-05 15:35:57 +08:00
林檎
9ca88840eb
“-“ is removed at helper ,
...
so use “_” instead
2017-03-05 15:30:35 +08:00
Radosław Kierznowski
cbc47c754e
Update polish translation
...
I fixed some of the phrases more understandable.
2017-03-04 21:41:54 +01:00
林檎
e845bdbd56
Fix attachment filename
...
File attachment should be url encode rather than utf-8 format
2017-03-05 00:28:37 +08:00
林檎
a850e64bfb
Refactor cover detection
...
obsolate hardcode %cover_id%= ‘cover’ in <pkg:item name=%cover_id% href=%coverfile%>
now %cover_id% retrieve from <meta name=“cover” content=%cover_id%>
2017-03-04 15:48:59 +08:00
林檎
29f21480ab
Reuse original code logic.
...
iteration loop dc:* add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
2017-03-04 15:37:30 +08:00
Jack Darlington
c702b14340
Fixes for READ/UNREAD
2017-03-03 21:38:54 +00:00
Jack Darlington
27cbab6cb7
Fixes for READ/UNREAD
2017-03-03 21:09:53 +00:00
OzzieIsaacs
8c7ba2ccdf
Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
...
# Conflicts:
# cps/epub.py
2017-03-03 19:48:02 +01:00
林檎
1a10859a57
When upload pub, add description to comment accord opf file
2017-03-03 12:50:06 +08:00
Jack Darlington
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
2017-03-03 00:03:46 +00:00
Jack Darlington
b6da3c3153
Fix for read/unread for anonymous users
2017-03-02 23:56:07 +00:00
Jack Darlington
fb6a37eec3
Update for covers download via opds + inserts permissions if needed (only available with a link)
2017-03-02 23:55:32 +00:00
Kennyl
19f939a46c
Update epub.py
...
initialize covefile to None first
2017-03-03 00:27:54 +08:00
林檎
d5e525305d
Lower case text, some epub have uppercased which is beyond iso639 standard.
2017-03-02 23:20:37 +08:00
林檎
13b4ae4c24
more error adaptive
2017-03-02 23:15:15 +08:00
林檎
879510da82
Upload support detection of language
2017-03-02 22:57:02 +08:00
林檎
4afb486986
add languages field for BookMeta
2017-03-02 19:59:35 +08:00
Jack Darlington
df9124f78b
Fix OPDS download
2017-03-02 09:14:46 +00:00
Jack
b8137d2c70
Fixing error with uploading new book / metadata as file was being backed up
2017-03-02 00:28:30 +00:00
Jack Darlington
8e85d1b5bd
Merge branch 'develop' into personal
2017-03-01 22:40:28 +00:00
Jack Darlington
78abf81b2f
Fix for editing metadata and uploading for GDrive
2017-03-01 22:38:03 +00:00
OzzieIsaacs
896dc04648
Merge remote-tracking branch 'gitignore/cover-patch-20170301'
2017-03-01 18:10:14 +01:00
林檎
583380e71a
path join bug
...
, instead of + because get_main_dir is not endswith os.sep
2017-03-01 17:20:58 +08:00
林檎
9a2877ebd5
situation when opf file content is
...
<meta name="cover" content="cover.jpg"/>
2017-03-01 14:36:31 +08:00
林檎
7972b987d4
Read img tag of cover file if cover is (x)html
...
for example
‘<item id="cover" href="Text/cover.xhtml" media-type="application/xhtml+xml”/>’
2017-03-01 13:18:14 +08:00
Jack Darlington
8745d65ff6
Merging ignorable columns
2017-02-28 23:53:32 +00:00
Jack Darlington
141eb7901c
Add ignorable columns
2017-02-28 23:42:46 +00:00
Jack Darlington
ee5870c6cf
Merge branch 'master' into develop
2017-02-28 22:19:44 +00:00
idalin
338ca61cf9
fixed douban api not working in some cases
2017-02-28 15:17:37 +08:00
idalin
f44574af67
update Chinese translation.
2017-02-28 15:05:14 +08:00
idalin
54bc299e88
get metadata from douban and google while editing.
2017-02-28 14:58:11 +08:00
idalin
e100702345
get metadata from douban and google while editing.
2017-02-28 14:52:55 +08:00
Radosław Kierznowski
9dfd30e6f3
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-02-27 23:04:34 +01:00
Radosław Kierznowski
2f7fd1d957
Aktualizacja stanu tłumaczenia
2017-02-27 22:57:29 +01:00
Radosław Kierznowski
76c907484b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
2017-02-27 22:40:42 +01:00
OzzieIsaacs
90aa269e92
Merge remote-tracking branch 'polish_translation/master'
...
@radzio1993 : Thanks
2017-02-27 21:15:36 +01:00
Radosław Kierznowski
36264e7400
Update polish translation (POT: 2017-02-20 19:47)
2017-02-27 20:48:46 +01:00
Jack Darlington
d9c48a6203
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/web.py
2017-02-26 19:49:49 +00:00
Radosław Kierznowski
9ec5303fdc
Update polish translation (POT: 2017-02-20 19:47)
2017-02-26 18:29:38 +01:00
OzzieIsaacs
679effbaef
Bugfix placement of "recent downloads in "edit user section"
2017-02-25 13:34:33 +01:00
OzzieIsaacs
156a653c49
Make better usage of big screens in lists
2017-02-25 13:28:57 +01:00
OzzieIsaacs
00763d6e4c
Read book is now tied to the right downlolad books for guest users ( fixes #110 )
2017-02-25 11:14:45 +01:00
OzzieIsaacs
1a83ad713c
Additional version info for sqlite database
2017-02-25 09:02:59 +01:00
Ozzie Isaacs
b876505f22
Delete doubtable.js
2017-02-25 06:15:00 +01:00
OzzieIsaacs
40c6ef3a18
More generic aproach for postion of epub coverfile ( #122 )
2017-02-24 20:20:41 +01:00
idalin
4a2b5b46a3
merge
2017-02-24 14:36:10 +08:00
idalin
2f1fdab9de
delete douban_meta.js in master.(This is for Chinese user only)
2017-02-24 14:34:08 +08:00
idalin
d6dd28e703
limit search results to 20
2017-02-24 14:29:44 +08:00
OzzieIsaacs
41a20fe3e1
Added version info of dependencys in about section
2017-02-23 19:58:56 +01:00
OzzieIsaacs
0277d08706
Merged #123 .
...
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94 )
2017-02-23 19:06:52 +01:00
idalin
c98617a1cb
Merge branch 'master' into prod
2017-02-23 13:53:36 +08:00
idalin
3dcfebca60
update translations
2017-02-23 13:52:58 +08:00
idalin
b488af4c76
Merge branch 'master' into prod
2017-02-23 12:06:56 +08:00
idalin
9020c35819
fixed send to kindle not working problem for some smtp provider. #94
2017-02-23 11:26:39 +08:00
idalin
a09a2d9ed0
Merge branch 'master' into prod
2017-02-23 09:31:51 +08:00
Jack Darlington
51bd888765
Fix registering watch callback
2017-02-23 00:17:14 +00:00
Jack Darlington
82d01c9001
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
2017-02-22 22:45:19 +00:00
Jack Darlington
7b709c15c2
GitIgnore update + fixes for initial setup
2017-02-22 22:06:59 +00:00
OzzieIsaacs
7e19e1dd9d
Added Publisher and search/advanced search/opds search for publisher
2017-02-22 20:59:48 +01:00
Jack Darlington
6d30382ae0
Initial gdrive commit
...
Work on watching metadata
More efficient storing folder keys to database
Nearly completed. Need to do final touches to callback for when metadata.db updated on real server, as cannot test locally
Changed callback for file changes from being hard coded to mine
used url_for in template as apposed to hard coded links
Fix to drive template
First attempt at redownload metadata.db
Fixed incorrect call to downloadFile
Added logging
Fixed call to copy file
Added exception logging to gdriveutils + fixed string long concat
Fix file download
Fix backup metadata
Added slashes to paths
Removed threading temporarily
Fix for reloading database
Fix reinitialising of variables
Fix check to see if custom column already setup
Update to showing authenticate google drive callback + fix for reinitialising database
Fixed logic for showing authenticate with google drive
2017-02-22 11:20:41 +00:00
OzzieIsaacs
6ec4e0a651
Bugfix Updater
...
Improved logging
2017-02-21 19:40:22 +01:00
idalin
80e6311b93
fetch metadata from douban while editing metadata
2017-02-21 17:49:43 +08:00
OzzieIsaacs
709fa88c62
Navbar reduced to icons on smaller screens
...
Feedback updater improved (#81 )
2017-02-20 19:52:00 +01:00
Jack Darlington
f71fa5d935
Accidentally committed WIP google drive integration
2017-02-19 22:56:07 +00:00
Jack Darlington
d29d079d15
Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books)
2017-02-19 20:08:22 +00:00
OzzieIsaacs
3cadde6579
Fix for ( #117 )
2017-02-18 20:12:07 +01:00
OzzieIsaacs
eaccc3f408
Merge branch 'master' of https://github.com/janeczku/calibre-web
2017-02-18 10:38:35 +01:00
OzzieIsaacs
e712649612
Improvement for #83 , higher contrast of hamburger menu
...
Improvement for #84 , search is excluded from mobile view
2017-02-18 10:38:16 +01:00
Ozzie Isaacs
075c4c58e7
Revert os.rename to os.renames
2017-02-17 22:54:14 +01:00
OzzieIsaacs
ad40a2b5a6
Bugfix parsing publishing date with milliseconds ( #114 )
2017-02-17 18:22:08 +01:00
OzzieIsaacs
ed459ddb9b
Bugfix display of commit date
2017-02-15 18:19:48 +01:00
OzzieIsaacs
93b19165cf
Added polish in readme to supported UI languages
...
Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing
2017-02-15 18:09:17 +01:00
OzzieIsaacs
13caa54aad
Merge remote-tracking branch 'Polish_translation/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
2017-02-12 08:14:44 +01:00
Radosław Kierznowski
437358d685
Updated Polish translations (170210.2017)
...
The update is based on the .pot file on 2017-02-10 20:17
2017-02-11 16:08:39 +01:00
OzzieIsaacs
1692044d46
Merge remote-tracking branch 'default_user_settings/master' ( #105 )
2017-02-10 20:18:37 +01:00
OzzieIsaacs
8ededba350
Merged #106 (polish translation)
2017-02-10 20:01:26 +01:00
Radosław Kierznowski
c49d5e22cd
Upload polish version
2017-02-10 12:45:48 +01:00
Radosław Kierznowski
b686498593
I added Polish translation calibre-web
...
Translation requires a small fixes.
2017-02-10 00:21:59 +01:00
idalin
bff86f02ca
settings for default role of new register user
2017-02-09 13:46:07 +08:00
idalin
df2eb82408
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-09 11:37:23 +08:00
OzzieIsaacs
ba8e107402
Move vendored css/js to libs folders to fix language stats
2017-02-07 20:33:08 +01:00
OzzieIsaacs
ea305ff578
Merge remote-tracking branch 'origin/move-js-libs'
2017-02-07 20:27:47 +01:00
OzzieIsaacs
98ed740e73
Fixed missing js files for sorting shelfs
2017-02-07 20:14:43 +01:00
janeczku
13919a1d23
Move vendored css/js to libs folders to fix language stats
2017-02-07 19:21:14 +01:00
idalin
219f36be0e
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-07 10:12:40 +08:00
OzzieIsaacs
7957827b2d
Merge branch 'env-port'
2017-02-06 17:47:36 +01:00
janeczku
0e883f0b46
Allow overriding default port with environment variable
2017-02-06 16:00:29 +01:00
janeczku
8d9ed56864
Fix typo; raise exception when creating database
2017-02-06 15:34:31 +01:00
idalin
a1cca00ba3
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-06 10:23:37 +08:00
OzzieIsaacs
63379fe5db
Fix for #101
2017-02-05 14:27:57 +01:00
OzzieIsaacs
18a06e4a25
Fixed typeahead with reverse proxy
...
fixed marking of tags in advanced search
seperated js and html
2017-02-05 13:40:53 +01:00
idalin
9ef8aa7914
Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master
2017-02-05 16:46:59 +08:00
OzzieIsaacs
d5a64baf13
Bugfix name to id
2017-02-05 09:44:39 +01:00
Ethan Lin
e92d78870b
Merge pull request #8 from janeczku/master
...
Fix for simplified chinese language
2017-02-05 16:22:26 +08:00
OzzieIsaacs
4e73b11735
Fix for simplified chinese language
2017-02-05 08:49:19 +01:00
Ethan Lin
29fd395433
Merge pull request #7 from janeczku/master
...
merge from janeczku
2017-02-05 09:25:47 +08:00
OzzieIsaacs
241c4cef8f
- added best rated section in normal view
...
- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files
2017-02-04 14:28:18 +01:00
OzzieIsaacs
ee91fc03ef
Bugfix Id instead of names in url
2017-02-04 10:01:28 +01:00
idalin
23969b18f5
update translations
2017-02-04 15:58:11 +08:00
idalin
f11b123686
merge conflicts
2017-02-04 10:57:32 +08:00
OzzieIsaacs
861920af88
Pubdate is now showing up ( #95 )
...
Bugfix links in detailview
2017-02-03 13:44:13 +01:00
OzzieIsaacs
e46320b12f
folders now relying on ids not names (removes all encoding issues on link folders)
...
Language filter working in opds feed
removed redundant code
authos now paginating in opds feed
2017-02-03 13:20:35 +01:00
OzzieIsaacs
176c7dce70
- Fix for #100
...
- Fix migration of shelf order
- fix show random books in detail view for authors and series
2017-02-02 19:36:31 +01:00
OzzieIsaacs
f21c65ac50
- Bugfix Migration of database for config_log_level
...
- Bugfix Updater deleting temporary sourcefolder
2017-01-31 20:48:01 +01:00
OzzieIsaacs
c45968a1ed
Bugfix Updater
2017-01-31 19:29:47 +01:00
OzzieIsaacs
296d2615fe
Code cosmetics
2017-01-30 19:52:32 +01:00
OzzieIsaacs
9b09de12b5
Bugfix update (still not working correct)
2017-01-30 19:45:03 +01:00
OzzieIsaacs
af0417758c
Bugfix change permissions during update
2017-01-30 19:10:22 +01:00
OzzieIsaacs
1d3be7f4c6
Bugfix Git ident id
2017-01-30 19:03:55 +01:00
OzzieIsaacs
b1293c84bc
- Implemented autoupdater for testing
...
- failed logins are logged
- no of backups for log-file increased to 2
2017-01-30 18:58:36 +01:00
OzzieIsaacs
935b6e3143
Code cosmetics
...
Bugfix download opds
added changable title to opds feed
removed unused search.xml file
2017-01-29 21:06:08 +01:00
OzzieIsaacs
e9d0bff559
- added statistics for Tags and series
...
- Loglevel is displayed as text instead of value
2017-01-28 20:54:31 +01:00
OzzieIsaacs
e00a6741c7
Updated language files
2017-01-28 20:39:33 +01:00
OzzieIsaacs
2c615fdf05
Finalize graphical setup for calibre-web
2017-01-28 20:16:40 +01:00
OzzieIsaacs
75c89c28e1
Bugfix for accessing config database
...
Title now displaed on every page
Title can be changed from within application
2017-01-22 21:30:36 +01:00
OzzieIsaacs
4eee58c21c
Started migration of config to app database
2017-01-22 16:44:37 +01:00
OzzieIsaacs
a2a48515d4
Fixed language and locale preset for new users
2017-01-22 14:07:54 +01:00
idalin
348a7fd24c
merge janeczku-master
2017-01-22 14:00:25 +08:00
idalin
e4ac186f3c
temp
2017-01-22 13:55:09 +08:00
idalin
04729ae8ac
update translations
2017-01-22 10:59:33 +08:00
idalin
15d314db33
update translations
2017-01-22 10:12:36 +08:00
OzzieIsaacs
93b020b77c
Proper handling for non existing covers in calibre database
2017-01-21 17:04:36 +01:00
OzzieIsaacs
a40322468a
Update Translation file Informations
2017-01-21 11:46:28 +01:00
OzzieIsaacs
689aca276c
Update Translation file Informations
2017-01-21 11:46:16 +01:00
OzzieIsaacs
fd9740f758
Updated translation
2017-01-18 19:18:37 +01:00
OzzieIsaacs
afdfb30d80
Update email settings
2017-01-18 19:07:45 +01:00
OzzieIsaacs
0967b03a22
Merge branch 'master' into patch1
2017-01-18 19:01:16 +01:00
OzzieIsaacs
5a8dd19b4b
Bugfix Authentication for opds search calibre companion
2017-01-17 17:45:23 +01:00
idalin
4bf5c05b8b
fix wrong translations
2017-01-17 17:47:14 +08:00
idalin
ac5d39dfd8
fix wrong translations
2017-01-17 17:45:43 +08:00
Ethan Lin
9303fce5fd
Merge pull request #2 from janeczku/master
...
Bugfix search in opds feed (#79 again)
2017-01-17 11:16:42 +08:00
idalin
9f1f678bef
reset to last commit url_for without _external
2017-01-17 11:09:02 +08:00
OzzieIsaacs
12c80800ed
Bugfix search in opds feed ( #79 again)
...
Bugfix link generation for calibre-companion with reverse proxy (#79 again)
2017-01-16 18:30:47 +01:00
idalin
4a2f67bc00
fixed url_for return without port when port is not the standard port.
2017-01-16 16:26:20 +08:00
idalin
eb22fbf9fa
fixed url_for return without port when port is not the standard port.
2017-01-16 16:18:53 +08:00
idalin
0458ea5acb
fixed wrong translations. fixed smtp with ssl has no response.
2017-01-16 15:37:42 +08:00
idalin
6fcd65b4ce
added identifier for Douban
2017-01-16 11:14:49 +08:00
OzzieIsaacs
e5d881edf8
Bugfix empty search for opds feed
2017-01-15 12:37:58 +01:00
OzzieIsaacs
4b8fdb04e6
Improvement mimetypes for downloaded files
2017-01-15 12:23:08 +01:00
OzzieIsaacs
99430fc98e
Bugfix ( #79 ).
...
- Fixed download with anonymous user in opds feed
- Added mor filetypes to opds feed, if unknown filetype, nothing is published instead of mobi
2017-01-15 11:05:28 +01:00
OzzieIsaacs
2335252b1f
Merge branch 'Chinese_tanslation' ( #90 )
...
Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards
2017-01-14 15:05:49 +01:00
OzzieIsaacs
fb59647b82
Code cleanup in js and css folders
2017-01-14 13:32:25 +01:00
OzzieIsaacs
8759edd587
Calibre-companion now working ( #79 )
2017-01-14 13:18:35 +01:00
OzzieIsaacs
799d54bb24
Download with calibre-companion now working ( #79 )
2017-01-12 21:03:47 +01:00
OzzieIsaacs
0107c52b66
Anonymous account now can also be configured like normal user (e.g. download permissions, change visibility of sidebar) ( #35 )
...
Search now working for calibre-companion (#79 ), download not working yet
metadata view 80% finished
2017-01-12 20:43:36 +01:00
OzzieIsaacs
beca61a596
Nonexisting books are deleted from downloaded list ( #91 )
2017-01-10 21:20:12 +01:00
