Merge branch 'master' into sabredav_1.6

17 files changed, 42 insertions, 30 deletions

diff --git a/apps/files_archive/appinfo/info.xml b/apps/files_archive/appinfo/info.xml
index df767d39f6b..236b5a64b05 100644
--- a/apps/files_archive/appinfo/info.xml
+++ b/apps/files_archive/appinfo/info.xml
@@ -7,4 +7,7 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>3</require>
+	<types>
+		<filesystem/>
+	</types>
 </info>
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 053044aaed2..691b265bf60 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -7,4 +7,7 @@
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>3</require>
+	<types>
+		<filesystem/>
+	</types>
 </info>
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
new file mode 100644
index 00000000000..95770b44b75
--- /dev/null
+++ b/apps/files_external/appinfo/app.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_external/lib/ftp.php';
+OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_external/lib/webdav.php';
+OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_external/lib/google.php';
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
new file mode 100644
index 00000000000..fb58297ff17
--- /dev/null
+++ b/apps/files_external/appinfo/info.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<info>
+	<id>files_external</id>
+	<name>External storage support</name>
+	<description>Mount external storage sources</description>
+	<version>0.1</version>
+	<licence>AGPL</licence>
+	<author>Robin Appelman</author>
+	<require>3</require>
+	<types>
+		<filesystem/>
+	</types>
+</info>
diff --git a/apps/files_remote/lib/ftp.php b/apps/files_external/lib/ftp.php
index 802446b4fd8..802446b4fd8 100644
--- a/apps/files_remote/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
diff --git a/apps/files_remote/lib/google.php b/apps/files_external/lib/google.php
index 0d6db1987f8..0d6db1987f8 100644
--- a/apps/files_remote/lib/google.php
+++ b/apps/files_external/lib/google.php
diff --git a/apps/files_remote/lib/webdav.php b/apps/files_external/lib/webdav.php
index 7a2da5c8ec0..7a2da5c8ec0 100644
--- a/apps/files_remote/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
diff --git a/apps/files_remote/tests/config.php b/apps/files_external/tests/config.php
index 9b40d2b98cf..9b40d2b98cf 100644
--- a/apps/files_remote/tests/config.php
+++ b/apps/files_external/tests/config.php
diff --git a/apps/files_remote/tests/ftp.php b/apps/files_external/tests/ftp.php
index 03633b7c0d1..aa565751ba3 100644
--- a/apps/files_remote/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -12,7 +12,7 @@ class Test_Filestorage_FTP extends Test_FileStorage {
 
 	public function setUp(){
 		$id=uniqid();
-		$this->config=include('apps/files_remote/tests/config.php');
+		$this->config=include('apps/files_external/tests/config.php');
 		$this->config['ftp']['root'].='/'.$id;//make sure we have an new empty folder to work in
 		$this->instance=new OC_Filestorage_FTP($this->config['ftp']);
 	}
diff --git a/apps/files_remote/tests/google.php b/apps/files_external/tests/google.php
index b49f9e4647c..1c028945228 100644
--- a/apps/files_remote/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -27,7 +27,7 @@ class Test_Filestorage_Google extends Test_FileStorage {
 
 	public function setUp(){
 		$id=uniqid();
-		$this->config=include('apps/files_remote/tests/config.php');
+		$this->config=include('apps/files_external/tests/config.php');
 		$this->config['google']['root'].='/'.$id;//make sure we have an new empty folder to work in
 		$this->instance=new OC_Filestorage_Google($this->config['google']);
 	}
@@ -35,4 +35,4 @@ class Test_Filestorage_Google extends Test_FileStorage {
 	public function tearDown(){
 		$this->instance->rmdir('/');
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/files_remote/tests/webdav.php b/apps/files_external/tests/webdav.php
index 219fff8852d..51799290540 100644
--- a/apps/files_remote/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -12,7 +12,7 @@ class Test_Filestorage_DAV extends Test_FileStorage {
 
 	public function setUp(){
 		$id=uniqid();
-		$this->config=include('apps/files_remote/tests/config.php');
+		$this->config=include('apps/files_external/tests/config.php');
 		$this->config['webdav']['root'].='/'.$id;//make sure we have an new empty folder to work in
 		$this->instance=new OC_Filestorage_DAV($this->config['webdav']);
 	}
diff --git a/apps/files_remote/appinfo/app.php b/apps/files_remote/appinfo/app.php
deleted file mode 100644
index 02c1c3ae313..00000000000
--- a/apps/files_remote/appinfo/app.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC::$CLASSPATH['OC_Filestorage_FTP']='apps/files_remote/lib/ftp.php';
-OC::$CLASSPATH['OC_Filestorage_DAV']='apps/files_remote/lib/webdav.php';
-OC::$CLASSPATH['OC_Filestorage_Google']='apps/files_remote/lib/google.php';
diff --git a/apps/files_remote/appinfo/info.xml b/apps/files_remote/appinfo/info.xml
deleted file mode 100644
index 0720b6095b9..00000000000
--- a/apps/files_remote/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_remote</id>
-	<name>Remote storage support</name>
-	<description>Mount remote storage sources</description>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>3</require>
-</info>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index abf847b4483..8fda775520b 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -8,4 +8,7 @@
 	<author>Michael Gapczynski</author>
 	<require>2</require>
 	<default_enable/>
+	<types>
+		<filesystem/>
+	</types>
 </info>
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 3e7e38301cf..f7e0651275e 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -32,14 +32,14 @@ $l = new OC_L10N('gallery');
 OC_App::register(array(
   'order' => 20,
   'id' => 'gallery',
-  'name' => 'Gallery'));
+  'name' => 'Pictures'));
 
 OC_App::addNavigationEntry( array(
  'id' => 'gallery_index',
  'order' => 20,
  'href' => OC_Helper::linkTo('gallery', 'index.php'),
  'icon' => OC_Helper::imagePath('core', 'places/picture.svg'),
- 'name' => $l->t('Gallery')));
+ 'name' => $l->t('Pictures')));
 
  class OC_GallerySearchProvider implements OC_Search_Provider{
 	static function search($query){
diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
index 19c5dc8b25e..4c8c1cee242 100644
--- a/apps/gallery/appinfo/info.xml
+++ b/apps/gallery/appinfo/info.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?> 
 <info>
 	<id>gallery</id>
-	<name>Gallery</name>
+	<name>Pictures</name>
 	<version>0.4</version>
 	<licence>AGPL</licence>
 	<author>Bartek Przybylski</author>
 	<require>2</require>
-	<description>Gallery application for ownCloud</description>
+	<description>Dedicated pictures application</description>
 	<default_enable/>
 </info>
diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
index 121587795db..0936bf9bd0f 100644
--- a/apps/remoteStorage/appinfo/info.xml
+++ b/apps/remoteStorage/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>remoteStorage</id>
 	<name>remoteStorage compatibility</name>
-	<description>Enables your users to use ownCloud as their remote storage for unhosted applications.</description>
+	<description>Enables you to use ownCloud as their remote storage for unhosted applications. This app requires the Webfinger app to be enabled as well. More info on <a href="http://unhosted.org">the website of the unhosted movement</a>.</description>
 	<version>0.5</version>
 	<licence>AGPL or MIT</licence>
 	<author>Michiel de Jong</author>