Merge branch 'master' into spacebattles

calibre-plugin/__init__.py

@@ -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, 5)
+    version             = (2, 2, 6)
     minimum_calibre_version = (1, 48, 0)
 
     #: This field defines the GUI plugin class that contains all the code

setup.py

@@ -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.5",
+    version="2.2.6",
 
     description='A tool for downloading fanfiction to eBook formats',
     long_description=long_description,

webservice/app.yaml

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

webservice/index.html

@@ -46,9 +46,10 @@
           </p>
 	  <h3>Changes:</h3>
 	  <ul>
-            <li>Fix ficwad.com changing author URLs.</li>
-            <li>Fix for ponyfictionarchive.net stories with neither In-Progress or Complete flag.</li>
-            <li>Fix for grangerenchanted.com bad HTML summary causing crash.</li>
+            <li>Fixes for storiesonline -- Thanks, davidfor.</li>
+            <li>Update html5lib to 0.99999.</li>
+            <li>Fix add_genre_when_multi_category for AO3 changes to genre/category.</li>
+            <li>Change AO3 genre & category to fill with freeformtags, ao3categories & fandoms from defaults.ini instead of by hardcode.</li>
 	  </ul>
 	  <p>
 	    Questions?  Check out our 
@@ -58,7 +59,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-4.fanficfare.appspot.com">previous version
+	    <a href="http://2-2-5.fanficfare.appspot.com">previous version
 	    </a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>