Merge branch 'master' of https://github.com/inverse-inc/sogo

SoObjects/Mailer/SOGoDraftObject.m

@@ -269,7 +269,7 @@ static NSString    *userAgent      = nil;
 {
   id headerValue;
   unsigned int count;
-  NSString *messageID, *priority, *pureSender,*replyTo;
+  NSString *messageID, *priority, *pureSender, *replyTo;
 
   for (count = 0; count < 8; count++)
     {
@@ -314,8 +314,8 @@ static NSString    *userAgent      = nil;
   if ([replyTo length] > 0)
     {
       [headers setObject: replyTo forKey: @"reply-to"];
-      [headers removeObjectForKey: @"replyTo"];
     }
+  [headers removeObjectForKey: @"replyTo"];
 
   if ([[newHeaders objectForKey: @"receipt"] isEqualToString: @"true"])
     {

UI/WebServerResources/ContactsUI.css

@@ -110,7 +110,8 @@ DIV#contactFoldersList
   bottom: 0px;
   margin: 0px;
   padding: 0px;
-  overflow: hidden; }
+  overflow: auto;
+  overflow-x: hidden; }
 
 DIV#abToolbar
 { padding-left: 6px; }

UI/WebServerResources/SchedulerUI.css

@@ -5,7 +5,8 @@ DIV#leftPanel
   width: 19.25em;
   bottom: 0px;
   background-color: #CCDDEC;
-  overflow: hidden; }
+  overflow: auto;
+  overflow-x: hidden; }
 
 DIV#schedulerTabs
 { position: absolute;
@@ -21,9 +22,6 @@ DIV#schedulerTabs .tab
 { left: 0px;
   right: 0px; }
 
-DIV#calendarSelectorView
-{ overflow: hidden; }
-
 DIV#calendarSelectorButtons
 { padding-left: 6px; }
 
@@ -44,8 +42,6 @@ UL#calendarList
   padding: 0px;
   list-style-type: none;
   list-style-image: none;
-  overflow: hidden;
-  overflow-y: auto;
   -moz-user-select: none;
   -khtml-user-select: none; }
 

UI/WebServerResources/SchedulerUI.js

@@ -3239,23 +3239,23 @@ function onWindowResize(event) {
         handle.adjust();
 
     if (!$(document.body).hasClassName("popup"))
-        drawNowLine ();
+        drawNowLine();
 }
 
-function drawNowLine () {
+function drawNowLine() {
   var d = new Date();
   var hours = d.getHours();
   var minutes = d.getMinutes();
 
   if (currentView == "dayview") {
-    var today = new Date ();
-    var m = parseInt(today.getMonth ()) + 1;
-    var d = today.getDate ();
+    var today = new Date();
+    var m = parseInt(today.getMonth()) + 1;
+    var d = today.getDate();
     if (m < 10)
       m = "0" + m;
     if (d < 10)
       d = "0" + d;
-    var day = today.getFullYear () + "" + m + "" + d;
+    var day = today.getFullYear() + "" + m + "" + d;
     var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
                      + "] DIV.clickableHourCell");
   }
@@ -3268,12 +3268,12 @@ function drawNowLine () {
     if (target) {
       var div = $("nowLineDisplay");
       if (!div)
-        div = new Element ("div", {'id': 'nowLineDisplay'});
+        div = new Element("div", {'id': 'nowLineDisplay'});
 
-      div.style.top = parseInt (((minutes * target.offsetHeight) / 60) - 1) + "px";
-      target.appendChild (div);
+      div.style.top = parseInt(((minutes * target.offsetHeight) / 60) - 1) + "px";
+      target.appendChild(div);
 
-      setTimeout ("drawNowLine ();", 60000); // 1 min.
+      setTimeout("drawNowLine ();", 60000); // 1 min.
     }
   }
 }