Jean Raby
1fc124995b
propagate from branch 'ca.inverse.sogo.1_3_15' (head e5f291945f01977de333fd7aabf6d7109c8ec335)
...
to branch 'ca.inverse.sogo' (head f30a499d50e08156f7d331ab40080bbad55c19f3)
Monotone-Parent: e5f291945f01977de333fd7aabf6d7109c8ec335
Monotone-Parent: f30a499d50e08156f7d331ab40080bbad55c19f3
Monotone-Revision: 96b915fdcf61ba0f6228b00597529086ab181a3b
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T17:46:11
Monotone-Branch: ca.inverse.sogo
2012-05-11 17:46:11 +00:00
Jean Raby
5c83c13e04
Fetch non existent event to let sogo create the database tables.
...
Tests would fail on an empty/new db
Monotone-Parent: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3
Monotone-Revision: e5f291945f01977de333fd7aabf6d7109c8ec335
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T17:45:44
2012-05-11 17:45:44 +00:00
Jean Raby
433e3d8042
propagate from branch 'ca.inverse.sogo.1_3_15' (head 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3)
...
to branch 'ca.inverse.sogo' (head 08910689dba5aa9bedbc810bbd626ad6d2f21db1)
Monotone-Parent: 08910689dba5aa9bedbc810bbd626ad6d2f21db1
Monotone-Parent: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3
Monotone-Revision: f30a499d50e08156f7d331ab40080bbad55c19f3
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T16:22:05
Monotone-Branch: ca.inverse.sogo
2012-05-11 16:22:05 +00:00
Jean Raby
6ad52fe047
* SoObjects/Appointments/SOGoAppointmentObject.m (PUTAction):
...
Delete bitrotten code that could end up duplicating attendees.
Behavior exposed by the new caldav tests
* Tests/Integration/config.py.in
* Tests/Integration/test-caldav-scheduling.py
* Tests/Integration/test-ical.py
* Tests/Integration/test-davacl.py:
Use an unprivileged webdavclient where possible.
This would have uncovered the resources calendar autocreation bug.
* Tests/Integration/test-caldav-scheduling.py:
New tests to excercise somewhat fragile code in dav autoscheduling.
Monotone-Parent: 82335b9404ce69f30e311f831868f8d13e598a46
Monotone-Revision: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T16:20:45
2012-05-11 16:20:45 +00:00
Ludovic Marcotte
760aa0486b
propagate from branch 'ca.inverse.sogo.1_3_15' (head 82335b9404ce69f30e311f831868f8d13e598a46)
...
to branch 'ca.inverse.sogo' (head 08910689dba5aa9bedbc810bbd626ad6d2f21db1)
Monotone-Parent: 08910689dba5aa9bedbc810bbd626ad6d2f21db1
Monotone-Parent: 82335b9404ce69f30e311f831868f8d13e598a46
Monotone-Revision: 244af3dc56c63ece14336e6211a7dd546a398220
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-10T21:33:59
Monotone-Branch: ca.inverse.sogo
2012-05-10 21:33:59 +00:00
Ludovic Marcotte
674f0f908f
Slightly updated to guide
...
Monotone-Parent: 0240947c2fe36b028b988b7133a239ffbc323558
Monotone-Revision: 82335b9404ce69f30e311f831868f8d13e598a46
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-10T21:33:39
2012-05-10 21:33:39 +00:00
Ludovic Marcotte
e301c9cdd7
propagate from branch 'ca.inverse.sogo.1_3_15' (head 0240947c2fe36b028b988b7133a239ffbc323558)
...
to branch 'ca.inverse.sogo' (head 94fb373c2fbcbed75c514c449066c36ed469a580)
Monotone-Parent: 0240947c2fe36b028b988b7133a239ffbc323558
Monotone-Parent: 94fb373c2fbcbed75c514c449066c36ed469a580
Monotone-Revision: 08910689dba5aa9bedbc810bbd626ad6d2f21db1
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-10T17:45:25
Monotone-Branch: ca.inverse.sogo
2012-05-10 17:45:25 +00:00
Ludovic Marcotte
019c9c742a
Documented SOGoMailCustomFromEnabled and SOGoHideSystemEMail
...
Monotone-Parent: 59a4975b8706d9e9574526207908e0ca2d7c717c
Monotone-Revision: 0240947c2fe36b028b988b7133a239ffbc323558
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-10T17:44:36
2012-05-10 17:44:36 +00:00
Francis Lachapelle
69e80ba7a8
Updated documentation guides to version 1.3.15.
...
Monotone-Parent: 010e63dffb557b9171f08a63428acdd11998ab56
Monotone-Revision: 59a4975b8706d9e9574526207908e0ca2d7c717c
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-10T16:12:25
2012-05-10 16:12:25 +00:00
Ludovic Marcotte
d8f5324406
propagate from branch 'ca.inverse.sogo.1_3_15' (head 010e63dffb557b9171f08a63428acdd11998ab56)
...
to branch 'ca.inverse.sogo' (head d130ee40b503d518a809601b1cab53710dbeea4b)
Monotone-Parent: 010e63dffb557b9171f08a63428acdd11998ab56
Monotone-Parent: d130ee40b503d518a809601b1cab53710dbeea4b
Monotone-Revision: 94fb373c2fbcbed75c514c449066c36ed469a580
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T13:53:29
Monotone-Branch: ca.inverse.sogo
2012-05-09 13:53:29 +00:00
Jean Raby
7083df2d28
propagate from branch 'ca.inverse.sogo.1_3_15' (head 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4)
...
to branch 'ca.inverse.sogo' (head 6ae7fe046a4b2457859b40e2f1ce7af496af87f2)
Monotone-Parent: 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4
Monotone-Parent: 6ae7fe046a4b2457859b40e2f1ce7af496af87f2
Monotone-Revision: d130ee40b503d518a809601b1cab53710dbeea4b
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-09T17:49:33
Monotone-Branch: ca.inverse.sogo
2012-05-09 17:49:33 +00:00
Jean Raby
9e65b8b3e4
* SoObject/SOGo/SOGoParentFolder.m (_createPersonalFolder):
...
Automatically create the folder if its owner is a resource.
(not if the active user is a resource)
Monotone-Parent: 4a872122da5acff4772feafceee7decf55c1bd98
Monotone-Revision: 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-09T17:48:51
2012-05-09 17:48:51 +00:00
Ludovic Marcotte
08648f5f6b
Applied patch for bug #1761
...
Monotone-Parent: 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4
Monotone-Revision: 010e63dffb557b9171f08a63428acdd11998ab56
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T13:53:22
2012-05-09 13:53:22 +00:00
Ludovic Marcotte
650cbd0489
propagate from branch 'ca.inverse.sogo.1_3_15' (head 4a872122da5acff4772feafceee7decf55c1bd98)
...
to branch 'ca.inverse.sogo' (head b2d9259d01bec3e1e78582b987d4091f8472b129)
Monotone-Parent: 4a872122da5acff4772feafceee7decf55c1bd98
Monotone-Parent: b2d9259d01bec3e1e78582b987d4091f8472b129
Monotone-Revision: 6ae7fe046a4b2457859b40e2f1ce7af496af87f2
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T12:48:49
Monotone-Branch: ca.inverse.sogo
2012-05-09 12:48:49 +00:00
Wolfgang Sourdeau
54c69836ab
propagate from branch 'ca.inverse.sogo.1_3_15' (head d4a2b559c00ba43032aff09497fe8be50f429e21)
...
to branch 'ca.inverse.sogo' (head a7e1ea6582c544441d18a19cd60774003d863f46)
Monotone-Parent: a7e1ea6582c544441d18a19cd60774003d863f46
Monotone-Parent: d4a2b559c00ba43032aff09497fe8be50f429e21
Monotone-Revision: b2d9259d01bec3e1e78582b987d4091f8472b129
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-09T15:24:16
Monotone-Branch: ca.inverse.sogo
2012-05-09 15:24:16 +00:00
Ludovic Marcotte
bb594f1921
Updated NEWS file
...
Monotone-Parent: d4a2b559c00ba43032aff09497fe8be50f429e21
Monotone-Revision: 4a872122da5acff4772feafceee7decf55c1bd98
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T12:48:44
2012-05-09 12:48:44 +00:00
Ludovic Marcotte
b4d661bb01
merge of '4e44cee96e74269b692d100a0c98730015a49d07'
...
and 'ee535991d8282dcec82a7f59c0d07efbbddada4f'
Monotone-Parent: 4e44cee96e74269b692d100a0c98730015a49d07
Monotone-Parent: ee535991d8282dcec82a7f59c0d07efbbddada4f
Monotone-Revision: d4a2b559c00ba43032aff09497fe8be50f429e21
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T10:54:14
2012-05-09 10:54:14 +00:00
Francis Lachapelle
61a2a4a7ee
See ChangeLog.
...
Monotone-Parent: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0
Monotone-Revision: ee535991d8282dcec82a7f59c0d07efbbddada4f
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-09T13:31:20
2012-05-09 13:31:20 +00:00
Ludovic Marcotte
93dd01d271
See ChangeLog
...
Monotone-Parent: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0
Monotone-Revision: 4e44cee96e74269b692d100a0c98730015a49d07
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T10:52:36
2012-05-09 10:52:36 +00:00
Francis Lachapelle
60555b9568
See ChangeLog.
...
Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f
Monotone-Revision: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-08T18:58:57
2012-05-08 18:58:57 +00:00
Ludovic Marcotte
55ff3aa77b
propagate from branch 'ca.inverse.sogo.1_3_15' (head dcd831afcbb347de38ec00c05b919923433a9f1f)
...
to branch 'ca.inverse.sogo' (head 8820ab3233ed6f1bdd0c2a203ea8208f8410f3bd)
Monotone-Parent: 8820ab3233ed6f1bdd0c2a203ea8208f8410f3bd
Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f
Monotone-Revision: a7e1ea6582c544441d18a19cd60774003d863f46
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-08T14:43:29
Monotone-Branch: ca.inverse.sogo
2012-05-08 14:43:29 +00:00
Ludovic Marcotte
dfd0339f9d
Updated timezones with the latest copy available from ftp://ftp.iana.org/tz/
...
Monotone-Parent: 7d73b5aa41ac3ab867578f6cb0b5e1b5a839b2b8
Monotone-Revision: dcd831afcbb347de38ec00c05b919923433a9f1f
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-08T14:42:57
2012-05-08 14:42:57 +00:00
Wolfgang Sourdeau
905c635774
Monotone-Parent: 63e5b1e4803ea8f6e3495f26b87df7a20d1ee379
...
Monotone-Revision: 8820ab3233ed6f1bdd0c2a203ea8208f8410f3bd
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-05T03:01:23
Monotone-Branch: ca.inverse.sogo
2012-05-05 03:01:23 +00:00
Francis Lachapelle
ca1cc2f9ce
Monotone-Parent: 393858d938760bb6fe3226479e3a3284e67c4036
...
Monotone-Revision: 7d73b5aa41ac3ab867578f6cb0b5e1b5a839b2b8
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-03T14:07:55
2012-05-03 14:07:55 +00:00
Francis Lachapelle
ffe8aebd9f
Updated Dutch translation.
...
Monotone-Parent: e71302ef32dd76ceb9c55572fbd7d80667f85385
Monotone-Revision: 393858d938760bb6fe3226479e3a3284e67c4036
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-03T14:07:33
2012-05-03 14:07:33 +00:00
Francis Lachapelle
5e5bc7a915
Updated German translation.
...
Monotone-Parent: 546030b7b1310706d148f176ba3f7dfa1f1138b1
Monotone-Revision: e71302ef32dd76ceb9c55572fbd7d80667f85385
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-03T14:02:23
2012-05-03 14:02:23 +00:00
Wolfgang Sourdeau
e082ce8cf8
propagate from branch 'ca.inverse.sogo.1_3_15' (head 546030b7b1310706d148f176ba3f7dfa1f1138b1)
...
to branch 'ca.inverse.sogo' (head c5348bb50866672a86152eb3750bed29a4be1e3b)
Monotone-Parent: 546030b7b1310706d148f176ba3f7dfa1f1138b1
Monotone-Parent: c5348bb50866672a86152eb3750bed29a4be1e3b
Monotone-Revision: 63e5b1e4803ea8f6e3495f26b87df7a20d1ee379
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T18:38:43
Monotone-Branch: ca.inverse.sogo
2012-05-01 18:38:43 +00:00
Wolfgang Sourdeau
a4358ab02b
Monotone-Parent: 0e5184582f5d3e24e8418e6c09048eb31dd79c83
...
Monotone-Revision: 546030b7b1310706d148f176ba3f7dfa1f1138b1
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T18:38:40
2012-05-01 18:38:40 +00:00
Wolfgang Sourdeau
cc1989d6de
propagate from branch 'ca.inverse.sogo.1_3_15' (head 0e5184582f5d3e24e8418e6c09048eb31dd79c83)
...
to branch 'ca.inverse.sogo' (head dd015385747c68da0ce2d9fb49137db55e3bb32e)
Monotone-Parent: 0e5184582f5d3e24e8418e6c09048eb31dd79c83
Monotone-Parent: dd015385747c68da0ce2d9fb49137db55e3bb32e
Monotone-Revision: c5348bb50866672a86152eb3750bed29a4be1e3b
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T17:03:22
Monotone-Branch: ca.inverse.sogo
2012-05-01 17:03:22 +00:00
Wolfgang Sourdeau
08b23ed95e
Monotone-Parent: e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c
...
Monotone-Revision: 0e5184582f5d3e24e8418e6c09048eb31dd79c83
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T17:03:14
2012-05-01 17:03:14 +00:00
Wolfgang Sourdeau
d8939c8701
propagate from branch 'ca.inverse.sogo.1_3_15' (head e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c)
...
to branch 'ca.inverse.sogo' (head 919d33c3134c9977564cf2d69e21be184850a819)
Monotone-Parent: 919d33c3134c9977564cf2d69e21be184850a819
Monotone-Parent: e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c
Monotone-Revision: dd015385747c68da0ce2d9fb49137db55e3bb32e
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:52:28
Monotone-Branch: ca.inverse.sogo
2012-05-01 14:52:28 +00:00
Wolfgang Sourdeau
71785b1405
Monotone-Parent: 373797dc3c245bb7e5c9f47af99935f50e79dc16
...
Monotone-Revision: e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:52:20
2012-05-01 14:52:20 +00:00
Wolfgang Sourdeau
cc9781a090
propagate from branch 'ca.inverse.sogo.1_3_15' (head 373797dc3c245bb7e5c9f47af99935f50e79dc16)
...
to branch 'ca.inverse.sogo' (head 388fbe7a186b5078c0f26161280ef319963b910d)
Monotone-Parent: 373797dc3c245bb7e5c9f47af99935f50e79dc16
Monotone-Parent: 388fbe7a186b5078c0f26161280ef319963b910d
Monotone-Revision: 919d33c3134c9977564cf2d69e21be184850a819
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:49:40
Monotone-Branch: ca.inverse.sogo
2012-05-01 14:49:40 +00:00
Wolfgang Sourdeau
d4c34cb481
Whitespaces
...
Monotone-Parent: bfe92d024d362b0f22f21f877f8e6518e00ab543
Monotone-Revision: 373797dc3c245bb7e5c9f47af99935f50e79dc16
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:49:19
2012-05-01 14:49:19 +00:00
Wolfgang Sourdeau
f8b55543e0
Monotone-Parent: ebefc72cf1f85cf9726bac12a387a3b5d92e0945
...
Monotone-Revision: bfe92d024d362b0f22f21f877f8e6518e00ab543
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:47:20
2012-05-01 14:47:20 +00:00
Francis Lachapelle
4b5c62c29b
merge of '7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9'
...
and 'a5e05418d31b07428c4bc802d353b27d6d34ecab'
Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9
Monotone-Parent: a5e05418d31b07428c4bc802d353b27d6d34ecab
Monotone-Revision: ebefc72cf1f85cf9726bac12a387a3b5d92e0945
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-01T13:42:18
2012-05-01 13:42:18 +00:00
Francis Lachapelle
2dd99c4d21
Fixed CSS of SOGoTimePicker for Opera.
...
Monotone-Parent: 672825b550345066a5eea3c60a50e21c47b5624f
Monotone-Revision: a5e05418d31b07428c4bc802d353b27d6d34ecab
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-01T13:41:33
2012-05-01 13:41:33 +00:00
Francis Lachapelle
a1f0d669a2
merge of '072677283f59903d1be242f3d96735460ef0985f'
...
and '4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f'
Monotone-Parent: 072677283f59903d1be242f3d96735460ef0985f
Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Revision: 672825b550345066a5eea3c60a50e21c47b5624f
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-01T00:48:46
2012-05-01 00:48:46 +00:00
Ludovic Marcotte
e054f972a2
propagate from branch 'ca.inverse.sogo.1_3_15' (head 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9)
...
to branch 'ca.inverse.sogo' (head 1a746e7d8ab981f6bbfb22f428fe19cc085bd285)
Monotone-Parent: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285
Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9
Monotone-Revision: 388fbe7a186b5078c0f26161280ef319963b910d
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T17:19:23
Monotone-Branch: ca.inverse.sogo
2012-04-30 17:19:23 +00:00
Ludovic Marcotte
c290e70342
See ChangeLog
...
Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Revision: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T17:19:00
2012-04-30 17:19:00 +00:00
Francis Lachapelle
1e2e40dc6c
Updated NEWS file.
...
Monotone-Parent: 92367535790cc3bc3121df56f2ea4d87a7c11349
Monotone-Revision: 072677283f59903d1be242f3d96735460ef0985f
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-30T14:53:27
2012-04-30 14:53:27 +00:00
Francis Lachapelle
c5380c2ae6
Monotone-Parent: c64050fc650935a4d7620ed869e3e3863b178c1e
...
Monotone-Revision: 92367535790cc3bc3121df56f2ea4d87a7c11349
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-30T14:53:13
2012-04-30 14:53:13 +00:00
Francis Lachapelle
1386563e2c
Fixed parsing of email addresses when sending an email to multiple attendees ( #1780 ).
...
Monotone-Parent: 65528b04d38419185ed64db626bd6ae368bfcd00
Monotone-Revision: c64050fc650935a4d7620ed869e3e3863b178c1e
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-30T13:09:10
2012-04-30 13:09:10 +00:00
Ludovic Marcotte
26240ad737
propagate from branch 'ca.inverse.sogo.1_3_15' (head 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f)
...
to branch 'ca.inverse.sogo' (head 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778)
Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Parent: 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778
Monotone-Revision: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T09:50:35
Monotone-Branch: ca.inverse.sogo
2012-04-30 09:50:35 +00:00
Ludovic Marcotte
19540fada1
See ChangeLog
...
Monotone-Parent: c64050fc650935a4d7620ed869e3e3863b178c1e
Monotone-Revision: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T09:50:10
2012-04-30 09:50:10 +00:00
Jean Raby
2dd3ee9b72
propagate from branch 'ca.inverse.sogo.1_3_15' (head 65528b04d38419185ed64db626bd6ae368bfcd00)
...
to branch 'ca.inverse.sogo' (head 2828658dbefac205b7160b9ca55913b64dacacd6)
Monotone-Parent: 2828658dbefac205b7160b9ca55913b64dacacd6
Monotone-Parent: 65528b04d38419185ed64db626bd6ae368bfcd00
Monotone-Revision: 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-04-26T13:57:29
Monotone-Branch: ca.inverse.sogo
2012-04-26 13:57:29 +00:00
Jean Raby
79599a08b9
Restore mapping of vcard:NOTE -> LDAP:description
...
lost in last commit
Monotone-Parent: 06f33f8f7c4581f3ec39d5cce6e3b77a99d436b0
Monotone-Revision: 65528b04d38419185ed64db626bd6ae368bfcd00
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-04-26T13:53:15
2012-04-26 13:53:15 +00:00
Francis Lachapelle
be5a16e3fb
merge of '2a87115bccec235f2a2e55f0bc7710d46e961afd'
...
and '2fc38e65f96b51fa85b4171735f3413808da5422'
Monotone-Parent: 2a87115bccec235f2a2e55f0bc7710d46e961afd
Monotone-Parent: 2fc38e65f96b51fa85b4171735f3413808da5422
Monotone-Revision: 2828658dbefac205b7160b9ca55913b64dacacd6
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-26T12:28:44
Monotone-Branch: ca.inverse.sogo
2012-04-26 12:28:44 +00:00
Francis Lachapelle
a8c28faeb7
merge of '402b5b43e7c75b50806b41e7372eed0e61a4de9f'
...
and '4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea'
Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f
Monotone-Parent: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea
Monotone-Revision: 06f33f8f7c4581f3ec39d5cce6e3b77a99d436b0
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-26T12:28:08
2012-04-26 12:28:08 +00:00
Jean Raby
24e6f4ed7c
propagate from branch 'ca.inverse.sogo.1_3_15' (head 402b5b43e7c75b50806b41e7372eed0e61a4de9f)
...
to branch 'ca.inverse.sogo' (head aaa516c8e0f7391e21eda557b30eb4c3c80b14bc)
Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f
Monotone-Parent: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc
Monotone-Revision: 2fc38e65f96b51fa85b4171735f3413808da5422
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-04-25T21:36:03
Monotone-Branch: ca.inverse.sogo
2012-04-25 21:36:03 +00:00