diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-03-02 21:35:48 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-03-02 21:35:48 +0000 |
| commit | 45ef2ecf52abc58e5c21105345cb2b0560102939 (patch) | |
| tree | 9062ce6085c06c191146607aa8e1df8f3763c938 /apps/bookmarks/appinfo | |
| parent | 33c5b3a2efa8559a3e960e6d8256576aab604869 (diff) | |
| parent | 3e84f170e7133d9acc46123ba4c901a24e438b2c (diff) | |
| download | nextcloud-server-45ef2ecf52abc58e5c21105345cb2b0560102939.tar.gz nextcloud-server-45ef2ecf52abc58e5c21105345cb2b0560102939.zip | |
Fix merge conflict
Diffstat (limited to 'apps/bookmarks/appinfo')
| -rw-r--r-- | apps/bookmarks/appinfo/app.php | 8 | ||||
| -rw-r--r-- | apps/bookmarks/appinfo/database.xml | 8 | ||||
| -rw-r--r-- | apps/bookmarks/appinfo/info.xml | 4 |
3 files changed, 7 insertions, 13 deletions
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php index 54812188418..13d76e08179 100644 --- a/apps/bookmarks/appinfo/app.php +++ b/apps/bookmarks/appinfo/app.php @@ -1,6 +1,6 @@ <?php /** -* Copyright (c) 2011 Marvin Thomas Rabe <m.rabe@echtzeitraum.de> +* Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de> * Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de> * This file is licensed under the Affero General Public License version 3 or * later. @@ -8,6 +8,7 @@ */ OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php'; +OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php'; OC_App::register( array( 'order' => 70, 'id' => 'bookmark', 'name' => 'Bookmarks' )); @@ -15,9 +16,10 @@ $l = new OC_l10n('bookmarks'); OC_App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OC_Helper::linkTo( 'bookmarks', 'index.php' ), 'icon' => OC_Helper::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => $l->t('Bookmarks'))); OC_App::registerPersonal('bookmarks', 'settings'); -require_once('apps/bookmarks/lib/search.php'); OC_Util::addScript('bookmarks','bookmarksearch'); // Include the migration provider -require_once('apps/bookmarks/lib/migrate.php');
\ No newline at end of file +require_once('apps/bookmarks/lib/migrate.php'); + +OC_Search::registerProvider('OC_Search_Provider_Bookmarks'); diff --git a/apps/bookmarks/appinfo/database.xml b/apps/bookmarks/appinfo/database.xml index fca38ad84b2..f2fc68e4b58 100644 --- a/apps/bookmarks/appinfo/database.xml +++ b/apps/bookmarks/appinfo/database.xml @@ -75,14 +75,6 @@ <sorting>descending</sorting> </field> </index> -<!-- <index> - <name>url</name> - <unique>true</unique> - <field> - <name>url</name> - <sorting>ascending</sorting> - </field> - </index>--> </declaration> </table> diff --git a/apps/bookmarks/appinfo/info.xml b/apps/bookmarks/appinfo/info.xml index 23aa6c219a9..862ab805a60 100644 --- a/apps/bookmarks/appinfo/info.xml +++ b/apps/bookmarks/appinfo/info.xml @@ -3,8 +3,8 @@ <id>bookmarks</id> <name>Bookmarks</name> <description>Bookmark manager for ownCloud</description> - <version>0.1</version> + <version>0.2</version> <licence>AGPL</licence> - <author>Arthur Schiwon</author> + <author>Arthur Schiwon, Marvin Thomas Rabe</author> <require>2</require> </info>
\ No newline at end of file |