Merge from trunk

.bzrignore

@@ -11,7 +11,7 @@ resources/localization
 resources/images.qrc
 resources/scripts.pickle
 resources/ebook-convert-complete.pickle
-resources/builtin_recipes.xml
+resources/builtin_recipes.*
 setup/installer/windows/calibre/build.log
 src/calibre/translations/.errors
 src/cssutils/.svn/

Changelog.yaml

@@ -19,6 +19,73 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.7.50
+  date: 2011-03-18
+
+  new features:
+    - title: "Add 'Read a random book' to the view menu"
+
+    - title: "Add option to show composite columns in the tag browser."
+
+    - title: "Add a tweak in Preferences->Tweaks to control where news that is automatically uploaded to a reader is sent."
+      tickets: [9427]
+
+    - title: "Do not also show text in composite columns when showing an icon"
+
+    - title: "Add a menu item to clear the last viewed books history in the ebook viewer"
+
+    - title: "Kobo driver: Add support for the 'Closed' collection"
+
+    - title: "Add rename/delete saved search options to Tag browser context menu"
+
+    - title: "Make searches in the tag browser a possible hierarchical field"
+  
+    - title: "Allow using empty username and password when setting up an SMTP relay"
+      tickets: [9195]
+ 
+  bug fixes:
+    - title: "Fix regression in 0.7.49 that broke deleting of news downloads older than x days."
+      tickets: [9417]
+
+    - title: "Restore the ability to remove missing formats from metadata.db to the Check Library operation"
+      tickets: [9377]
+
+    - title: "EPUB metadata: Read ISBN from Penguin epubs that dont correctly specify it"
+
+    - title: "Conversion pipeline: Handle the case where the ncx file is incorrectly given an HTML mimetype"
+
+    - title: "Make numpad navigation keys work in viewer"
+      tickets: [9428]
+
+    - title: "Fix ratings not being downloaded from Amazon"
+
+    - title: "Content server: Add workaround for Internet Explorer not supporting the ' entity."
+      tickets: [9413]
+
+    - title: "Conversion pipeline: When detecting chapters/toc links from HTML normalize spaces and increase maximum TOC title length to 1000 characters from 100 characters."
+      tickets: [9363]
+
+    - title: "Fix regression that broke Search and Replace on custom fields"
+      tickets: [9397]
+
+    - title: "Fix regression that caused currently selected row to be unfocussed int he device view when updataing metadata"
+      tickets: [9395]
+
+    - title: "Coversion S&R: Do not strip leading and trailing whitespace from the search and replace expressions in the GUI"
+
+
+  improved recipes:
+    - Sports Illustrated
+    - Draw and Cook
+
+  new recipes:
+    - title: "Evangelizo.org  and pro-linux.de"
+      author: Bobus
+
+    - title: "Office Space and Modoros"
+      author: Zsolt Botykai
+
+
 - version: 0.7.49
   date: 2011-03-11