Wolfgang Sourdeau
87a7732361
applied changes from c6b25920d896b2d19d0ef40a4cadee46c87bba2d
...
through fcec9822c0aaee8cefba77d0f50a8582b33fa3f0
Monotone-Parent: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Revision: 4d39a71900cc87ae1185f268c1c35a5a4b086b1d
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-12T15:03:38
2012-07-12 15:03:38 +00:00
Francis Lachapelle
d965eec051
Minor improvements to the preferences window.
...
Monotone-Parent: b456b18f292850c6fefa107c0ca59bded3a6e6a3
Monotone-Revision: 1fae890d6e269d7918982811c46400a4ff38745d
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-11T19:53:45
2012-07-11 19:53:45 +00:00
Francis Lachapelle
c522130c25
Added missing strings for calendar notifications.
...
Monotone-Parent: 740654a1f1be6a68843349cf438d5a87445f489e
Monotone-Revision: b456b18f292850c6fefa107c0ca59bded3a6e6a3
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-11T19:50:56
2012-07-11 19:50:56 +00:00
Ludovic Marcotte
8a9bdcd31b
propagate from branch 'ca.inverse.sogo.1_3_17' (head 740654a1f1be6a68843349cf438d5a87445f489e)
...
to branch 'ca.inverse.sogo' (head 2252f3047b058ea629e568aec7efb2b0432e3c0c)
Monotone-Parent: 2252f3047b058ea629e568aec7efb2b0432e3c0c
Monotone-Parent: 740654a1f1be6a68843349cf438d5a87445f489e
Monotone-Revision: 919ac12670dffae621309b1826bc13e0a9ecbe21
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T18:58:31
Monotone-Branch: ca.inverse.sogo
2012-07-11 18:58:31 +00:00
Ludovic Marcotte
2c987bae06
See ChangeLog
...
Monotone-Parent: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Revision: 740654a1f1be6a68843349cf438d5a87445f489e
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T18:57:27
2012-07-11 18:57:27 +00:00
Ludovic Marcotte
6556c92c87
See ChangeLog
...
Monotone-Parent: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Revision: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T17:27:54
2012-07-11 17:27:54 +00:00
Ludovic Marcotte
d932f1fd47
Fixed merge
...
Monotone-Parent: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877
Monotone-Revision: 2252f3047b058ea629e568aec7efb2b0432e3c0c
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:09:37
Monotone-Branch: ca.inverse.sogo
2012-07-11 14:09:37 +00:00
Ludovic Marcotte
569949bae7
propagate from branch 'ca.inverse.sogo.1_3_17' (head 0012ddb107483154b76c08f33a7b8437b5309529)
...
to branch 'ca.inverse.sogo' (head fcec9822c0aaee8cefba77d0f50a8582b33fa3f0)
Monotone-Parent: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Parent: fcec9822c0aaee8cefba77d0f50a8582b33fa3f0
Monotone-Revision: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:08:51
Monotone-Branch: ca.inverse.sogo
2012-07-11 14:08:51 +00:00
Ludovic Marcotte
c8c0030518
See ChangeLog
...
Monotone-Parent: 236aeb7125be0df2f27ec6c73f05a3d74a71ee71
Monotone-Revision: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:06:41
2012-07-11 14:06:41 +00:00
Wolfgang Sourdeau
961302407d
Monotone-Parent: eb2ae1364da011cec8f9e025b9b53785ba2647d6
...
Monotone-Revision: fcec9822c0aaee8cefba77d0f50a8582b33fa3f0
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-10T16:02:16
Monotone-Branch: ca.inverse.sogo
2012-07-10 16:02:16 +00:00
Wolfgang Sourdeau
a469952773
Monotone-Parent: 1c3bb3511167199e0dc7bafa4db7fc5540648666
...
Monotone-Revision: eb2ae1364da011cec8f9e025b9b53785ba2647d6
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-10T15:49:24
Monotone-Branch: ca.inverse.sogo
2012-07-10 15:49:24 +00:00
Wolfgang Sourdeau
934e15d2d0
Monotone-Parent: c6b25920d896b2d19d0ef40a4cadee46c87bba2d
...
Monotone-Revision: 1c3bb3511167199e0dc7bafa4db7fc5540648666
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-10T15:49:05
Monotone-Branch: ca.inverse.sogo
2012-07-10 15:49:05 +00:00
Francis Lachapelle
3a748792db
Various minor Web interface improvements.
...
Monotone-Parent: de57fd5034fd57e2302198e4d6b342a30830430a
Monotone-Revision: 236aeb7125be0df2f27ec6c73f05a3d74a71ee71
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-10T15:26:00
2012-07-10 15:26:00 +00:00
Francis Lachapelle
1459f43f04
Updated French translation.
...
Monotone-Parent: cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15
Monotone-Revision: de57fd5034fd57e2302198e4d6b342a30830430a
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-10T15:18:35
2012-07-10 15:18:35 +00:00
Ludovic Marcotte
918affb638
propagate from branch 'ca.inverse.sogo.1_3_17' (head cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15)
...
to branch 'ca.inverse.sogo' (head b480939bb99d9c246f2a7f25b9728f4fff29d89e)
Monotone-Parent: b480939bb99d9c246f2a7f25b9728f4fff29d89e
Monotone-Parent: cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15
Monotone-Revision: c6b25920d896b2d19d0ef40a4cadee46c87bba2d
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-10T00:29:53
Monotone-Branch: ca.inverse.sogo
2012-07-10 00:29:53 +00:00
Ludovic Marcotte
03a125ea1f
See ChangeLog
...
Monotone-Parent: 801c13ca7d8e3a2f3e502ee658399b458681bcab
Monotone-Revision: cf43f2030dbd1c4f0747be7cbd5dc3239cd6bd15
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-10T00:29:13
2012-07-10 00:29:13 +00:00
Jean Raby
2940970c3a
propagate from branch 'ca.inverse.sogo.1_3_17' (head 801c13ca7d8e3a2f3e502ee658399b458681bcab)
...
to branch 'ca.inverse.sogo' (head 7983cbe0c7e64bf7704effecf4a69991464e4276)
Monotone-Parent: 7983cbe0c7e64bf7704effecf4a69991464e4276
Monotone-Parent: 801c13ca7d8e3a2f3e502ee658399b458681bcab
Monotone-Revision: b480939bb99d9c246f2a7f25b9728f4fff29d89e
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T18:22:49
Monotone-Branch: ca.inverse.sogo
2012-07-09 18:22:49 +00:00
Jean Raby
0d713efdd6
* Tools/SOGoToolExpireUserSessions.m:
...
remove reference toSOGoSessionExpireMinutes. It never existed.
Monotone-Parent: f0fb54908898753faba576cb702431e4a761d814
Monotone-Revision: 801c13ca7d8e3a2f3e502ee658399b458681bcab
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T18:22:45
2012-07-09 18:22:45 +00:00
Jean Raby
630d86bf2a
propagate from branch 'ca.inverse.sogo.1_3_17' (head f0fb54908898753faba576cb702431e4a761d814)
...
to branch 'ca.inverse.sogo' (head dd70649f47a4d24e9414656eda1cc9955949dca2)
Monotone-Parent: dd70649f47a4d24e9414656eda1cc9955949dca2
Monotone-Parent: f0fb54908898753faba576cb702431e4a761d814
Monotone-Revision: 7983cbe0c7e64bf7704effecf4a69991464e4276
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T18:17:00
Monotone-Branch: ca.inverse.sogo
2012-07-09 18:17:00 +00:00
Jean Raby
a6a00d8753
* Tools/SOGoToolUserPreferences.m:
...
use printf() instead of NSLog to print out user preferences.
Makes it easier to grep.
Monotone-Parent: 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4
Monotone-Revision: f0fb54908898753faba576cb702431e4a761d814
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T18:16:49
2012-07-09 18:16:49 +00:00
Jean Raby
0766ff431e
propagate from branch 'ca.inverse.sogo.1_3_17' (head 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4)
...
to branch 'ca.inverse.sogo' (head 2910a50c602f0bb23fb3e3c5b513549ac30b58f8)
Monotone-Parent: 2910a50c602f0bb23fb3e3c5b513549ac30b58f8
Monotone-Parent: 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4
Monotone-Revision: dd70649f47a4d24e9414656eda1cc9955949dca2
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T17:54:27
Monotone-Branch: ca.inverse.sogo
2012-07-09 17:54:27 +00:00
Jean Raby
1b6727bda6
revert last commit. The fix is in generic.js, not UIxContactsUserFolders.js
...
Monotone-Parent: 0d5958f50cf116f607e45fcde7496a5bc3726e1c
Monotone-Revision: 3896b9b187dfad2b01d68527f0411bd1a7cfe7b4
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T17:54:22
2012-07-09 17:54:22 +00:00
Jean Raby
727eda5ad9
propagate from branch 'ca.inverse.sogo.1_3_17' (head 0d5958f50cf116f607e45fcde7496a5bc3726e1c)
...
to branch 'ca.inverse.sogo' (head 6fbc2bc5b209f589700507e19b2f5b537fd5ccce)
Monotone-Parent: 0d5958f50cf116f607e45fcde7496a5bc3726e1c
Monotone-Parent: 6fbc2bc5b209f589700507e19b2f5b537fd5ccce
Monotone-Revision: 2910a50c602f0bb23fb3e3c5b513549ac30b58f8
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T15:47:46
Monotone-Branch: ca.inverse.sogo
2012-07-09 15:47:46 +00:00
Jean Raby
390755d305
* UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit):
...
Restore behavior of a single dot (.) in the search field (wildcard search)
Monotone-Parent: 7ec57a209bc7361239e0e096f134affbbd4b5fc2
Monotone-Revision: 0d5958f50cf116f607e45fcde7496a5bc3726e1c
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T15:47:42
2012-07-09 15:47:42 +00:00
Jean Raby
9fa37aef11
propagate from branch 'ca.inverse.sogo.1_3_17' (head 7ec57a209bc7361239e0e096f134affbbd4b5fc2)
...
to branch 'ca.inverse.sogo' (head 1afafb311417cef66b1fc16091418a9c10b9323f)
Monotone-Parent: 1afafb311417cef66b1fc16091418a9c10b9323f
Monotone-Parent: 7ec57a209bc7361239e0e096f134affbbd4b5fc2
Monotone-Revision: 6fbc2bc5b209f589700507e19b2f5b537fd5ccce
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T14:52:55
Monotone-Branch: ca.inverse.sogo
2012-07-09 14:52:55 +00:00
Jean Raby
22690a8f8f
* UI/WebServerResources/ContactsUI.js: Enable 'show raw source' only
...
when a single contact is selected.
Monotone-Parent: 4e287287380938e20234ac951c09158c324b84b4
Monotone-Revision: 7ec57a209bc7361239e0e096f134affbbd4b5fc2
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T14:52:47
2012-07-09 14:52:47 +00:00
Jean Raby
9e2e835745
propagate from branch 'ca.inverse.sogo.1_3_17' (head 4e287287380938e20234ac951c09158c324b84b4)
...
to branch 'ca.inverse.sogo' (head 1c4b0de1b13fe836e324570323e90b9d779a8fa5)
Monotone-Parent: 1c4b0de1b13fe836e324570323e90b9d779a8fa5
Monotone-Parent: 4e287287380938e20234ac951c09158c324b84b4
Monotone-Revision: 1afafb311417cef66b1fc16091418a9c10b9323f
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T14:17:18
Monotone-Branch: ca.inverse.sogo
2012-07-09 14:17:18 +00:00
Jean Raby
71121914cf
* UI/WebServerResources/SchedulerUI.js (onMenuRawEvent, onMenuRawTask):
...
New callback to show the event/task content from the menu
* UI/Scheduler/UIxComponentEditor.m (rawAction):
New method that returns the object's raw content in a WOResponse.
* UI/Templates/SchedulerUI/UIxCal{Day,Month,Main,Week}View.wox:
New contextual menu item: Show Raw Source
* UI/WebServerResources/ContactsUI.js (onMenuRawContact):
Rework to use calendar/ics/raw
* UI/Contacts/UIxContactFolderActions.m (rawAction):
Removed / moved to UI/Contacts/UIxContactActions.m
* UI/Contacts/UIxContactActions.m (rawAction):
New method that returns the object's raw content in a WOResponse.
* UI/Templates/ContactsUI/UIxContactFoldersView.wox:
Show vCard content -> Show Raw Source
Monotone-Parent: e853157abbabf35bc95273da8bc10b2d3b142627
Monotone-Revision: 4e287287380938e20234ac951c09158c324b84b4
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-09T14:17:07
2012-07-09 14:17:07 +00:00
Jean Raby
3520a8c847
propagate from branch 'ca.inverse.sogo.1_3_17' (head e853157abbabf35bc95273da8bc10b2d3b142627)
...
to branch 'ca.inverse.sogo' (head f4b12b256d58270841b46929996b4bdf21924369)
Monotone-Parent: e853157abbabf35bc95273da8bc10b2d3b142627
Monotone-Parent: f4b12b256d58270841b46929996b4bdf21924369
Monotone-Revision: 1c4b0de1b13fe836e324570323e90b9d779a8fa5
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T21:16:08
Monotone-Branch: ca.inverse.sogo
2012-07-05 21:16:08 +00:00
Jean Raby
c4d11cd916
* UI/WebServerResources/generic.js (openGenericWindow):
...
New method that opens a simple new window.
* UI/WebServerResources/ContactsUI.js (onMenuRawContact):
New callback to show the vCard content from the menu.
* UI/WebServerResources/ContactsUI.js (onContactMenuPrepareVisibility):
Enable the export and raw functions only on vcards contacts.
* UI/Templates/ContactsUI/UIxContactFoldersView.wox:
New contextual menu item: Show vCard content
* UI/Contacts/UIxContactFolderActions.m (rawAction):
New method that returns the raw contact data for all the contact uids provided
Monotone-Parent: f03db6cb5531dddabab4e8678d856fe593d3745d
Monotone-Revision: e853157abbabf35bc95273da8bc10b2d3b142627
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T21:16:02
2012-07-05 21:16:02 +00:00
Jean Raby
c5effe874f
propagate from branch 'ca.inverse.sogo.1_3_17' (head f03db6cb5531dddabab4e8678d856fe593d3745d)
...
to branch 'ca.inverse.sogo' (head 2fe9d54ea82595348c57b93890c2e06bd53156db)
Monotone-Parent: 2fe9d54ea82595348c57b93890c2e06bd53156db
Monotone-Parent: f03db6cb5531dddabab4e8678d856fe593d3745d
Monotone-Revision: f4b12b256d58270841b46929996b4bdf21924369
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T17:35:09
Monotone-Branch: ca.inverse.sogo
2012-07-05 17:35:09 +00:00
Jean Raby
5639ee6180
Typos
...
Monotone-Parent: f3654e9c29406b43890181ca1e890b64daca6321
Monotone-Revision: f03db6cb5531dddabab4e8678d856fe593d3745d
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T17:35:02
2012-07-05 17:35:02 +00:00
Jean Raby
d13bd52f62
propagate from branch 'ca.inverse.sogo.1_3_17' (head f3654e9c29406b43890181ca1e890b64daca6321)
...
to branch 'ca.inverse.sogo' (head 9fc01803511e28b63ef83d04b3a22f5da78861a3)
Monotone-Parent: 9fc01803511e28b63ef83d04b3a22f5da78861a3
Monotone-Parent: f3654e9c29406b43890181ca1e890b64daca6321
Monotone-Revision: 2fe9d54ea82595348c57b93890c2e06bd53156db
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T17:18:41
Monotone-Branch: ca.inverse.sogo
2012-07-05 17:18:41 +00:00
Jean Raby
993c0ee52e
* UI/Contacts/UIxContactView.m (secondaryEmail):
...
function renamed to secondaryEmails. It now returns all addresses
instead of the first one found in the vcard.
* UI/Templates/ContactsUI/UIxContactView.wox:
Show all addresses returned from secondaryEmails.
This still need some css tweaks.
Monotone-Parent: 4c9ff5822433c2ff8fcad8c7432a9575f9890b24
Monotone-Revision: f3654e9c29406b43890181ca1e890b64daca6321
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T17:17:50
2012-07-05 17:17:50 +00:00
Jean Raby
3e2bfbea14
propagate from branch 'ca.inverse.sogo.1_3_17' (head 4c9ff5822433c2ff8fcad8c7432a9575f9890b24)
...
to branch 'ca.inverse.sogo' (head f25607e5762568e3c223b1868307c8cc92bd66da)
Monotone-Parent: 4c9ff5822433c2ff8fcad8c7432a9575f9890b24
Monotone-Parent: f25607e5762568e3c223b1868307c8cc92bd66da
Monotone-Revision: 9fc01803511e28b63ef83d04b3a22f5da78861a3
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T16:56:37
Monotone-Branch: ca.inverse.sogo
2012-07-05 16:56:37 +00:00
Jean Raby
96f1a8b247
* Tests/Integration/propfind.py: Print headers to stderr.
...
the output can now easily be piped through xmllint
Monotone-Parent: 228f7d730cde5a5046b0885c1ac02649ee2b7c05
Monotone-Revision: 4c9ff5822433c2ff8fcad8c7432a9575f9890b24
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-05T16:56:27
2012-07-05 16:56:27 +00:00
Wolfgang Sourdeau
19adabfa92
Monotone-Parent: 32541b6f161d32f977e2eaff040e594f4ef885b2
...
Monotone-Revision: f25607e5762568e3c223b1868307c8cc92bd66da
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-02T19:57:29
Monotone-Branch: ca.inverse.sogo
2012-07-02 19:57:29 +00:00
Wolfgang Sourdeau
8bf73b73b6
Monotone-Parent: 47874ea582a8f97d988110f4d4174d2668de0fb0
...
Monotone-Revision: 32541b6f161d32f977e2eaff040e594f4ef885b2
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-02T19:49:05
Monotone-Branch: ca.inverse.sogo
2012-07-02 19:49:05 +00:00
Wolfgang Sourdeau
9ff48bda9d
merge of 'ebf7c7e799b00cc44e631f47d644d492cac8a9aa'
...
and 'f93bc9e1291ae4d3aab97f39d7a28293e66adb43'
Monotone-Parent: ebf7c7e799b00cc44e631f47d644d492cac8a9aa
Monotone-Parent: f93bc9e1291ae4d3aab97f39d7a28293e66adb43
Monotone-Revision: 47874ea582a8f97d988110f4d4174d2668de0fb0
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-02T19:48:38
Monotone-Branch: ca.inverse.sogo
2012-07-02 19:48:38 +00:00
Wolfgang Sourdeau
79c3eb33dc
Monotone-Parent: a6b977673a1cc94b1269e19c469101dca9fd17bc
...
Monotone-Revision: ebf7c7e799b00cc44e631f47d644d492cac8a9aa
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-01T22:31:05
Monotone-Branch: ca.inverse.sogo
2012-07-01 22:31:05 +00:00
Wolfgang Sourdeau
b3acd2e2ad
Monotone-Parent: 0ad1e10fb7587b8444bd502de4908d1aabf70c96
...
Monotone-Revision: a6b977673a1cc94b1269e19c469101dca9fd17bc
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-01T20:58:46
Monotone-Branch: ca.inverse.sogo
2012-07-01 20:58:46 +00:00
Wolfgang Sourdeau
674fb1081c
Monotone-Parent: b4eb1c4ecb6343d34ed9700a15e35cd1c9dc33af
...
Monotone-Revision: 0ad1e10fb7587b8444bd502de4908d1aabf70c96
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-01T20:55:54
Monotone-Branch: ca.inverse.sogo
2012-07-01 20:55:54 +00:00
Francis Lachapelle
0f4401a4b6
merge of 'a4c7e35d642045e63467a131fae8049524f450e4'
...
and 'a6b977673a1cc94b1269e19c469101dca9fd17bc'
Monotone-Parent: a4c7e35d642045e63467a131fae8049524f450e4
Monotone-Parent: a6b977673a1cc94b1269e19c469101dca9fd17bc
Monotone-Revision: f93bc9e1291ae4d3aab97f39d7a28293e66adb43
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-30T18:35:39
Monotone-Branch: ca.inverse.sogo
2012-06-30 18:35:39 +00:00
Francis Lachapelle
09504ed1cb
merge of '3f8608c82d9c379cc9e0fea6ffe853cc1949a24b'
...
and '7634b9d503d61b6240548e75e7f872081debc6b4'
Monotone-Parent: 3f8608c82d9c379cc9e0fea6ffe853cc1949a24b
Monotone-Parent: 7634b9d503d61b6240548e75e7f872081debc6b4
Monotone-Revision: a4c7e35d642045e63467a131fae8049524f450e4
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-30T18:20:30
Monotone-Branch: ca.inverse.sogo
2012-06-30 18:20:30 +00:00
Wolfgang Sourdeau
92f3ad1b06
merge of '43774db162efbc47a3e22d6daeeef1ed2cf6446f'
...
and 'fc5a6818c0ee3f04b21668c4b2008a9549fb34f7'
Monotone-Parent: 43774db162efbc47a3e22d6daeeef1ed2cf6446f
Monotone-Parent: fc5a6818c0ee3f04b21668c4b2008a9549fb34f7
Monotone-Revision: b4eb1c4ecb6343d34ed9700a15e35cd1c9dc33af
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-30T11:46:19
Monotone-Branch: ca.inverse.sogo
2012-06-30 11:46:19 +00:00
Wolfgang Sourdeau
13bad20737
Monotone-Parent: 53c7bfdc2c357c162e23401ab5600d2cb4a1483e
...
Monotone-Revision: fc5a6818c0ee3f04b21668c4b2008a9549fb34f7
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-30T07:30:44
Monotone-Branch: ca.inverse.sogo
2012-06-30 07:30:44 +00:00
Jean Raby
8e137c7370
propagate from branch 'ca.inverse.sogo.1_3_17' (head 228f7d730cde5a5046b0885c1ac02649ee2b7c05)
...
to branch 'ca.inverse.sogo' (head 53c7bfdc2c357c162e23401ab5600d2cb4a1483e)
Monotone-Parent: 228f7d730cde5a5046b0885c1ac02649ee2b7c05
Monotone-Parent: 53c7bfdc2c357c162e23401ab5600d2cb4a1483e
Monotone-Revision: 43774db162efbc47a3e22d6daeeef1ed2cf6446f
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-29T20:18:26
Monotone-Branch: ca.inverse.sogo
2012-06-29 20:18:26 +00:00
Jean Raby
0a2244c2cb
* SoObjects/SOGo/WORequest+SOGo.[mh]
...
(-isAndroid): new method to detect whether the
request has been performed from an android client
* SoObjects/Contacts/SOGoContactFolders.m (appendSystemSources):
Let sogo append system sources if the request comes from an android
client even if its user agent matches the IPhoneAddressBook
Monotone-Parent: a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b
Monotone-Revision: 228f7d730cde5a5046b0885c1ac02649ee2b7c05
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-29T20:17:20
2012-06-29 20:17:20 +00:00
Wolfgang Sourdeau
6987cba3c2
Missing files
...
Monotone-Parent: 2eae9f47dfec8f0fc9908ebce5e7d249f21120bc
Monotone-Revision: 53c7bfdc2c357c162e23401ab5600d2cb4a1483e
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-29T19:37:15
Monotone-Branch: ca.inverse.sogo
2012-06-29 19:37:15 +00:00
Wolfgang Sourdeau
3c6ed20f53
Missing files
...
Monotone-Parent: 0c4f43a27b60ff9951c52b8ab1d9309d5fc9f209
Monotone-Revision: 2eae9f47dfec8f0fc9908ebce5e7d249f21120bc
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-29T19:25:31
Monotone-Branch: ca.inverse.sogo
2012-06-29 19:25:31 +00:00