amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-25 16:33:22 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_12' (head 7d5711d36b09624f7b8bf3747c0b7c2d743b3d00)

Browse Source 
to branch 'ca.inverse.sogo' (head 15b9d9900d3605d1920661f52678d25d93c587ef)

Monotone-Parent: 15b9d9900d3605d1920661f52678d25d93c587ef
Monotone-Parent: 7d5711d36b09624f7b8bf3747c0b7c2d743b3d00
Monotone-Revision: ac81d77fda86dad3ce300e48e20f65bd639b24cb

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-03T16:59:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2012-02-03 16:59:00 +00:00
parent b436b1641a d065753619
commit b9266a4e53
13 changed files with 88 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+13
View File
@@ -1,3 +1,14 @@
<<<<<<< variant A
2012-02-02 Francis Lachapelle <flachapelle@inverse.ca>
* UI/MailerUI/UIxMailMainFrame.m (-composeAction): recipient
addresses are now passed as a JSON-formatted string.
* UI/MailerUI/UIxMailAccountActions.m (-composeAction): the
received "mailto" parameter is now a JSON-formatted string; we
parse it accordingly.
>>>>>>> variant B
2012-02-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGo.m (sogo_backend_create_root_folder):
@@ -38,6 +49,8 @@
* OpenChange/MAPIApplication.m (-setUserContext:): do not retain
the user context.
####### Ancestor
======= end
2012-02-01 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):