LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11219 commits 12 branches 116 tags 168 MiB
Commit graph

213 commits

Author SHA1 Message Date
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
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
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 3872af35d1 (fix) Improve prevent invitations error handling 2015-04-17 09:41:39 -04:00
Ludovic Marcotte b1ac7a0cca MultipleBookingsFieldName can be set to -1 2015-01-05 13:49:28 -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 fb6ef3aa8a Now possible to set alarms on event invitations 2014-12-16 09:20:27 -05:00
Ludovic Marcotte 8cd72a8fda Fix borken ORGANIZER fields during the PUT action 2014-11-07 10:06:53 -05: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 02b3de6465 Fix for bug #2326 2014-09-15 09:32:36 -04:00
Ludovic Marcotte 12a4fd05a2 Support for repetitive alarms and tasks 2014-09-12 08:34:15 -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
Ludovic Marcotte 94f3246658 Improved error message when you cannot invite users 2014-07-29 10:36:20 -04:00
Alexandre Cloutier c2027f072d indentation 2014-07-21 09:29:00 -04:00
Alexandre Cloutier ce6a31dd38 Adjust line of code to make it easier to read 2014-07-21 09:27:02 -04:00
Alexandre Cloutier eaec5a614d Change exception 403 to 409 and fix indentation in the javascript 2014-07-21 09:27:02 -04:00
Alexandre Cloutier 89d116363c replace ampersands with commas 2014-07-21 09:27:02 -04:00
Alexandre Cloutier 7c3e85f517 applied comments 2014-07-21 09:27:02 -04:00
Alexandre Cloutier 05fb7ae0c8 applied comments 2014-07-21 09:27:02 -04:00
Alexandre Cloutier b5c0363400 applied comment and refactor code 2014-07-21 09:27:02 -04:00
Alexandre Cloutier f0b8eb8dfb server side code to integrate the whitelist 2014-07-21 09:27:02 -04:00
Alexandre Cloutier 8ded5a8aaf Prevent Invitations and whitelist GUI 2014-07-21 09:27:02 -04:00
Ludovic Marcotte dbdb7d9051 Fix sending of METHOD:REPLY for DAV clients 2014-07-09 10:04:44 -04:00
Ludovic Marcotte 9fa0b42e19 Ignore SCHEDULE-AGENT for Thunderbird/Lightning 2014-06-20 11:25:02 -04:00
Francis Lachapelle fac9520f64 Fix update of participation status via CalDAV 
Fixes #2786
 2014-05-28 11:39:25 -04:00
Francis Lachapelle 3c3bebeee3 Fix resource conflict check when creating event 
Fixes #2541
 2014-03-14 09:23:55 -04:00
Francis Lachapelle 9ed1d57ec2 Fix auto-acceptation of resources as attendees 
Fixes #2541
 2014-02-24 16:07:55 -05:00
Francis Lachapelle 2b6428efd0 Always check resource conflict for new events 
Fixes #2541
 2014-02-24 07:57:11 -05:00
Francis Lachapelle 2f0419c18a Warn user when overbooking a resource 
Fixes #2541
 2014-02-03 11:03:23 -05:00
Ludovic Marcotte e4ce687e29 Update the content when the request is from Active Sync 2014-01-31 15:05:33 -05:00
Ludovic Marcotte 46815042c9 Fixed bug when modifying/deleting exceptions of recurring events. 2013-03-07 09:29:56 -05:00
Francis Lachapelle 5bbb5df2a8 Fix exceptions of recurring all-day events 2013-01-21 14:11:38 -05:00
Ludovic Marcotte c7fbcb0fc4 Fixed bug #1850 2013-01-09 14:08:37 -05:00
Francis Lachapelle 39632239f9 Fix partstat of attendee in his calendar 
Fixes #2155
 2013-01-03 10:15:25 -05:00
Ludovic Marcotte 988e91a638 We also remove the RSVP in the user's calendar during a PUT. 2012-12-05 08:31:35 -05:00
Francis Lachapelle 5500f99312 Remove conditions on RSVP 
Fixes #1850
 2012-11-30 15:11:03 -05:00
Ludovic Marcotte eed17fd95a Fix for bug #1850 and removed dead code/comments. 2012-11-30 13:57:55 -05:00
Ludovic Marcotte 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
Francis Lachapelle 9f586db2a0 Fixed error message according to translations 2012-09-24 14:27:22 -04:00
Ludovic Marcotte 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
Wolfgang Sourdeau 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
Wolfgang Sourdeau 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