Patrice Levesque
9cb1b899b0
Merge branch 'master' into fix-some-warnings
...
Conflicts:
UI/Scheduler/UIxAppointmentActions.m
2016-02-16 14:32:50 -05:00
Francis Lachapelle
4c01417690
Handle resource limits in the Web interface
...
See @d7b010
2016-02-16 12:40:59 -05:00
Francis Lachapelle
d56d9f8b08
Handle attendee conflicts in the Web interface
...
See @d7b010
2016-02-15 16:03:16 -05:00
Patrice Levesque
a5cc2bb5d5
Merge branch 'master' into fix-some-warnings
...
Conflicts:
SoObjects/Appointments/SOGoAppointmentObject.m
2016-02-15 11:23:27 -05:00
Patrice Levesque
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
Ludovic Marcotte
132234cc19
(fix) don't consider default ACLs for attendees
2016-02-12 14:40:51 -05:00
Ludovic Marcotte
d7b010526b
(feat) warn when double-booking attendees and offer force save option
2016-02-11 10:54:07 -05:00
Ludovic Marcotte
8c99fdc99a
(fix) allow resources to prevent invitations ( fixes #3410 )
2016-02-10 15:03:20 -05:00
Patrice Levesque
296d510572
Merge branch 'missing-prototypes' into fix-some-warnings
...
Avoid compilation errors when using GCC with -Werror=missing-declarations
and -Werror=missing-prototypes (those flags are wanted to track and fix
further warnings).
2016-02-10 14:58:28 -05:00
Patrice Levesque
51cbb980ad
Add some missing preprocessing #import directives
...
Fixes most GCC warnings of form:
warning: @interface of class ‘MyClass’ not found
2016-02-10 14:46:11 -05:00
Patrice Levesque
5539b7a823
Add missing header prototypes
...
Fixes compiling errors with GCC using -Werror=missing-prototypes.
2016-02-08 16:14:33 -05:00
Francis Lachapelle
d4ab5dd21b
Update translations
2016-02-04 14:01:31 -05:00
Francis Lachapelle
a8845d262f
Fix frequency detection of recurrence rule
2016-02-04 09:20:11 -05:00
Francis Lachapelle
bd4f42b948
Fix comparisons with NSNotFound
...
Fixes #3472
2016-02-03 13:54:08 -05:00
Francis Lachapelle
b265de91fd
Add Croatian translation
2016-01-25 11:14:45 -05:00
Francis Lachapelle
8076a1a7ef
Update translations
2016-01-21 10:17:36 -05:00
Ludovic Marcotte
b3bc6bb7dc
Applied changes coming from v2/PR#184 .
2016-01-18 09:26:07 -05:00
Ludovic Marcotte
0b5e38e88c
(fix) we now follow 301 redirects when fetching ICS calendars
2016-01-08 13:13:35 -05:00
Ludovic Marcotte
ae6ed0c055
(feat) applied all changes as a patch coming from PR #180
2015-12-30 09:22:08 -05:00
Ludovic Marcotte
3404ae8105
(fix) carry over delegatedFrom too
2015-12-15 16:28:58 -05:00
Ludovic Marcotte
76f0ec9ae0
(fix) carry over the delegatedTo, not only the part stat
2015-12-15 16:28:13 -05:00
Ludovic Marcotte
0f578876af
(fix) small fix over previous commit
2015-12-15 11:15:28 -05:00
Ludovic Marcotte
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
Ludovic Marcotte
b4aa8b27d4
(fix) added Macedonian and Portuguese to the GNUmakefile files
2015-12-04 13:43:36 -05:00
Ludovic Marcotte
c427a62fb0
(fix) sync'ed translations with files from v2
2015-12-04 12:48:52 -05:00
Ludovic Marcotte
9b0a2c5fae
Merge branch 'master' into feature/addMissingStrings2
...
Conflicts:
UI/AdministrationUI/English.lproj/Localizable.strings
UI/PreferencesUI/English.lproj/Localizable.strings
UI/Templates/PreferencesUI/UIxFilterEditor.wox
2015-12-03 11:16:17 -05:00
Ludovic Marcotte
d51d5c85b0
(fix) prevent characters in calendar component UID causing issues during import process
2015-12-01 09:27:27 -05:00
Ludovic Marcotte
5f82d3fb37
(fix) manually added fixes from PR#120
2015-11-05 09:59:31 -05:00
extrafu
9fb69a8095
Merge pull request #113 from ethoms/clang-warnings-stage6
...
Stage 6 of clang compiler warning patches.
2015-11-05 09:34:24 -05:00
extrafu
cc1555af22
Merge pull request #108 from ethoms/clang-warnings-stage1
...
Stage1 of clang compiler warning patches.
2015-11-04 13:40:09 -05:00
ethoms
0cb1504f2c
Update SOGoCalendarComponent.m
2015-11-04 08:18:23 +08:00
extrafu
b7ebf6e781
Merge pull request #112 from ethoms/clang-warnings-stage5
...
Stage 5 of clang compiler warning patches.
2015-11-03 18:06:33 -05:00
extrafu
165337bebc
Merge pull request #110 from ethoms/clang-warnings-stage3
...
Stage 3 of clang compiler warning patches.
2015-11-03 18:01:04 -05:00
Euan Thoms
0b4c355c2c
Stage 6 of clang compiler warning patches.
2015-11-04 05:37:39 +08:00
Euan Thoms
36c1ba88a5
Stage 5 of clang compiler warning patches.
2015-11-04 05:28:03 +08:00
Francis Lachapelle
cbf9b6da3e
Fix all-day events covering a timezone change
2015-11-03 15:47:30 -05:00
Euan Thoms
a64d55f95c
Stage 3 of clang compiler warning patches.
2015-11-04 03:59:40 +08:00
Euan Thoms
3c62cc744e
Stage 1 of clang compiler warning patches.
2015-10-31 14:10:03 +08:00
Ludovic Marcotte
6bbd182559
(fix) safe-guard against not-yet-created calendar of local users
2015-09-10 20:08:48 -04:00
Luc Charland
9445315b30
Added a string, removed a double, removed a few colons
2015-08-25 11:11:46 -04:00
Francis Lachapelle
9465fbad4b
(obj-c) Indentation
2015-08-06 17:39:00 -04:00
Francis Lachapelle
0d537ab27b
Return recurrence rules of occurrence
2015-08-06 16:15:12 -04:00
Luc Charland
2f8f8c78f7
Removing colons
2015-07-31 14:14:30 -04:00
Francis Lachapelle
538e6fa4b1
Add Chinese (Taiwan) translation
2015-07-23 12:08:04 -04:00
Francis Lachapelle
c3aa601f3c
(fix) Return value of [iCalPerson+SOGo uidInDomain:]
2015-07-23 12:07:57 -04:00
Francis Lachapelle
613f05ac02
Calendar module optimizations in multidomain setup
...
Conflicts:
NEWS
UI/Common/UIxUserRightsEditor.m
2015-07-23 12:06:54 -04:00
Francis Lachapelle
f0b88811d6
Add Slovenian translation
2015-07-23 12:02:42 -04:00
Ludovic Marcotte
8650492989
Applied PR90 as a patch due to too-many merge conflicts when cherry-picking
2015-07-22 09:05:17 -04:00
Francis Lachapelle
35ff82710a
Handle attach URLs in appointment editor
2015-07-01 15:00:12 -04:00
Francis Lachapelle
ba5f6410ed
Return recurrence rule only if frequency is known
2015-07-01 14:11:53 -04:00
