Xavy Bahillo
c55eab6404
Changed Spanish string for view all (events/tasks)
...
As current string was referring only to events
2015-10-01 18:16:59 +02:00
Enrique J. Hernández
5911563b0f
Merge pull request #178 from inverse-inc/v2
...
Merge from upstream 2.3.2
2015-09-30 14:26:38 +02:00
Ludovic Marcotte
c8c7aaa459
(feat) GUI code to set or now sync flag on address book.
...
Also thrashed entirely the sync tag concept. Funambol is dead, thank god for that.
2015-09-25 15:21:06 -04:00
Jesús García Sáez
0ca6e7c6d3
Fix freebusy for multidomain environments
...
When returning contacts we have to supply also the domain field.
Because in a multidomain environment UIDField is unique only in
the domain so an user must be identified as uid@domain.
So when creating http requests from client side, we have to use
uid@domain instead of only uid so the SOGoUser created on server
side when parsing the requests is created properly.
2015-09-24 19:00:48 +02:00
Francis Lachapelle
8a3adeadd2
Rename Slovenian template
...
Closes #104
2015-09-21 20:37:50 -04:00
Francis Lachapelle
58d03eedc3
Update CKEditor to version 4.5.3
2015-09-16 13:29:37 -04:00
Francis Lachapelle
37b817cd68
Fix options availability in Contacts module cont'd
2015-09-16 11:43:22 -04:00
Francis Lachapelle
861057f22f
Fix options availability in Contacts module
...
A user can edit/delete a card from a system addressbook if included in
the "modifiers". Enable the delete/move options of the contextual menu
in this case.
Fixes #3342
2015-09-16 09:38:52 -04:00
Francis Lachapelle
b910501afa
Fix localization of calendar categories
...
Fixes #3295
2015-09-15 15:59:31 -04:00
Juan Vallés
ba68bd8935
Make folderKey encoding consistent
...
The folder names are encoded through the `asCSSIdentifier` and
`stringByEncodingImap4FolderName` functions when we store them as folder
keys. In addition, the prefix "folder" is added to the key.
The order in which these operations were done when storing the folder
keys (and reverted when retrieving them) wasn't consistent trough the
code. This led to problems such as creating twice a folder with a digit
at the beginning of its name.
The folder name goes now through the following operations when being
stored as a key (the retrieval reverts these in the reverse order):
* `stringByEncodingImap4FolderName`
* `asCSSIdentifier`
* Add "folder" prefix
2015-09-15 09:57:30 +02:00
Ludovic Marcotte
27a19ac956
(fix) Session fix when SOGoEnableDomainBasedUID is enabled but logins are domain-less
2015-08-21 10:30:47 -04:00
Ludovic Marcotte
05b330e11b
(fix) added changes from PR94 to avoid big merge conflicts
2015-08-03 11:06:30 -04:00
Luc Charland
ac6b299988
removed double Name translation in 5 languages
2015-08-03 10:13:23 -04:00
Ludovic Marcotte
234db671ad
Removed merged in templates from v3
2015-08-03 10:12:40 -04:00
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
Ludovic Marcotte
304ffa2099
(fix) SOGoMaximumMessageSubmissionCount should be independant from SOGoMaximumRecipientCount
2015-07-24 11:19:57 -04:00
Francis Lachapelle
e4ad255fc2
(fix) chmod 644 UI/MainUI/Slovenian.lproj/Locale
2015-07-23 14:09:27 -04:00
Francis Lachapelle
390a853471
(fix) Display of whitelisted attendees in Firefox
...
Fixes #3285
2015-07-23 14:07:34 -04:00
Francis Lachapelle
5c017c19fc
Update Spanish (Argentina) translation
2015-07-23 11:49:07 -04:00
Francis Lachapelle
dec152e8e5
Update CKEditor to version 4.5.1
2015-07-23 11:48:51 -04:00
Francis Lachapelle
4922e6004d
Add missing templates for Basque language
2015-07-23 11:14:11 -04:00
Francis Lachapelle
b91972d1dc
Add missing template for Slovenian language
2015-07-23 11:14:09 -04:00
Francis Lachapelle
5c3cdda186
Add Chinese (Taiwan) translation
2015-07-23 11:14:08 -04:00
Ludovic Marcotte
4b19e64071
(fix) fallback to utf-8/latin1 in rare decoding error cases - this is ugly
2015-07-23 10:22:36 -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
Ludovic Marcotte
b7c2d8ae95
(fix) we now respect the cr/lf in event's description ( #3228 )
2015-07-22 14:49:09 -04:00
Francis Lachapelle
d16bf7c1a7
(fix) Tasks list display in Calendar module
...
Fixes #3267
2015-06-24 07:48:01 -04:00
Francis Lachapelle
b527099907
(fix) Events list display in Calendar module
...
Fixes #3261
2015-06-23 09:25:29 -04:00
Francis Lachapelle
667e38ff0c
(fix) Escaping of unexpected characters in emails
...
Properly encode characters in DOM attributes.
Fixes #3241
2015-06-11 13:14:19 -04:00
Francis Lachapelle
76196bf6f4
(fix) Handling of cards with unexpected UID
...
Fixes #3239
Fixes #3245
2015-06-11 12:09:21 -04:00
Francis Lachapelle
5435c2dd04
(js) New method String.prototype.fromCSSIdentifier
2015-06-11 11:45:24 -04:00
Ludovic Marcotte
54224637b6
Revert "Revert "(fix) JavaScript syntax error in 'asCSSIdentifier'""
...
This reverts commit 662d06d24a
.
2015-06-10 20:06:00 -04:00
Ludovic Marcotte
d9896192f3
Revert "Revert "Improve creation of CSS identifier""
...
This reverts commit 7d018221ef
.
2015-06-10 20:05:40 -04:00
Ludovic Marcotte
7d018221ef
Revert "Improve creation of CSS identifier"
...
This reverts commit e40a19cf89
.
2015-06-10 16:31:15 -04:00
Ludovic Marcotte
662d06d24a
Revert "(fix) JavaScript syntax error in 'asCSSIdentifier'"
...
This reverts commit 9897cee779
.
2015-06-10 16:30:56 -04:00
Francis Lachapelle
9897cee779
(fix) JavaScript syntax error in 'asCSSIdentifier'
2015-06-10 15:43:00 -04:00
Francis Lachapelle
e40a19cf89
Improve creation of CSS identifier
...
Now escaping (), [], {}, ", and ;
2015-06-10 14:02:44 -04:00
Francis Lachapelle
e1ecf797f5
Use double-quotes for setTimeout of UIxJSClose.wox
2015-06-10 09:09:01 -04:00
Ludovic Marcotte
a56dbeb6a9
(fix) improved the handling of default calendar categories/colors ( #3200 )
2015-06-09 20:30:22 -04:00
Ludovic Marcotte
aa623c5171
(fix) don't add the domain if already in the uid
2015-06-09 09:46:38 -04:00
Francis Lachapelle
1e0473f1e5
Localization
2015-05-22 07:58:26 -04:00
Francis Lachapelle
7893349244
TimePicker: allow entries from numpad
...
Fixes #1516
2015-05-21 21:35:13 -04:00
Ludovic Marcotte
7e8c79c646
(fix) use the contact-info, not the user/group bit identifier
2015-05-20 13:51:16 -04:00
Ludovic Marcotte
416711ea43
(fix) avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES
2015-05-19 13:48:59 -04:00
Ludovic Marcotte
fb121974ec
refactored previous commit
2015-05-13 14:52:10 -04:00
Ludovic Marcotte
39aa9a97db
(fix) make sure we return event blocks sorted by start date ( #2939 )
2015-05-13 14:36:35 -04:00
Ludovic Marcotte
dc48e05dd3
(feat) print event/task description in list view ( #2881 )
2015-05-13 13:12:15 -04:00