Merge branch 'master' into horde_5_2

horde · Nov 6, 2013 · 075c34e · 075c34e
2 parents 5fba221 + ee672a8
commit 075c34e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/hermes/lib/Api.php b/hermes/lib/Api.php
@@ -496,10 +496,6 @@ public function listTimeObjectCategories()
      */
     public function listTimeObjects($time_categories, $start, $end)
     {
-        $slices = $GLOBALS['injector']
-            ->getInstance('Hermes_Driver')
-            ->getHours($params);
-
         $objects = array();
 
         foreach ($time_categories as $category) {

diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
@@ -2377,7 +2377,6 @@ var DimpBase = {
             if (!d.opera && !d.wasDragged) {
                 $('folderopts_link').up().hide();
                 $('dropbase').up().show();
-                d.ghost.removeClassName('on');
             }
         }
     },

diff --git a/imp/themes/default/dynamic/screen.css b/imp/themes/default/dynamic/screen.css
@@ -785,6 +785,9 @@ span.attachmentImg {
 .dragdrop, .mboxdrag, .msgdrag {
     padding: 2px;
 }
+.imp-sidebar-mbox.mboxdrag {
+    height: auto !important;
+}
 
 /* Search-related styles */
 .qsearchMatch {

diff --git a/nag/lib/Api.php b/nag/lib/Api.php
@@ -146,7 +146,7 @@ public function getTasklist($name)
      * @param string $description Task list description.
      * @param string $color       Task list color.
      *
-     * @return integer  The new tasklist's id.
+     * @return string  The new tasklist's id.
      */
     public function addTasklist($name, $description = '', $color = '')
     {