Merge branch 'master' into spacebattles

This commit is contained in:
Jim Miller 2015-07-14 13:43:52 -05:00
commit fd561c0d74
10 changed files with 1235 additions and 1171 deletions

View file

@ -42,7 +42,7 @@ class FanFicFareBase(InterfaceActionBase):
description = _('UI plugin to download FanFiction stories from various sites.')
supported_platforms = ['windows', 'osx', 'linux']
author = 'Jim Miller'
version = (2, 2, 9)
version = (2, 2, 10)
minimum_calibre_version = (1, 48, 0)
#: This field defines the GUI plugin class that contains all the code

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -25,7 +25,7 @@ setup(
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version="2.2.9",
version="2.2.10",
description='A tool for downloading fanfiction to eBook formats',
long_description=long_description,

View file

@ -1,6 +1,6 @@
# ffd-retief-hrd fanfictiondownloader fanficfare
application: fanficfare
version: 2-2-9
version: 2-2-10
runtime: python27
api_version: 1
threadsafe: true

View file

@ -46,9 +46,7 @@
</p>
<h3>Changes:</h3>
<ul>
<li>Update adapter_nhamagicalworldsus, make a Base eFiction adapter.</li>
<li>Default bulk_load true for all (eFiction Base) adapters.</li>
<li>Exclude doReplacements on add_genre_when_multi_category call to getList('category'). Prevents a possible infinite recursion.</li>
<li>Updates for mediaminer.org changes.</li>
</ul>
<p>
Questions? Check out our
@ -58,7 +56,7 @@
If you have any problems with this application, please
report them in
the <a href="http://groups.google.com/group/fanfic-downloader">FanFicFare Google Group</a>. The
<a href="http://2-2-8.fanficfare.appspot.com">previous version
<a href="http://2-2-9.fanficfare.appspot.com">previous version
</a> is also available for you to use if necessary.
</p>
<div id='error'>