added 'weekday' cycle

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@581 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj
index 419da332949da08b66bc131fe29f2b4d013f1517..7502f9ee2088b1a05fd6f224166cc722dbcb5348 100644 (file)
--- a/SOGo/SOGo.xcode/project.pbxproj
+++ b/SOGo/SOGo.xcode/project.pbxproj
@@ -451,158 +451,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               AD071CE306CD2AB800A9EEF4 = {
-                       children = (
-                               AD071CE806CD2ACE00A9EEF4,
-                               AD071CE706CD2ACE00A9EEF4,
-                               AD071CE506CD2ACE00A9EEF4,
-                               AD071CF006CD2ACE00A9EEF4,
-                               AD071CF406CD2B0400A9EEF4,
-                               AD071CF706CD2B1900A9EEF4,
-                       );
-                       isa = PBXGroup;
-                       name = Logic;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071CE506CD2ACE00A9EEF4 = {
-                       fileEncoding = 4;
-                       indentWidth = 8;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       name = ChangeLog;
-                       path = ../SOGoLogic/ChangeLog;
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 8;
-                       usesTabs = 1;
-               };
-               AD071CE606CD2ACE00A9EEF4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = common.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071CE706CD2ACE00A9EEF4 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       name = COPYING;
-                       path = ../SOGoLogic/COPYING;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071CE806CD2ACE00A9EEF4 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = text;
-                       name = COPYRIGHT;
-                       path = ../SOGoLogic/COPYRIGHT;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071CE906CD2ACE00A9EEF4 = {
-                       explicitFileType = sourcecode.make;
-                       fileEncoding = 4;
-                       indentWidth = 8;
-                       isa = PBXFileReference;
-                       path = GNUmakefile;
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 8;
-               };
-               AD071CEA06CD2ACE00A9EEF4 = {
-                       explicitFileType = sourcecode.make;
-                       fileEncoding = 4;
-                       indentWidth = 8;
-                       isa = PBXFileReference;
-                       path = GNUmakefile.preamble;
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 8;
-               };
-               AD071CEC06CD2ACE00A9EEF4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       name = SOGoAppointment.h;
-                       path = /Users/znek/Projects/agenor/trunk/SOGoLogic/SOGoAppointment.h;
-                       refType = 0;
-                       sourceTree = "<absolute>";
-               };
-               AD071CED06CD2ACE00A9EEF4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       name = SOGoAppointment.m;
-                       path = /Users/znek/Projects/agenor/trunk/SOGoLogic/SOGoAppointment.m;
-                       refType = 0;
-                       sourceTree = "<absolute>";
-               };
-               AD071CF006CD2ACE00A9EEF4 = {
-                       explicitFileType = sourcecode.make;
-                       fileEncoding = 4;
-                       indentWidth = 8;
-                       isa = PBXFileReference;
-                       name = Version;
-                       path = ../SOGoLogic/Version;
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 8;
-               };
-               AD071CF406CD2B0400A9EEF4 = {
-                       children = (
-                               AD071CE906CD2ACE00A9EEF4,
-                               AD071CEA06CD2ACE00A9EEF4,
-                       );
-                       isa = PBXGroup;
-                       name = Makefiles;
-                       path = ../SOGoLogic;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071CF706CD2B1900A9EEF4 = {
-                       children = (
-                               AD071CE606CD2ACE00A9EEF4,
-                               AD071CEC06CD2ACE00A9EEF4,
-                               AD071CED06CD2ACE00A9EEF4,
-                               AD73BE4A06CF88BF00226A2D,
-                               AD73BE4B06CF88BF00226A2D,
-                               AD071D1206CD2BCB00A9EEF4,
-                               AD071D1306CD2BCB00A9EEF4,
-                               AD255F390735B15E00D424E6,
-                               AD255F3A0735B15E00D424E6,
-                               ADA6333607140E0D0058C21C,
-                       );
-                       isa = PBXGroup;
-                       name = Classes;
-                       path = ../SOGoLogic;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071D1206CD2BCB00A9EEF4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = AgenorUserManager.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD071D1306CD2BCB00A9EEF4 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = AgenorUserManager.m;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                AD071F6606CE66DF00A9EEF4 = {
                        fileEncoding = 4;
                        indentWidth = 8;
@@ -640,27 +488,6 @@
                        tabWidth = 8;
                        usesTabs = 1;
                };
-               AD255F390735B15E00D424E6 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = SOGoLRUCache.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 2;
-                       usesTabs = 0;
-               };
-               AD255F3A0735B15E00D424E6 = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = SOGoLRUCache.m;
-                       refType = 4;
-                       sourceTree = "<group>";
-                       tabWidth = 2;
-               };
                AD273D4C077315640064794B = {
                        fileEncoding = 4;
                        isa = PBXFileReference;
@@ -1378,24 +1205,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               AD73BE4A06CF88BF00226A2D = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = SOGoAppointmentICalRenderer.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD73BE4B06CF88BF00226A2D = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = SOGoAppointmentICalRenderer.m;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                AD73BE6106CF8CC500226A2D = {
                        fileEncoding = 5;
                        indentWidth = 2;
@@ -1698,6 +1507,362 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               AD85C6E307C4E7230036AC7A = {
+                       children = (
+                               AD85C6F807C4E7330036AC7A,
+                               AD85C6E607C4E7230036AC7A,
+                               AD85C6F507C4E7230036AC7A,
+                       );
+                       isa = PBXGroup;
+                       path = Protocols;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6E407C4E7230036AC7A = {
+                       explicitFileType = sourcecode.make;
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       path = common.make;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6E507C4E7230036AC7A = {
+                       explicitFileType = sourcecode.make;
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       path = GNUmakefile;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6E607C4E7230036AC7A = {
+                       children = (
+                               AD85C6EF07C4E7230036AC7A,
+                               AD85C6EA07C4E7230036AC7A,
+                               AD85C6EB07C4E7230036AC7A,
+                               AD85C6E807C4E7230036AC7A,
+                               AD85C6F407C4E7230036AC7A,
+                               AD85C6E707C4E7230036AC7A,
+                               AD85C6EE07C4E7230036AC7A,
+                               AD85C6FB07C4E7600036AC7A,
+                               AD85C6FE07C4E7670036AC7A,
+                       );
+                       isa = PBXGroup;
+                       path = iCalHTTP;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6E707C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist;
+                       path = "bundle-info.plist";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6E807C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = ChangeLog;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6E907C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = common.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6EA07C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = COPYING;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6EB07C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = COPYRIGHT;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6EC07C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = GNUmakefile;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6ED07C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = iCalHTTPProduct.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6EE07C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.plist;
+                       path = product.plist;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6EF07C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = README;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F007C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoICalFileFetch.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F107C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoICalFilePublish.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F207C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoICalHTTPHandler.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F307C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoICalHTTPHandler.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F407C4E7230036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = Version;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F507C4E7230036AC7A = {
+                       children = (
+                       );
+                       isa = PBXGroup;
+                       path = RSS;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6F807C4E7330036AC7A = {
+                       children = (
+                               AD85C6E407C4E7230036AC7A,
+                               AD85C6E507C4E7230036AC7A,
+                       );
+                       indentWidth = 8;
+                       isa = PBXGroup;
+                       name = Makefiles;
+                       refType = 4;
+                       sourceTree = "<group>";
+                       tabWidth = 8;
+                       usesTabs = 1;
+               };
+               AD85C6FB07C4E7600036AC7A = {
+                       children = (
+                               AD85C6EC07C4E7230036AC7A,
+                       );
+                       isa = PBXGroup;
+                       name = Makefiles;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C6FE07C4E7670036AC7A = {
+                       children = (
+                               AD85C6E907C4E7230036AC7A,
+                               AD85C6ED07C4E7230036AC7A,
+                               AD85C6F207C4E7230036AC7A,
+                               AD85C6F307C4E7230036AC7A,
+                               AD85C6F007C4E7230036AC7A,
+                               AD85C6F107C4E7230036AC7A,
+                       );
+                       isa = PBXGroup;
+                       name = Classes;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72607C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = AgenorUserManager.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72707C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = AgenorUserManager.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72807C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = ChangeLog;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72907C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = "NSString+iCal.h";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72A07C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoAppointment.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72B07C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoAppointment.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72C07C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoAppointmentICalRenderer.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72D07C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoAppointmentICalRenderer.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72E07C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoCustomGroupFolder.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C72F07C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoCustomGroupFolder.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73007C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoGroupFolder.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73107C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoGroupFolder.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73207C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoGroupsFolder.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73307C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoGroupsFolder.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73407C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = SOGoLRUCache.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73507C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = SOGoLRUCache.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73607C4E8740036AC7A = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text;
+                       path = Version;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C73907C4E8A30036AC7A = {
+                       children = (
+                               AD85C72A07C4E8740036AC7A,
+                               AD85C72B07C4E8740036AC7A,
+                               AD85C72C07C4E8740036AC7A,
+                               AD85C72D07C4E8740036AC7A,
+                       );
+                       isa = PBXGroup;
+                       name = Temporary;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD85C76007C4E9100036AC7A = {
+                       children = (
+                       );
+                       isa = PBXGroup;
+                       path = Templates;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
                AD88394906EF807D00981A3E = {
                        fileEncoding = 5;
                        indentWidth = 2;
@@ -1734,15 +1899,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
-               ADA6333607140E0D0058C21C = {
-                       fileEncoding = 5;
-                       indentWidth = 2;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = "NSString+iCal.h";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                ADAD40C90769FFD000AAD24E = {
                        fileEncoding = 4;
                        isa = PBXFileReference;
@@ -2575,7 +2731,13 @@
                };
                ADDF4DBA06DE0E6500C4E7F8 = {
                        children = (
+                               AD85C73907C4E8A30036AC7A,
+                               AD85C72907C4E8740036AC7A,
                                E87206880692E3D10099CBBD,
+                               AD85C72607C4E8740036AC7A,
+                               AD85C72707C4E8740036AC7A,
+                               AD85C73407C4E8740036AC7A,
+                               AD85C73507C4E8740036AC7A,
                                E87206A00692E3D10099CBBD,
                                E87206A10692E3D10099CBBD,
                                E872069C0692E3D10099CBBD,
@@ -2584,6 +2746,12 @@
                                E872069F0692E3D10099CBBD,
                                E87206A20692E3D10099CBBD,
                                E87206A30692E3D10099CBBD,
+                               AD85C73207C4E8740036AC7A,
+                               AD85C73307C4E8740036AC7A,
+                               AD85C73007C4E8740036AC7A,
+                               AD85C73107C4E8740036AC7A,
+                               AD85C72E07C4E8740036AC7A,
+                               AD85C72F07C4E8740036AC7A,
                        );
                        isa = PBXGroup;
                        name = Classes;
@@ -3231,9 +3399,9 @@
                                E87205F40692E3D00099CBBD,
                                E872058E0692E3D00099CBBD,
                                E872058F0692E3D00099CBBD,
+                               AD85C6E307C4E7230036AC7A,
                                E87205F50692E3D00099CBBD,
                                E87206A40692E3D10099CBBD,
-                               AD071CE306CD2AB800A9EEF4,
                        );
                        isa = PBXGroup;
                        refType = 4;
@@ -3579,6 +3747,8 @@
                E872064E0692E3D00099CBBD = {
                        children = (
                                E87206930692E3D10099CBBD,
+                               AD85C72807C4E8740036AC7A,
+                               AD85C73607C4E8740036AC7A,
                                ADDF4DB706DE0E5B00C4E7F8,
                                ADDF4DBA06DE0E6500C4E7F8,
                        );
@@ -3702,6 +3872,7 @@
                                E87206C20692E3D10099CBBD,
                                E87207E80692E3D20099CBBD,
                                AD6BCEE5069D77E9003664CD,
+                               AD85C76007C4E9100036AC7A,
                                E87206C30692E3D10099CBBD,
                                E87207EA0692E3D20099CBBD,
                                ADDF4B3006DCEAC800C4E7F8,

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index cb478a5c6a7276b95c03c4943581f393793bcded..98a60ae716b0567a7430c8568825494227c94248 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-17  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v0.9.115
+
+       * cycles.plist: added 'weekday' cycle
+
+       * UIxAppointmentEditor.m: added representation for 'BYDAY'
+
 2005-02-17  Helge Hess  <helge.hess@opengroupware.org>
 
        * fixed for removal of SOGoLogic (v0.9.114)

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 52b336fe2849ab88110c54969925f31c7c72d34b..49f7efbd8e56d920b32ddc1dc78c06d5288f2314 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -980,8 +980,14 @@
 
 @end /* UIxAppointmentEditor */
 
+
+/* HACK ALERT
+   This is a pretty ugly (unfortunately necessary) hack to map our limited
+   set of recurrence rules back to the popup list
+*/
 @interface iCalRecurrenceRule (UsedPrivates)
 - (NSString *)freq;
+- (NSString *)byDayList;
 @end /* iCalRecurrenceRule (UsedPrivates) */
 
 @implementation iCalRecurrenceRule (SOGoExtensions)
@@ -995,6 +1001,10 @@
   if ([self repeatInterval] != 1) {
     [s appendFormat:@";INTERVAL=%d", [self repeatInterval]];
   }
+  if (self->byDay.mask != 0) {
+    [s appendString:@";BYDAY="];
+    [s appendString:[self byDayList]];
+  }
   return s;
 }
 

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 91eb058ca95e74da175a8a5993d9d23e9d6a234f..5c6cbbd1a77abbbd57189f499f464d2a516f76ad 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,7 +1,8 @@
 # Version file
 
-SUBMINOR_VERSION:=113
+SUBMINOR_VERSION:=115
 
+# v0.9.115 requires NGiCal       v4.5.44
 # v0.9.113 requires libSOGo      v0.9.30
 # v0.9.112 requires SOGoLogic    v0.9.12
 # v0.9.107 requires WOExtensions v4.5.21

diff --git a/SOGo/UI/Scheduler/cycles.plist b/SOGo/UI/Scheduler/cycles.plist
index 32589b9510b6da73d5e0752d4ed5bfb70a0de7ca..1d79f13a6c13a3e02e56e8852d0d3e51f97ce883 100644 (file)
--- a/SOGo/UI/Scheduler/cycles.plist
+++ b/SOGo/UI/Scheduler/cycles.plist
@@ -22,6 +22,10 @@
     "label" = "cycle_monthly";
     "rule"  = "FREQ=MONTHLY";
   },
+  {
+    "label" = "cycle_weekday";
+    "rule"  = "FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR";
+  },
   {
     "label" = "cycle_yearly";
     "rule"  = "FREQ=YEARLY";