9cb1b899b0
Merge branch 'master' into fix-some-warnings
...
Conflicts:
UI/Scheduler/UIxAppointmentActions.m
2016-02-16 14:32:50 -05:00
4c01417690
Handle resource limits in the Web interface
...
See @d7b010
2016-02-16 12:40:59 -05:00
a5cc2bb5d5
Merge branch 'master' into fix-some-warnings
...
Conflicts:
SoObjects/Appointments/SOGoAppointmentObject.m
2016-02-15 11:23:27 -05:00
7c25b53fdf
Remove pointless #imports from .m and .h files
...
This was done with a brute-force approach, ensuring no additional
warnings from GCC 4.9 under x86_64.
2016-02-13 16:11:52 -05:00
132234cc19
(fix) don't consider default ACLs for attendees
2016-02-12 14:40:51 -05:00
d7b010526b
(feat) warn when double-booking attendees and offer force save option
2016-02-11 10:54:07 -05:00
8c99fdc99a
(fix) allow resources to prevent invitations ( fixes #3410 )
2016-02-10 15:03:20 -05:00
3404ae8105
(fix) carry over delegatedFrom too
2015-12-15 16:28:58 -05:00
76f0ec9ae0
(fix) carry over the delegatedTo, not only the part stat
2015-12-15 16:28:13 -05:00
0f578876af
(fix) small fix over previous commit
2015-12-15 11:15:28 -05:00
cfb741fc9f
(fix) avoid duplicating attendees when accepting event using a different identity over CalDAV
...
Conflicts:
SoObjects/Appointments/iCalEntityObject+SOGo.h
2015-12-15 11:12:59 -05:00
cc1555af22
Merge pull request #108 from ethoms/clang-warnings-stage1
...
Stage1 of clang compiler warning patches.
2015-11-04 13:40:09 -05:00
36c1ba88a5
Stage 5 of clang compiler warning patches.
2015-11-04 05:28:03 +08:00
3c62cc744e
Stage 1 of clang compiler warning patches.
2015-10-31 14:10:03 +08:00
9465fbad4b
(obj-c) Indentation
2015-08-06 17:39:00 -04:00
613f05ac02
Calendar module optimizations in multidomain setup
...
Conflicts:
NEWS
UI/Common/UIxUserRightsEditor.m
2015-07-23 12:06:54 -04:00
8650492989
Applied PR90 as a patch due to too-many merge conflicts when cherry-picking
2015-07-22 09:05:17 -04:00
bbc5a2a048
Fix compilation warning of SOGoAppointmentObject.m
2015-06-12 10:50:02 -04:00
24edb2bce8
(fix) code improvemnent to previous commits
2015-06-04 13:46:50 -04:00
05232526a7
(fix) small improvement over previous commit
2015-06-04 11:46:59 -04:00
8c4cb64246
(fix) now always enforce the organizer's default identity in appointments
2015-06-04 11:39:54 -04: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
9b814bc58c
* SoObjects/Appointments/SOGoAppointmentObject.m (_handleResourcesConflicts):
...
Deny access to resources if the resource's ACL don't allow the organizer
to read its freebusy info.
Without this, sogo would always auto-accept invitations from 'unprivileged'
users, potentially bypassing the multiplebooking parameter.
Monotone-Parent: 8ac367dca61f0a4a66df59c7c786dd0f5016050d
Monotone-Revision: 1f2bd4b4727f3158ab77ca76322cd555967d326a
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-15T14:36:52
2012-05-15 14:36:52 +00:00
6ad52fe047
* SoObjects/Appointments/SOGoAppointmentObject.m (PUTAction):
...
Delete bitrotten code that could end up duplicating attendees.
Behavior exposed by the new caldav tests
* Tests/Integration/config.py.in
* Tests/Integration/test-caldav-scheduling.py
* Tests/Integration/test-ical.py
* Tests/Integration/test-davacl.py:
Use an unprivileged webdavclient where possible.
This would have uncovered the resources calendar autocreation bug.
* Tests/Integration/test-caldav-scheduling.py:
New tests to excercise somewhat fragile code in dav autoscheduling.
Monotone-Parent: 82335b9404ce69f30e311f831868f8d13e598a46
Monotone-Revision: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T16:20:45
2012-05-11 16:20:45 +00:00
c774314b1b
See ChangeLog
...
Monotone-Parent: cd39fe0df424d1e5afd5dcfa4b1c94ad707fed24
Monotone-Revision: fc9e1cf3f4988bae25443b6d072add3f344d30f0
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-24T11:47:32
2012-04-24 11:47:32 +00:00
63560c5678
See ChangeLog
...
Monotone-Parent: e290d09c6fe813e82f2e06c1cfcaab7ba2a5b3ac
Monotone-Revision: 64488d85ff930e32a07eda3c4ce9ae01e7513fc8
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-23T12:58:56
2012-04-23 12:58:56 +00:00
0c0cbc19f0
See ChangeLog
...
Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168
Monotone-Revision: 5af155533446328556c907456566939affd0ae8f
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-19T16:29:43
2012-04-19 16:29:43 +00:00
dbd99fac84
See ChangeLog
...
Monotone-Parent: 8ff4e6d2b420caded81d7317c1170ff6ce35249e
Monotone-Revision: 2b7803f8e993e96ff4490197722ef0a2a5faad70
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-18T17:39:11
2012-04-18 17:39:11 +00:00
1c9a3b5eda
Monotone-Parent: 5ef3839ff2c5bebdaca10693e61a632e208289c6
...
Monotone-Revision: 84bd96711bb8cbccbe1b4ca017c6310b86d64421
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-23T23:27:59
Monotone-Branch: ca.inverse.sogo
2012-02-23 23:27:59 +00:00
120218b7f6
Monotone-Parent: af376f6da2887cfa1d81ea2a63d137713304b757
...
Monotone-Revision: b71a73ffd81fa207977122c92575c810ad315108
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-03T15:40:36
2012-02-03 15:40:36 +00:00
322b21c3d7
Monotone-Parent: f5ba6db440f5a8ba817af65dea12b4a616fdfe71
...
Monotone-Revision: 134ea580b291c807ad6e5ffe49e8525c1539cbb2
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:42:33
2012-01-10 17:42:33 +00:00
0b5b8b0a76
See ChangeLog
...
Monotone-Parent: 4822220bb92ce7ebcbd47af90d5aad37bb750ed0
Monotone-Revision: a116eb415302838655699ddf23cdf5a3930aef29
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-10-03T19:00:50
Monotone-Branch: ca.inverse.sogo
2011-10-03 19:00:50 +00:00
f8df2a3d78
Monotone-Parent: c36231c003dae4dd707b2d04f4f1442c04445da1
...
Monotone-Revision: e41874875e49863ccd11d5bd0c7107d5d2a253a6
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-08-08T18:50:34
Monotone-Branch: ca.inverse.sogo
2011-08-08 18:50:34 +00:00
a40357f9c4
See ChangeLogs
...
Monotone-Parent: 5c6353cb6270d51a457d46a8fe98dadae4f37193
Monotone-Revision: c0509d9d92c69255be6d27969b4f578739e78c7f
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-08T00:22:10
Monotone-Branch: ca.inverse.sogo
2011-07-08 00:22:10 +00:00
05e20a6751
See ChangeLog
...
Monotone-Parent: 0a26aa3104394fc27aedec6025fb6d01075058b4
Monotone-Revision: 6a276a3a3ea0a9b3f1f8f69464b4b6058b639b18
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-07-05T15:08:44
Monotone-Branch: ca.inverse.sogo
2011-07-05 15:08:44 +00:00
decbce9f27
See ChangeLog
...
Monotone-Parent: eec300be835f03b3e7780d528e6c75977cf6254b
Monotone-Revision: 0a26aa3104394fc27aedec6025fb6d01075058b4
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-07-05T13:24:25
Monotone-Branch: ca.inverse.sogo
2011-07-05 13:24:25 +00:00
7dabb5bd71
See ChangeLog
...
Monotone-Parent: 40d6cb69296008deaa81f30c913c4413c0aa6997
Monotone-Revision: 5ff23472b81083bb4eaded5ffb57c52c92ce8f00
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-07-02T13:22:34
Monotone-Branch: ca.inverse.sogo
2011-07-02 13:22:34 +00:00
d8f21e6b6e
Indentation.
...
Monotone-Parent: 3678cc0ded3649869eacde348ab4532dac822b2b
Monotone-Revision: bbd81440c9e99bd7320191a273476ee80fb5b10b
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-06-01T17:49:12
Monotone-Branch: ca.inverse.sogo
2011-06-01 17:49:12 +00:00
12856abe4d
See ChangeLog
...
Monotone-Parent: be9e28d5d42ed05605b27d2127cf29b07678495b
Monotone-Revision: 5de6a9584cf27a2c1dad8d1ab8b84fc9ddab2720
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-04-25T10:31:08
Monotone-Branch: ca.inverse.sogo
2011-04-25 10:31:08 +00:00
037e2e6c1f
See ChangeLog.
...
Monotone-Parent: ed8a21d5648d8bc72dc33ad272987d8963be1285
Monotone-Revision: 12a15fd8afcf3963e3ec84c6a630972534773465
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-16T01:35:06
Monotone-Branch: ca.inverse.sogo
2011-04-16 01:35:06 +00:00
dadedfa295
See ChangeLog
...
Monotone-Parent: 20415379d4ad22b602692f50041a0eb207e1d1fb
Monotone-Revision: c9f767434992867f4e642881a1161a8a606c338f
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-01T18:55:02
Monotone-Branch: ca.inverse.sogo
2011-04-01 18:55:02 +00:00
6b3d99424a
See ChangeLog.
...
Monotone-Parent: 5768aec2a733241a4cb94db69e98b57603adb638
Monotone-Revision: 553f303f1f7a6910069af8e49e3926e86bece4b7
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-29T23:25:40
Monotone-Branch: ca.inverse.sogo
2011-03-29 23:25:40 +00:00
9197155933
See ChangeLog
...
Monotone-Parent: 11c0941cac8926d96e43efabe282a5d3d549d0c9
Monotone-Revision: 3931b3fc847a4504339f11bcd48a3ea417c822b0
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-03-23T20:14:33
Monotone-Branch: ca.inverse.sogo
2011-03-23 20:14:33 +00:00
27d987fa50
Monotone-Parent: e14d9f62a6ec2d7e8788ee6cf73d4a47312b8531
...
Monotone-Revision: de4f10a9425b25e3d10193bba4c7dc640e4d4ba2
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-02-24T20:18:21
Monotone-Branch: ca.inverse.sogo
2011-02-24 20:18:21 +00:00
64081b8fa7
See Changelog.
...
Monotone-Parent: 8f58a8aa696d8fbbb82f1cd571800676a04b96af
Monotone-Revision: b593ce96638476fad98d678453ca6af6112169fb
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-01-14T02:54:33
Monotone-Branch: ca.inverse.sogo
2011-01-14 02:54:33 +00:00
6844b99642
Monotone-Parent: 1be014aa5bfe1a03fbebbd16c6bcdfcf7d7ecf9c
...
Monotone-Revision: e8f76b9dd2119efe8f7197fb78f29b022c901b71
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-18T16:24:47
Monotone-Branch: ca.inverse.sogo
2010-11-18 16:24:47 +00:00
5840f2a4a2
Monotone-Parent: c7c119b8830f974eae43854ab61fdff9fc0c72d3
...
Monotone-Revision: 5c82b99d5706b81d029752ca424be6a61a7cc96c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-19T17:40:28
Monotone-Branch: ca.inverse.sogo
2010-08-19 17:40:28 +00:00
f2e91c084c
Removed unused variable
...
Monotone-Parent: 996598fce70f35fe733debbc06cb1ae8c677afe1
Monotone-Revision: b007aa339001e9c21adeaad9c72c7fdfc845e9b7
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-17T14:30:09
2010-08-17 14:30:09 +00:00
9596b26d03
Added SCHEDULE-AGENT support on the organizer to not send invitation requests/updates when not necessary
...
Monotone-Parent: f6a0b62965278336b461dac36045bfae5fc07f0a
Monotone-Revision: 996598fce70f35fe733debbc06cb1ae8c677afe1
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-17T14:10:01
2010-08-17 14:10:01 +00:00
cae4fb16bd
See ChangeLog
...
Monotone-Parent: a8ea4c892d2814713d84f3190401e5d4381c4701
Monotone-Revision: 2be823800b3a3aa4e40219b1fbfa546bd5cc1db3
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-08-11T14:52:11
2010-08-11 14:52:11 +00:00
9fb92479d6
Monotone-Parent: 4afc986f42a77cc538d46f41f372499f825fa9c4
...
Monotone-Revision: 6920d8cb7745acb5c4574fa10c4101bc1a87cca7
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-07-16T15:03:16
Monotone-Branch: ca.inverse.sogo
2010-07-16 15:03:16 +00:00
c6532f9d73
Monotone-Parent: e12c6a7ac6a504dcbea24890a7be8b72b8dc91a4
...
Monotone-Revision: a3bdc2441cad158c03e3bb175dd766004db14021
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-07-15T17:05:29
Monotone-Branch: ca.inverse.sogo
2010-07-15 17:05:29 +00:00
f7799b9cf8
Monotone-Parent: de6d837f5c2b62b4ad465872fdc54602b3d1009c
...
Monotone-Revision: 1ccd34fd9ea99e675935d745db7e70d19716428a
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-05-05T13:56:19
Monotone-Branch: ca.inverse.sogo
2010-05-05 13:56:19 +00:00
Patrice Levesque
Francis Lachapelle
Ludovic Marcotte
Euan Thoms
Chris Rosenhain
Alexandre Cloutier
Wolfgang Sourdeau
Jean Raby