diff --git a/COPYRIGHT b/COPYRIGHT index cc3214c9de..a31d1dbcda 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -30,6 +30,12 @@ License: BSD The full text of the BSD license is distributed as in /usr/share/common-licenses/BSD on Debian systems. +Files: /src/routes/* +Copyright: Copyright (c) 2005-2008 Ben Bangert +License: BSD + The full text of the BSD license is distributed as in + /usr/share/common-licenses/BSD on Debian systems. + Files: src/odf/* Copyright: Copyright (C) 2006-2008 Søren Roug, European Environment Agency License: LGPL2.1+ @@ -50,12 +56,6 @@ License: BSD The full text of the BSD license is distributed as in /usr/share/common-licenses/BSD on Debian systems. -Files: src/calibre/utils/genshi/* -Copyright: Copyright (C) 2006-2008 Edgewall Software -License: BSD - The full text of the BSD license is distributed as in - /usr/share/common-licenses/BSD on Debian systems. - Files: src/calibre/utils/lzx/* Copyright: Copyright (C) 2002, Matthew T. Russotto Copyright: Copyright (C) 2008, Marshall T. Vandegrift diff --git a/Changelog.yaml b/Changelog.yaml index f23566cb67..8ec96fc055 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -4,6 +4,13 @@ # for important features/bug fixes. # Also, each release can have new and improved recipes. +- version: 0.7.0 + date: 2010-06-04 + + new features: + - title: "Go to http://calibre-ebook.com/new-in/seven to see what's new in 0.7.0" + type: major + - version: 0.6.55 date: 2010-05-28 diff --git a/icons/library.icns b/icons/library.icns index 412b2a3d21..39813eb8e6 100644 Binary files a/icons/library.icns and b/icons/library.icns differ diff --git a/icons/library.ico b/icons/library.ico index c8a02f15de..433b4f2d51 100644 Binary files a/icons/library.ico and b/icons/library.ico differ diff --git a/resources/content_server/calibre.png b/resources/content_server/calibre.png index 871a5e31a8..87950e2bb4 100644 Binary files a/resources/content_server/calibre.png and b/resources/content_server/calibre.png differ diff --git a/resources/content_server/calibre_banner.png b/resources/content_server/calibre_banner.png index 1406884870..df7382144f 100644 Binary files a/resources/content_server/calibre_banner.png and b/resources/content_server/calibre_banner.png differ diff --git a/resources/content_server/gui.js b/resources/content_server/gui.js index ba2b0af940..9c20037207 100644 --- a/resources/content_server/gui.js +++ b/resources/content_server/gui.js @@ -123,7 +123,7 @@ function fetch_library_books(start, num, timeout, sort, order, search) { current_library_request = $.ajax({ type: "GET", - url: "library", + url: "xml", data: data, cache: false, timeout: timeout, //milliseconds diff --git a/resources/content_server/index.html b/resources/content_server/index.html index 3dcc093c13..f9f0aff491 100644 --- a/resources/content_server/index.html +++ b/resources/content_server/index.html @@ -11,7 +11,7 @@