diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 23:21:50 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 23:21:50 +0200 |
| commit | 0918fc7d9156f3846a19b673db5b01422a59c506 (patch) | |
| tree | 131188252fd42c4f3c9673975adafa24783c632f /apps/calendar/appinfo/app.php | |
| parent | 77cefdedb86de65e69f470c8b6a1b03bb001966e (diff) | |
| parent | 74e540271122222f650bbbfaeaac310b0e592674 (diff) | |
| download | nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.tar.gz nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/appinfo/app.php')
| -rw-r--r-- | apps/calendar/appinfo/app.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index ea743674fe8..21d128e7b8a 100644 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -5,9 +5,12 @@ OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php'; OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php'; OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php'; OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php'; +OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php'; OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php'; OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser'); OC_Util::addScript('calendar','loader'); +OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min"); +OC_Util::addStyle("3rdparty", "chosen/chosen"); OC_App::register( array( 'order' => 10, 'id' => 'calendar', @@ -19,4 +22,4 @@ OC_App::addNavigationEntry( array( 'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ), 'name' => $l->t('Calendar'))); OC_App::registerPersonal('calendar', 'settings'); -OC_Search::registerProvider('OC_Search_Provider_Calendar'); +OC_Search::registerProvider('OC_Search_Provider_Calendar');
\ No newline at end of file |