Commit Graph

964 Commits

Author SHA1 Message Date
Ludovic Marcotte
c2e4f7441d (fix) double declaration of same method 2015-11-05 13:57:51 -05:00
Euan Thoms
eda84c7b5d Stage1b (v2 branch) of clang compiler warning patches. 2015-11-06 01:29:26 +08:00
extrafu
e428e74e6c Merge pull request #120 from zentyal/master
Fixes for OpenChange integration from Zentyal
2015-11-05 09:45:51 -05:00
Ludovic Marcotte
7a5e550510 (fix) manually added patch from PR#113 to avoid many "broken" commits 2015-11-05 09:36:11 -05:00
Euan Thoms
1425bb1c75 Stage 5 of clang compiler warning patches. 2015-11-04 08:41:49 -05:00
Euan Thoms
892bd693d7 Stage 3 of clang compiler warning patches.
Conflicts:

	UI/PreferencesUI/UIxJSONPreferences.m
2015-11-04 08:41:19 -05:00
Carlos Pérez-Aradros Herce
fb7e044bd3 Merge pull request #194 from zentyal/ejhernandez/skip-recurrence-id-without-dtstart
Ignore recurrence-id vevents without dtstart and outside date range
2015-10-07 17:49:56 +02:00
Enrique J. Hernández Blasco
eebf878e89 Ignore recurrence-id vevents without dtstart and outside date range
Happened in an imported vevent from Mozilla Thunderbird.

The crash was:

  Sep 14 15:49:38 sogod [21063]: <0x6442DBF8[SOGoAppointmentFolder]:personal> missing 'c_startdate' in record?
  Sep 14 15:49:38 sogod [21063]: <0x6442DBF8[SOGoAppointmentFolder]:personal> missing 'c_enddate' in record?
  2015-09-14 15:49:38.927 sogod[21063] NGCalendarDateRange.m:37  Assertion failed in NGCalendarDateRange(instance), method initWithStartDate:endDate:.  startDate MUST NOT be nil!
  EXCEPTION: <NSException: 0x7fb96b3c0ed8> NAME:NSInternalInconsistencyException REASON:NGCalendarDateRange.m:37  Assertion failed in NGCalendarDateRange(instance), method initWithStartDate:endDate:.  startDate MUST NOT be nil! INFO:(null)

The relevant ICS file lines are the following ones:

  BEGIN:VEVENT
  UID:040000008200E00074C5B7101A82E00800000000901646A7234BCE01000000000000000010000000E9152C8FF1C27D488C91967FAAFCC2B0
  RECURRENCE-ID:20140513T100000Z
  DURATION:PT1H
  CLASS:PUBLIC
  ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;CN=krsny >>
      Ann Thierry K:mailto:krsny@example.com
  END:VEVENT
2015-09-30 11:35:12 +02:00
Ludovic Marcotte
5409cb2927 (feat) moved FolderSynchronize code to GCS 2015-09-25 15:18:22 -04:00
Ludovic Marcotte
c8acba8f5a (fix) safe-guard against not-yet-created calendar of local users 2015-09-18 21:56:43 +02:00
Ludovic Marcotte
42f10e1929 (fix) safe-guard against not-yet-created calendar of local users 2015-09-10 20:07:42 -04:00
Luc Charland
2d33b01f31 Removing colons
Conflicts:

	UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
	UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
	UI/Templates/MailerUI/UIxMailMainFrame.wox
	UI/Templates/MainUI/SOGoRootPage.wox
	UI/Templates/PreferencesUI/UIxAccountEditor.wox
	UI/Templates/PreferencesUI/UIxPreferences.wox
	UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
	UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
	UI/Templates/SchedulerUI/UIxCalMainView.wox
	UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
	UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
	UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
	UI/WebServerResources/angular-material
2015-08-03 10:12:02 -04:00
Julio García
26bd1b30fa Revert "Merge pull request #164 from Zentyal/jgarcia/revert-merge-inverse"
This reverts commit 1404dbdb88, reversing
changes made to 72cbd9a45f.
2015-08-03 09:48:06 +02:00
Jesús García Sáez
3dc8cc78ea Revert merge from inverse
https://github.com/Zentyal/sogo/pull/150

Because the login on web with the use of outlook is broken after
including the DomainLessLogin feature
2015-07-28 12:37:33 +02:00
Francis Lachapelle
5c3cdda186 Add Chinese (Taiwan) translation 2015-07-23 11:14:08 -04:00
Francis Lachapelle
b6dee056ca (fix) Return value of [iCalPerson+SOGo uidInDomain:] 2015-07-23 08:46:08 -04:00
Francis Lachapelle
6830d6d930 Calendar module optimizations in multidomain setup 2015-07-22 17:23:02 -04:00
Francis Lachapelle
9430f40101 Add Slovenian translation 2015-07-22 17:22:26 -04:00
Julio García
8e047aaa9c Merge remote-tracking branch 'upstream/master' into merge-upstream
Conflicts:
	SoObjects/SOGo/SOGoUserManager.m
	Tools/SOGoToolRestore.m
