Francis Lachapelle
b1590f6b2e
Update translations
2016-01-18 09:51:22 -05:00
extrafu
a503b34d7a
Merge pull request #184 from zentyal/master
...
Fixes from Zentyal since 2015/12/30
2016-01-18 09:10:35 -05:00
Francis Lachapelle
5c58299458
Update Russian translation
2016-01-14 09:10:56 -05:00
Ludovic Marcotte
490043b2e1
(fix) we now follow 301 redirects when fetching ICS calendars
2016-01-08 12:02:33 -05:00
Enrique J. Hernández
2ad00f8cef
Merge pull request #229 from zentyal/jvalles/missing-appointment-notifications
...
Add the domain in the `uidInDomain` method
2016-01-07 16:42:03 +01:00
Ludovic Marcotte
e009af6864
Merge branch 'v2' of https://github.com/inverse-inc/sogo into v2
2015-12-30 09:06:13 -05:00
Enrique J. Hernández
8b04a468c2
Merge pull request #223 from inverse-inc/v2
...
SOGo v2.3.4
2015-12-29 22:41:02 +01:00
Juan Vallés
ccd9e385a0
Add the domain in the uidInDomain
method
...
This method is used to get the login and we weren't returning
the domain, which led to problems when creating appointments
on multidomain environments like, for instance, not sending
the invitation mails.
2015-12-29 12:19:07 +01:00
Ludovic Marcotte
7c460b694e
Enable new code.
2015-12-16 08:32:20 -05:00
Ludovic Marcotte
29f2d960a7
Enable old code.
2015-12-15 16:15:48 -05:00
Ludovic Marcotte
225fe847a7
Disabled today's code for now. It requires more testing.
2015-12-15 16:12:17 -05:00
Ludovic Marcotte
720b1d5ab5
(fix) carry over delegatedFrom too
2015-12-15 15:21:33 -05:00
Ludovic Marcotte
28bd4ca318
(fix) carry over the delegatedTo, not only the part stat
2015-12-15 15:05:40 -05:00
Francis Lachapelle
37f29c06ea
Localization
2015-12-15 13:18:06 -05:00
Ludovic Marcotte
248892c394
(fix) small fix over previous commit
2015-12-15 11:14:58 -05:00
Ludovic Marcotte
b4e4b9c29f
(fix) avoid duplicating attendees when accepting event using a different identity over CalDAV
2015-12-15 11:08:59 -05:00
Ludovic Marcotte
2755a83e65
(fix) remove trailing semicolon everywhere
2015-12-03 15:02:01 -05:00
Francis Lachapelle
9936477f07
Update translations
2015-12-03 13:09:24 -05:00
Ludovic Marcotte
5a3cafbbb0
(fix) prevent characters in calendar component UID causing issues during import process
2015-12-01 09:26:52 -05:00
Enrique J. Hernández
f64b324133
Merge pull request #203 from inverse-inc/v2
...
Merge from upstream
2015-11-23 12:51:52 +01:00
Francis Lachapelle
f58554a700
Add Macedonian translation
2015-11-11 09:46:01 -05:00
Francis Lachapelle
76b8de1805
Add Portuguese translation
2015-11-10 16:33:11 -05:00
Enrique J. Hernández Blasco
77bba8e5ea
Use application context when initialising quick tables ACLs
...
As the stored context from initialisation may have changed
by `setContext` by other operations when acting as a OpenChange
library. This would make having a login set to nil and forcing
a NSException when it attempts to set a nil key at
[SOGoAppointmentFolder:roleForComponentsWithAccessClass:forUser]
inside [SOGoAppointmentFolder:initializeQuickTablesAclsInContext].
2015-11-09 11:30:03 +01:00
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