From ef8826ac2d8438870e1bc42bf51cf28221461cb7 Mon Sep 17 00:00:00 2001 From: John Kristensen Date: Wed, 12 Oct 2011 15:10:59 +1100 Subject: [PATCH 1/9] remove 'description' from OC_Connector_Sabre_CalDAV propertyMap * the description field was removed in commit: f3f5d775b519c12e56f4c6db8ca8ccf87c68f19d but the field was still trying to be mapped - causing errors with CalDAV --- apps/calendar/lib/connector_sabre.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php index 13a542fccad..263fb7ffde5 100644 --- a/apps/calendar/lib/connector_sabre.php +++ b/apps/calendar/lib/connector_sabre.php @@ -10,7 +10,6 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { */ public $propertyMap = array( '{DAV:}displayname' => 'displayname', - '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description', '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => 'timezone', '{http://apple.com/ns/ical/}calendar-order' => 'calendarorder', '{http://apple.com/ns/ical/}calendar-color' => 'calendarcolor', From c86d1824fef70766f1f04a7f3ce2c118c411e037 Mon Sep 17 00:00:00 2001 From: John Kristensen Date: Wed, 12 Oct 2011 15:23:39 +1100 Subject: [PATCH 2/9] Improve handling of calendar export $_GET params * a notice would be reported if either of the 'cal' or 'event' $_GET params where not supplied, which would result in 'Cannot modify header information' warnings --- apps/calendar/export.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/calendar/export.php b/apps/calendar/export.php index b3e5ecd6834..3e93a1ad618 100644 --- a/apps/calendar/export.php +++ b/apps/calendar/export.php @@ -9,8 +9,8 @@ require_once ("../../lib/base.php"); OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); -$cal = $_GET["calid"]; -$event = $_GET["eventid"]; +$cal = isset($_GET["calid"]) ? $_GET["calid"] : NULL; +$event = isset($_GET["eventid"]) ? $_GET["eventid"] : NULL; if(isset($cal)){ $calendar = OC_Calendar_Calendar::findCalendar($cal); if($calendar["userid"] != OC_User::getUser()){ From 2cc5f5e19eb1039165564940a5a8e150dc2a5cf1 Mon Sep 17 00:00:00 2001 From: Patrick Stricker Date: Thu, 13 Oct 2011 10:04:39 +0200 Subject: [PATCH 3/9] made work with http authentication kind of sso login --- index.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 4e1f5bcc8d6..937784694ce 100644 --- a/index.php +++ b/index.php @@ -100,6 +100,18 @@ else { $error = true; } } - + // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP + elseif(isset($_SERVER["PHP_AUTH_USER"]) && isset($_SERVER["PHP_AUTH_PW"])) + { + if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"])) + { + OC_User::unsetMagicInCookie(); + OC_Util::redirectToDefaultPage(); + } + else + { + $error = true; + } + } OC_Template::printGuestPage('', 'login', array('error' => $error, 'redirect' => isset($_REQUEST['redirect_url'])?$_REQUEST['redirect_url']:'' )); } From c0b011e71427ac25b13ac44d34eb3a747d17832b Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Fri, 14 Oct 2011 18:04:50 +0200 Subject: [PATCH 4/9] Initialise hasOtherDB var when not true in installation --- core/templates/installation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/installation.php b/core/templates/installation.php index 70a545d66cf..f1cde6b3904 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -37,7 +37,7 @@
- + t( 'Configure the database' ); ?>
From 169dd7da770672efbbf49adaf32255a96fb01a9d Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Fri, 14 Oct 2011 19:09:07 +0200 Subject: [PATCH 5/9] Prevent category in jquery-ui on cal. to overflow --- core/css/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/styles.css b/core/css/styles.css index 46b340be961..539ae580aa0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -122,3 +122,4 @@ div.jp-play-bar, div.jp-seek-bar { padding:0; } .pager li { display:inline-block; } li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow: hidden; text-overflow: ellipsis; } \ No newline at end of file From f29dc0c0fbc7dd360066e5f47ec3b87927381c1b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 14 Oct 2011 20:50:55 +0200 Subject: [PATCH 6/9] correct language name --- settings/languageCodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/languageCodes.php b/settings/languageCodes.php index 3e2cea50acc..81177e0a258 100644 --- a/settings/languageCodes.php +++ b/settings/languageCodes.php @@ -21,7 +21,7 @@ return array( 'ms_MY'=>'Bahasa Melayu', 'nb_NO'=>'Norwegian Bokmål', 'nl'=>'Nederlands', -'pl'=>'język polski', +'pl'=>'Polski', 'pt_BR'=>'Português brasileiro', 'pt_PT'=>'Português', 'ro'=>'română', From 8d4039b678c2e35e3fd6834d56b8db6879beab89 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Fri, 14 Oct 2011 23:51:51 +0200 Subject: [PATCH 7/9] Add loading message to image lightbox and tweak events --- apps/files_imageviewer/css/lightbox.css | 11 ++++++++++- apps/files_imageviewer/js/lightbox.js | 17 ++++++++++++----- core/img/loading-dark.gif | Bin 0 -> 673 bytes 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 core/img/loading-dark.gif diff --git a/apps/files_imageviewer/css/lightbox.css b/apps/files_imageviewer/css/lightbox.css index a6e844a2e28..d96dd051b1e 100644 --- a/apps/files_imageviewer/css/lightbox.css +++ b/apps/files_imageviewer/css/lightbox.css @@ -20,4 +20,13 @@ margin-left:auto; margin-right:auto; z-index:9999; -} \ No newline at end of file +} + +#lightbox_loader{ + text-align:center; + position:fixed; + top: 40%; + left: 50%; + color:white; +} +#lightbox_loader img { margin-right: 1em;} \ No newline at end of file diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js index 847954d2f15..4f079b6d8af 100644 --- a/apps/files_imageviewer/js/lightbox.js +++ b/apps/files_imageviewer/js/lightbox.js @@ -2,11 +2,17 @@ var lightBoxShown=false; $(document).ready(function() { images={};//image cache - var overlay=$('