Julio García
26bd1b30fa
Revert "Merge pull request #164 from Zentyal/jgarcia/revert-merge-inverse"
...
This reverts commit 1404dbdb8872cbd9a45f
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
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
Ludovic Marcotte
0b6e3dc22d
Fix for bug #589
2014-09-25 09:25:13 -04:00
Ludovic Marcotte
1c60ab2337
Fix for bug #2889
2014-09-24 12:02:12 -04:00
Ludovic Marcotte
f4372af16d
Add over DAV a PARTSTAT if none is defined
2014-09-23 13:46:44 -04:00
Ludovic Marcotte
6ba85ee43a
Added some comments in the code
2014-09-22 11:38:07 -04:00
Ludovic Marcotte
a338b193ba
Fix for bug #2838
2014-09-17 19:45:44 -04:00
Ludovic Marcotte
11adf388cf
Cleaned the code and fixed #2894 while at it ...
2014-09-17 11:51:46 -04:00
Ludovic Marcotte
a4ab2942e8
Fix for bugs #2878 , #2879
2014-09-17 11:35:09 -04:00
Ludovic Marcotte
c5c2bfb7a6
Fixed iCal detection for 10.9 (and perhaps even 10.8)
2014-09-15 14:10:05 -04:00
Ludovic Marcotte
02b3de6465
Fix for bug #2326
2014-09-15 09:32:36 -04:00
Ludovic Marcotte
b8b3519a40
Initial support for multiple alarms and better iCal compatibility
2014-09-12 14:09:28 -04:00
Ludovic Marcotte
12a4fd05a2
Support for repetitive alarms and tasks
2014-09-12 08:34:15 -04:00
Francis Lachapelle
1dcf631ad6
Update translations
2014-09-09 15:50:39 -04:00
Alexandre Cloutier
9a380f711c
bugfix PreventInvitation
2014-09-09 11:30:00 -04:00
Ludovic Marcotte
b05fcc7d82
Fat commit to refactor the quick record generation
2014-07-30 14:51:00 -04:00
Francis Lachapelle
571322958a
Update fi, fr, de, and es_ES translations
2014-07-30 10:33:15 -04:00
Ludovic Marcotte
94f3246658
Improved error message when you cannot invite users
2014-07-29 10:36:20 -04:00
