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
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
Ludovic Marcotte
f6ef94a631
improved handling of SOGoSubscriptionFolderFormat
2014-07-24 12:48:03 -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
extrafu
8191576361
Merge pull request #41 from alexcloutier/fix/displayTaskNumber
...
Display the number of active tasks in calendar view
2014-06-27 09:07:07 -04:00
Alexandre Cloutier
7a69bc46eb
applied comments
2014-06-26 16:42:05 -04:00
Ludovic Marcotte
9fa0b42e19
Ignore SCHEDULE-AGENT for Thunderbird/Lightning
2014-06-20 11:25:02 -04:00
Ludovic Marcotte
e048346cb7
Include, in our private NS, all ACLs defined on a calendar collectiob
2014-06-19 16:08:15 -04:00
Alexandre Cloutier
de2ee2322a
Change the NSString with NSNumber and add some JavaScript
2014-06-11 10:24:04 -04:00
Alexandre Cloutier
43ac57b671
display the number of active tasks in calendar view
2014-06-10 16:18:12 -04:00
Francis Lachapelle
fac9520f64
Fix update of participation status via CalDAV
...
Fixes #2786
2014-05-28 11:39:25 -04:00
Francis Lachapelle
6b72a8d126
Merge branch 'feat/searchCapabilities'
2014-05-16 16:28:43 -04:00
Ludovic Marcotte
18443de9bf
Updated copyright info
2014-05-14 09:58:05 -04:00
Alexandre Cloutier
593b44ed01
forgotten code
2014-05-08 17:53:20 -04:00
Ludovic Marcotte
3629670fca
Fix for #2489
2014-04-08 15:35:36 -04:00
Ludovic Marcotte
3e221253ad
Fix for feature #1496
2014-04-08 11:19:53 -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
Ludovic Marcotte
4ca8b9d0aa
Copyright updates
2014-02-17 11:30:00 -05:00
Ludovic Marcotte
75c8362df8
Avoid over-using LDAP connections when decomposing groups
2014-02-14 16:39:26 -05:00
Francis Lachapelle
eee5beb698
Add message-id header to appointment notification
...
Fixes #2535
2014-02-07 10:52:06 -05:00
Francis Lachapelle
aeb712083a
Fix static array retain
2014-02-06 14:37:43 -05:00
Francis Lachapelle
2c678101fc
Fix handling of ACLs with multiple groups
...
Fixes #1854
2014-02-06 14:23:09 -05:00
Ludovic Marcotte
9311f05cc0
Fixed the non-filtering of recurrence exceptions
2014-02-05 17:30:34 -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
Jean Raby
d1a384e539
Send IMIP responses if the event is in the future
...
Avoids sending responses for past events when importing events into
a new calendar from thunderbird or any DAV client.
2014-01-22 11:40:04 -05:00
Ludovic Marcotte
762b841249
Avoid crashes on broken configurations
2014-01-21 16:40:57 -05:00
Ludovic Marcotte
a24d809e40
Minor code/copyright/authors cleanups
2014-01-09 21:06:31 -05:00
Francis Lachapelle
73141a645e
Update translations
2013-11-06 21:36:09 -05:00
Ludovic Marcotte
be1bcf3c9b
Fix for bug #2461
2013-10-22 11:25:24 -04:00
Ludovic Marcotte
05990e9a14
Fix for bug 2007
2013-09-30 10:50:27 -04:00
Ludovic Marcotte
7166f5a597
Fix for bug #2399
2013-09-25 16:02:13 -04:00
Jean Raby
906985c1f3
Call MSExchangeHostname on SOGoDNSource only
...
Fixes #2418
2013-09-13 11:19:44 -04:00
Francis Lachapelle
69b0f9fcbf
Mail notifications: Escape HTML in wox templates
...
We don't escape the values in the classes but in the templates.
2013-09-03 12:05:13 -04:00
Francis Lachapelle
1c82af8842
Updated pt_BR, cs, nl, de, pl and ru translations
2013-07-19 11:29:10 -04:00
Ludovic Marcotte
e08ebd2390
Fix for bugs #2368 and #2369
2013-07-16 11:31:08 -04:00
Jean Raby
a2a89e8720
Fix loading of MSExchangeFreeBusySOAPResponseMap
2013-06-26 16:55:39 -04:00
Ludovic Marcotte
5304461e4c
now possible to see who created a event/task in a delegated calendar
2013-06-19 10:23:47 -04:00
Ludovic Marcotte
47a3f1a19d
toggle to send or not notifications
2013-06-18 14:14:42 -04:00
Ludovic Marcotte
4ec19d46fa
Removed left-over code that would cause the logic from bug #2035 to not work.
2013-04-25 14:46:00 -04:00
Francis Lachapelle
30f10ee8f0
Update translations
2013-04-11 11:30:23 -04:00
Francis Lachapelle
37a6f82659
Initial Arabic translation
2013-04-08 11:05:45 -04:00
Francis Lachapelle
d12c651d59
New system default SOGoEncryptionKey
...
To be used to encrypt the passwords of remote Web calendars when
SOGoTrustProxyAuthentication is enabled.
2013-03-11 09:34:36 -04:00
Ludovic Marcotte
46815042c9
Fixed bug when modifying/deleting exceptions of recurring events.
2013-03-07 09:29:56 -05:00
Francis Lachapelle
efb45bfba6
Fix issue with exceptions in repeating events
...
Fixed the display of an exception when its recurrence id is outside the
current view.
2013-02-15 15:17:08 -05:00
Francis Lachapelle
c13c389ae5
Update Danish translation
2013-02-12 08:42:47 -05:00
Ludovic Marcotte
8f33197c59
Fix for bug #1991 .
2013-01-25 10:21:28 -05:00
Francis Lachapelle
5bbb5df2a8
Fix exceptions of recurring all-day events
2013-01-21 14:11:38 -05:00
Francis Lachapelle
58dc0343bb
Merge remote-tracking branch 'origin/master'
2013-01-18 09:38:27 -05:00
Ludovic Marcotte
814e2c0556
Fix for bug #2129
2013-01-18 09:18:10 -05:00
Francis Lachapelle
e279db6431
Update Finnish translation
2013-01-17 10:12:26 -05:00
Francis Lachapelle
775a8421d5
Initial Finnish translation
2013-01-16 10:54:16 -05:00
Francis Lachapelle
0216658674
Update translations
...
- Catalan
- Czech
- Dutch
- Hungarian
- Polish
- Slovak
- SpanishArgentina
- SpanishSpain
2013-01-15 11:11:50 -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
Francis Lachapelle
026ffd8888
Update translations
2012-12-06 10:31:15 -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
f0f206b8bb
Merge branch 'master' of https://github.com/inverse-inc/sogo
2012-11-29 15:50:07 -05:00
Ludovic Marcotte
73ff981d4f
Fixed the method that returns the current-user-principal.
2012-11-29 15:49:32 -05:00
Francis Lachapelle
ce36e80d6b
Initial Slovak translation
2012-11-29 14:40:46 -05:00
Ludovic Marcotte
1bf2509d1e
Fix for bug #2115 .
2012-11-21 11:56:24 -05:00
Ludovic Marcotte
a1d092cab0
Fix for #2093 .
2012-11-19 14:20:13 -05:00
Ludovic Marcotte
3f8d374d63
Fix for bug #2035
2012-11-17 15:38:29 -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
2fdf4f5535
Fix typos in Spanish (Spain) translation
2012-10-26 22:31:14 -04:00
Francis Lachapelle
31be93ef2e
Update translation
...
- Dutch
- French
- German
- Hungarian
- SpanishArgentina
- SpanishSpain
2012-10-23 14:04:15 -04:00
Francis Lachapelle
60b078f550
Fix double backslash in Polish translation
2012-10-23 07:13:14 -04:00
Francis Lachapelle
46a4cd3d4e
Updated Polish translation
2012-10-22 21:44:20 -04:00
Wolfgang Sourdeau
6d8c328910
Fixed most build warnings
2012-10-22 10:09:13 -04:00
Wolfgang Sourdeau
5a76790418
Added support for SMTP PLAIN authentication
2012-10-16 16:56:48 -04:00
Luc Charland
854985e124
Fixed bug #1477 Add decision in subject header
2012-10-11 09:37:01 -04:00
Francis Lachapelle
b734090ce5
Updated translations
...
- Catalan
- Dutch
- French
- German
- Hungarian
- Russian
- Spanish (Argentina)
- Spanish (Spain)
2012-09-26 09:23:10 -04:00
Francis Lachapelle
7e79b79c04
Improvement over previous commit
2012-09-26 07:26:30 -04:00
Francis Lachapelle
ddc03a9391
Log entry when loading remote web calendar
2012-09-26 07:20:30 -04:00
Francis Lachapelle
9f586db2a0
Fixed error message according to translations
2012-09-24 14:27:22 -04:00
Ludovic Marcotte
d024a62e98
Simplified even more the previous commit.
2012-09-24 13:26:20 -04:00
Ludovic Marcotte
a6b07cd158
Fixed #1989 (clang bug with function definition within method)
2012-09-24 13:16:14 -04:00
Luc Charland
26c97fe4ed
Fixed bug 1930
...
Notification e-mail are not available on transifex for translate
This simply needed to be passed to the translation before returning.
2012-09-19 16:11:17 -04:00
Luc Charland
491089e194
Fixed bug 1929: Notifications about Modifications
...
Notifications about Modifications don't show the Calendar name.
When an email notification is selected by the user, the calendar name
from which the event was changed is added to the email.
Needs to be translated.
2012-09-19 10:35:05 -04:00
Francis Lachapelle
bc0bd77d45
Updated Spanish (Spain) translation
...
Monotone-Parent: 6da35bf3e764354a5472752070138259d909ae56
Monotone-Revision: f1882bcb770dc06a864552a193dba1c427913841
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-28T13:30:34
2012-08-28 13:30:34 +00:00
Francis Lachapelle
925412ffcf
Updated Spanish (Argentina) translation
...
Monotone-Parent: 0bf69082b57290bcfab6429fbda6b1c808ecc1df
Monotone-Revision: 6da35bf3e764354a5472752070138259d909ae56
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-28T13:27:29
2012-08-28 13:27:29 +00:00
Francis Lachapelle
adcc2464bd
Updated Russian translation
...
Monotone-Parent: ce4b02a21372a88331d55fd8d38ae9c1eb7bf74c
Monotone-Revision: 0bf69082b57290bcfab6429fbda6b1c808ecc1df
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-28T13:16:22
2012-08-28 13:16:22 +00:00
Francis Lachapelle
23ad5d346b
Updated Hungarian translation
...
Monotone-Parent: bb39c11ed393374b768c109eaa578fac70637cb5
Monotone-Revision: ce4b02a21372a88331d55fd8d38ae9c1eb7bf74c
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-28T13:13:35
2012-08-28 13:13:35 +00:00
Francis Lachapelle
9e7ba6d66a
Updated German translation
...
Monotone-Parent: 6050d42b2809f4f4663038de175b17515fd36a91
Monotone-Revision: bb39c11ed393374b768c109eaa578fac70637cb5
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-28T13:11:44
2012-08-28 13:11:44 +00:00