Merge branch 'master' into metadata

This commit is contained in:
Jim Miller 2015-04-30 16:07:06 -05:00
commit 5ff7660b67
10 changed files with 2881 additions and 2642 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, 3)
version = (2, 2, 4)
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.3",
version="2.2.4",
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-3
version: 2-2-4
runtime: python27
api_version: 1
threadsafe: true

View file

@ -46,8 +46,7 @@
</p>
<h3>Changes:</h3>
<ul>
<li>Fix storiesonline.net site changes.</li>
<li>Add site it-could-happen.net.</li>
<li>More fixes for storiesonline.net site changes.</li>
</ul>
<p>
Questions? Check out our
@ -57,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-2.fanficfare.appspot.com">previous version
<a href="http://2-2-3.fanficfare.appspot.com">previous version
</a> is also available for you to use if necessary.
</p>
<div id='error'>