2015-06-26 09:41:58 +02:00
Francis Lachapelle
82798ccb99 Change signature of [iCalAlarm alarmForEvent:..]
The first argument doesn't have to be a iCalRepeatableEntity; a simple
iCalEntity is enough.
2015-06-19 22:11:24 -04:00
Ludovic Marcotte
76360958a2 (fix) make sure PRODID is set to Inverse/SOGo when importing events 2015-06-09 13:38:10 -04:00
Ludovic Marcotte
24edb2bce8 (fix) code improvemnent to previous commits 2015-06-04 13:46:50 -04:00
Ludovic Marcotte
05232526a7 (fix) small improvement over previous commit 2015-06-04 11:46:59 -04:00
Ludovic Marcotte
8c4cb64246 (fix) now always enforce the organizer's default identity in appointments 2015-06-04 11:39:54 -04:00
Julio García
c61eca27a1 Merge branch 'upstream-master' into merge-from-upstream
Conflicts:
	SoObjects/SOGo/LDAPSource.m
	SoObjects/SOGo/SOGoUserManager.m
2015-06-02 12:27:20 +02:00
Juan Vallés
1ec53a063c oc-calendar: Improve check for appointment updates
The UID was being used to check if  the changes in an appointment had been made by
its organiser. In this case, the UID is the user name, without taking the domain into account.
The `owner` variable, however, is a full email address, so the comparison was never successful. This
caused the update notification mail not to be sent.
2015-06-01 17:09:48 +02:00
Ludovic Marcotte
dc48e05dd3 (feat) print event/task description in list view (#2881) 2015-05-13 13:12:15 -04:00
Francis Lachapelle
a1406d01e1 Initial Basque translation 2015-04-27 13:59:05 -04:00
Francis Lachapelle
07ac3f43fb Simplify some calls in SOGoAppointmentFolder.m 2015-04-27 10:39:09 -04:00
Jeroen Dekkers
84c199b95a Spelling fix: dictionnary -> dictionary 2015-04-26 13:33:03 +02:00
Ludovic Marcotte
3872af35d1 (fix) Improve prevent invitations error handling 2015-04-17 09:41:39 -04:00
Francis Lachapelle
cdc74e4984 Update translations 2015-04-09 09:06:19 -04:00
Francis Lachapelle
01857a9a47 [fix] Timezone of MS Exchange freebusy information 2015-04-02 11:53:03 -04:00
Francis Lachapelle
1d5ae27c99 Fix issues with freebusy (Web, busyOffHours) 2015-03-17 15:34:00 -04:00
Francis Lachapelle
8e0849029e Fix contacts lookup by UID
When looking for a specific contact UID, we no longer match a pattern
that could return multiple results. We search for the exact UID only.
2015-03-03 21:26:09 -05:00
Ludovic Marcotte
aae76dc4e6 Limit curl request for webcalendars to 60 seconds 2015-02-12 09:57:10 -05:00
Ludovic Marcotte
ab12c84887 More NSLog usage cleanups 2015-01-23 15:32:22 -05:00
Ludovic Marcotte
e9e3dd5646 fixed timezone calculation on recurring event 2015-01-15 15:29:02 -05:00
Ludovic Marcotte
24c6c8c91d Fix for bug #3054 2015-01-06 10:59:56 -05:00
Ludovic Marcotte
b1ac7a0cca MultipleBookingsFieldName can be set to -1 2015-01-05 13:49:28 -05:00
Ludovic Marcotte
204a62aa6a Improved comments in the code 2014-12-23 10:25:53 -05:00
Ludovic Marcotte
31cffdffd3 Fix freebusy info not always returned 2014-12-23 10:24:16 -05:00
Ludovic Marcotte
58f634bffe Cosmetic improvements to the code 2014-12-22 15:26:22 -05:00
Chris Rosenhain
0e56527e05 Change ACL modification text to non-gender specific terms 2014-12-19 11:04:05 +10:30
Ludovic Marcotte
cd70bec9fa Fix for bug #3008 2014-12-17 13:57:49 -05:00
Ludovic Marcotte
fb6ef3aa8a Now possible to set alarms on event invitations 2014-12-16 09:20:27 -05:00
Ludovic Marcotte
990f782b62 Allow including or not freebusy info from subscribed calendars 2014-12-11 10:01:21 -05:00
Francis Lachapelle
78ea147383 Update translations 2014-11-21 08:53:12 -05:00
Ludovic Marcotte
8cd72a8fda Fix borken ORGANIZER fields during the PUT action 2014-11-07 10:06:53 -05:00
Francis Lachapelle
4be2ddb793 Update translations 2014-09-26 14:23:58 -04:00