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
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
3872af35d1
(fix) Improve prevent invitations error handling
2015-04-17 09:41:39 -04:00
b1ac7a0cca
MultipleBookingsFieldName can be set to -1
2015-01-05 13:49:28 -05:00
58f634bffe
Cosmetic improvements to the code
2014-12-22 15:26:22 -05:00
0e56527e05
Change ACL modification text to non-gender specific terms
2014-12-19 11:04:05 +10:30
fb6ef3aa8a
Now possible to set alarms on event invitations
2014-12-16 09:20:27 -05:00
8cd72a8fda
Fix borken ORGANIZER fields during the PUT action
2014-11-07 10:06:53 -05:00
1c60ab2337
Fix for bug #2889
2014-09-24 12:02:12 -04:00
f4372af16d
Add over DAV a PARTSTAT if none is defined
2014-09-23 13:46:44 -04:00
02b3de6465
Fix for bug #2326
2014-09-15 09:32:36 -04:00
12a4fd05a2
Support for repetitive alarms and tasks
2014-09-12 08:34:15 -04:00
9a380f711c
bugfix PreventInvitation
2014-09-09 11:30:00 -04:00
b05fcc7d82
Fat commit to refactor the quick record generation
2014-07-30 14:51:00 -04:00
94f3246658
Improved error message when you cannot invite users
2014-07-29 10:36:20 -04:00
c2027f072d
indentation
2014-07-21 09:29:00 -04:00
ce6a31dd38
Adjust line of code to make it easier to read
2014-07-21 09:27:02 -04:00
eaec5a614d
Change exception 403 to 409 and fix indentation in the javascript
2014-07-21 09:27:02 -04:00
89d116363c
replace ampersands with commas
2014-07-21 09:27:02 -04:00
7c3e85f517
applied comments
2014-07-21 09:27:02 -04:00
05fb7ae0c8
applied comments
2014-07-21 09:27:02 -04:00
b5c0363400
applied comment and refactor code
2014-07-21 09:27:02 -04:00
f0b8eb8dfb
server side code to integrate the whitelist
2014-07-21 09:27:02 -04:00
8ded5a8aaf
Prevent Invitations and whitelist GUI
2014-07-21 09:27:02 -04:00
dbdb7d9051
Fix sending of METHOD:REPLY for DAV clients
2014-07-09 10:04:44 -04:00
9fa0b42e19
Ignore SCHEDULE-AGENT for Thunderbird/Lightning
2014-06-20 11:25:02 -04:00
fac9520f64
Fix update of participation status via CalDAV
...
Fixes #2786
2014-05-28 11:39:25 -04:00
3c3bebeee3
Fix resource conflict check when creating event
...
Fixes #2541
2014-03-14 09:23:55 -04:00
9ed1d57ec2
Fix auto-acceptation of resources as attendees
...
Fixes #2541
2014-02-24 16:07:55 -05:00
2b6428efd0
Always check resource conflict for new events
...
Fixes #2541
2014-02-24 07:57:11 -05:00
2f0419c18a
Warn user when overbooking a resource
...
Fixes #2541
2014-02-03 11:03:23 -05:00
e4ce687e29
Update the content when the request is from Active Sync
2014-01-31 15:05:33 -05:00
46815042c9
Fixed bug when modifying/deleting exceptions of recurring events.
2013-03-07 09:29:56 -05:00
5bbb5df2a8
Fix exceptions of recurring all-day events
2013-01-21 14:11:38 -05:00
c7fbcb0fc4
Fixed bug #1850
2013-01-09 14:08:37 -05:00
39632239f9
Fix partstat of attendee in his calendar
...
Fixes #2155
2013-01-03 10:15:25 -05:00
988e91a638
We also remove the RSVP in the user's calendar during a PUT.
2012-12-05 08:31:35 -05:00
5500f99312
Remove conditions on RSVP
...
Fixes #1850
2012-11-30 15:11:03 -05:00
eed17fd95a
Fix for bug #1850 and removed dead code/comments.
2012-11-30 13:57:55 -05:00
51192dd533
We now order correctly CardGroups - especially for calendars.
...
This is to avoid a bug in BlackBerry devices where the METHOD
must be placed BEFORE any vevent/vtimezone objects, otherwise
the invitation objects are never recognized, and rather shown
as a "application/x-rimdevicecalendar" attachment.
2012-11-13 13:58:05 -05:00
9f586db2a0
Fixed error message according to translations
2012-09-24 14:27:22 -04:00
1abc40c127
See ChangeLog
...
Monotone-Parent: f489c387ef5efde7f9beee4a9b97ecf85275ffb2
Monotone-Revision: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-18T19:05:58
2012-07-18 19:05:58 +00:00
91d9836d80
Monotone-Parent: 471d12add6428916fe0b3d9938d1362d062f1de1
...
Monotone-Revision: 22bcd9c626e305661b31c70a49c93352266c2dc8
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-14T02:41:29
2012-07-14 02:41:29 +00:00
6cd17dc9b8
Monotone-Parent: 493dd9034b71a42f4fc3df70a482872a7c50cc22
...
Monotone-Revision: f071f53cbc4a39b0b852c58e7e57332f05ef1e0c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:59:09
2012-07-13 20:59:09 +00:00
ee723f9694
fixed neglected warnings
...
Monotone-Parent: 61a57c3431ce88c941b644d5a0ce21abb1f82f8c
Monotone-Revision: 493dd9034b71a42f4fc3df70a482872a7c50cc22
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:37:16
2012-07-13 20:37:16 +00:00
82f3f1b3d9
Monotone-Parent: 9475f39d99549bfa74e7f88be7e54d9650beb0d5
...
Monotone-Revision: d953e1b8cae8bcdf2a3cff4219ea365af8391941
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:31:41
2012-07-13 20:31:41 +00:00
c8c0030518
See ChangeLog
...
Monotone-Parent: 236aeb7125be0df2f27ec6c73f05a3d74a71ee71
Monotone-Revision: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:06:41
2012-07-11 14:06:41 +00:00
03a125ea1f
See ChangeLog
...
Monotone-Parent: 801c13ca7d8e3a2f3e502ee658399b458681bcab
Monotone-Revision: cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-10T00:29:13
2012-07-10 00:29:13 +00:00
38b1cbd014
* SoObjects/Appointments/SOGoAppointmentObject.m
...
(PUTAction:): detect conflicting event UID and
deny the request accordingly.
* Tests/Integration/test-caldav-scheduling.py:
new test for bug #1853
Monotone-Parent: 32e30de409bdd4e864d0c454e1939c809fb8edcd
Monotone-Revision: a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-27T16:06:20
2012-06-27 16:06:20 +00:00
b88d623ad3
See ChangeLog
...
Monotone-Parent: b532b841f572a64aa9b471da32a51bb939539334
Monotone-Revision: 7658ec99af152b2743393d20c3c4f2c23610ec4c
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-20T14:05:40
2012-06-20 14:05:40 +00:00
Julio García
Juan Vallés
Ludovic Marcotte
Chris Rosenhain
Alexandre Cloutier
Francis Lachapelle
Wolfgang Sourdeau
Jean Raby