Commit Graph

8741 Commits (09504ed1cb89bf12dfcab5c9baff20f3f27153fb)

Author SHA1 Message Date
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 591306481b Monotone-Parent: 8bf030be6f5baed09d67ad6a173017ace25834c7
Monotone-Revision: 3f8608c82d9c379cc9e0fea6ffe853cc1949a24b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-28T14:46:37
Monotone-Branch: ca.inverse.sogo
2012-06-28 14:46:37 +00:00
Wolfgang Sourdeau 79552f8ff3 Monotone-Parent: 58f1829bce5e146423ed657d76063f09b7596385
Monotone-Revision: 8bf030be6f5baed09d67ad6a173017ace25834c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-28T14:45:45
Monotone-Branch: ca.inverse.sogo
2012-06-28 14:45:45 +00:00
Wolfgang Sourdeau 8ef875b1f4 Monotone-Parent: c69af3e4b83d5cab3a52701fb736c8a149697338
Monotone-Revision: 58f1829bce5e146423ed657d76063f09b7596385

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-28T14:45:12
Monotone-Branch: ca.inverse.sogo
2012-06-28 14:45:12 +00:00
Jean Raby e587ae08cf propagate from branch 'ca.inverse.sogo.1_3_17' (head a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b)
to branch 'ca.inverse.sogo' (head 25245057b6fcee6d3af9a15a930deba187d79422)

Monotone-Parent: 25245057b6fcee6d3af9a15a930deba187d79422
Monotone-Parent: a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b
Monotone-Revision: 7634b9d503d61b6240548e75e7f872081debc6b4

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-27T16:06:45
Monotone-Branch: ca.inverse.sogo
2012-06-27 16:06:45 +00:00
Jean Raby 38b1cbd014 * SoObjects/Appointments/SOGoAppointmentObject.m
(PUTAction:): detect conflicting event UID and
      deny the request accordingly.

  * Tests/Integration/test-caldav-scheduling.py:
    new test for bug #1853

Monotone-Parent: 32e30de409bdd4e864d0c454e1939c809fb8edcd
Monotone-Revision: a4ef73c2ad79c8da8d8e0c93767ab06e14bc846b

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-27T16:06:20
2012-06-27 16:06:20 +00:00
Francis Lachapelle c74b5a1cc1 Updated Czech translation.
Monotone-Parent: 802a8f25aa0ed67386953826b82939c3ab98bba2
Monotone-Revision: 32e30de409bdd4e864d0c454e1939c809fb8edcd

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-26T20:45:07
2012-06-26 20:45:07 +00:00
Jean Raby cb5ba07a69 propagate from branch 'ca.inverse.sogo.1_3_17' (head 802a8f25aa0ed67386953826b82939c3ab98bba2)
to branch 'ca.inverse.sogo' (head 5c56673cb595ae5a0b092f95cc9c5ac3bea114bc)

Monotone-Parent: 5c56673cb595ae5a0b092f95cc9c5ac3bea114bc
Monotone-Parent: 802a8f25aa0ed67386953826b82939c3ab98bba2
Monotone-Revision: 25245057b6fcee6d3af9a15a930deba187d79422

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-22T19:06:28
Monotone-Branch: ca.inverse.sogo
2012-06-22 19:06:28 +00:00
Jean Raby cba2a7d458 Tests/Integration/test-caldav-scheduling.py:
Replace the tearDown code by something a bit more elegant:
    each test now adds its ics to the ics_list.
    tearDown loops over the list instead of listing each ics.

  2 new utility functions: _getAllEvents and _deleteAllEvent
  Those should probably be named _getCollectionContent and
  _deleteCollectionContent...

  For tests related to resources, make sure their calendar is empty
  before running them.
  This ensures we won't get conflicts with existing events...

  Various reindent

  New test for bug #1837. Fails on <=1.3.16

Monotone-Parent: 4b891748ee7ea0c409554e75a90fb995173562a2
Monotone-Revision: 802a8f25aa0ed67386953826b82939c3ab98bba2

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-22T19:06:17
2012-06-22 19:06:17 +00:00
Francis Lachapelle 7f3b99f2d4 Monotone-Parent: 5e99e6ac2d5684eba786f2ce14295f3a3b5267a3
Monotone-Revision: 4b891748ee7ea0c409554e75a90fb995173562a2

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-22T15:08:30
2012-06-22 15:08:30 +00:00
Ludovic Marcotte 35781a22a7 propagate from branch 'ca.inverse.sogo.1_3_17' (head 5e99e6ac2d5684eba786f2ce14295f3a3b5267a3)
to branch 'ca.inverse.sogo' (head 29b92cb0e2207332af7eb0b8097b4cc79b5ee43d)

Monotone-Parent: 29b92cb0e2207332af7eb0b8097b4cc79b5ee43d
Monotone-Parent: 5e99e6ac2d5684eba786f2ce14295f3a3b5267a3
Monotone-Revision: 5c56673cb595ae5a0b092f95cc9c5ac3bea114bc

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-21T23:32:25
Monotone-Branch: ca.inverse.sogo
2012-06-21 23:32:25 +00:00
Ludovic Marcotte 6d745e0f4b See ChangeLog
Monotone-Parent: aadc4759a64f724760d38bbdfd92715182856439
Monotone-Revision: 5e99e6ac2d5684eba786f2ce14295f3a3b5267a3

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-21T23:32:18
2012-06-21 23:32:18 +00:00
Jean Raby 59e871a87d propagate from branch 'ca.inverse.sogo.1_3_17' (head aadc4759a64f724760d38bbdfd92715182856439)
to branch 'ca.inverse.sogo' (head aa6b7008cf5e7d5a1375822a416d0578868197db)

Monotone-Parent: aa6b7008cf5e7d5a1375822a416d0578868197db
Monotone-Parent: aadc4759a64f724760d38bbdfd92715182856439
Monotone-Revision: 29b92cb0e2207332af7eb0b8097b4cc79b5ee43d

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-21T15:52:24
Monotone-Branch: ca.inverse.sogo
2012-06-21 15:52:24 +00:00
Jean Raby 86b689d7e8 * Tools/SOGoToolExpireUserSessions.m:
semi-colon are useless in sql queries and probably breaks on oracle

Monotone-Parent: e699f14b51f9de020728f6ca36fdcc283587d057
Monotone-Revision: aadc4759a64f724760d38bbdfd92715182856439

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-21T15:51:53
2012-06-21 15:51:53 +00:00
Jean Raby e48a9ba0ed propagate from branch 'ca.inverse.sogo.1_3_17' (head e699f14b51f9de020728f6ca36fdcc283587d057)
to branch 'ca.inverse.sogo' (head dd23eda9d783ae26ebd0bff76f56685ce5181ef1)

Monotone-Parent: dd23eda9d783ae26ebd0bff76f56685ce5181ef1
Monotone-Parent: e699f14b51f9de020728f6ca36fdcc283587d057
Monotone-Revision: aa6b7008cf5e7d5a1375822a416d0578868197db

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-21T14:26:21
Monotone-Branch: ca.inverse.sogo
2012-06-21 14:26:21 +00:00
Jean Raby 58d115817b Remove rpm dependency on memcached as the caching daemon can run elsewhere
Monotone-Parent: ba98ce90f9ee5f3b4c038bc459d8d48d74cfad72
Monotone-Revision: e699f14b51f9de020728f6ca36fdcc283587d057

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-21T14:25:57
2012-06-21 14:25:57 +00:00
Jean Raby bcddfe4efa The new tests case was for #1839, not #1837
Monotone-Parent: 21464a96c4abb93d2143e8f30b059d2f01bab016
Monotone-Revision: ba98ce90f9ee5f3b4c038bc459d8d48d74cfad72

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-21T13:54:23
2012-06-21 13:54:23 +00:00
Jean Raby 70002fe574 propagate from branch 'ca.inverse.sogo.1_3_17' (head 21464a96c4abb93d2143e8f30b059d2f01bab016)
to branch 'ca.inverse.sogo' (head fe40ce2ccc4fc2a690968594698949dc4b73f035)

Monotone-Parent: 21464a96c4abb93d2143e8f30b059d2f01bab016
Monotone-Parent: fe40ce2ccc4fc2a690968594698949dc4b73f035
Monotone-Revision: dd23eda9d783ae26ebd0bff76f56685ce5181ef1

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-20T20:35:28
Monotone-Branch: ca.inverse.sogo
2012-06-20 20:35:28 +00:00
Jean Raby ea33d10117 merge of '30b555a484fd45f63e941b88e3afc1f2784480da'
and '7658ec99af152b2743393d20c3c4f2c23610ec4c'

Monotone-Parent: 30b555a484fd45f63e941b88e3afc1f2784480da
Monotone-Parent: 7658ec99af152b2743393d20c3c4f2c23610ec4c
Monotone-Revision: 21464a96c4abb93d2143e8f30b059d2f01bab016

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-20T20:35:13
2012-06-20 20:35:13 +00:00
Jean Raby 0845f13327 Remove duplicated test.
Add a new test for bug #1837:
    This tries to have the same behavior as iCal
      1. create an event, add an attendee and add the organizer as an attendee
      2. SOGo should remove the organizer from the attendee list

Monotone-Parent: b532b841f572a64aa9b471da32a51bb939539334
Monotone-Revision: 30b555a484fd45f63e941b88e3afc1f2784480da

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-06-20T20:34:28
2012-06-20 20:34:28 +00:00
Ludovic Marcotte 4a9577e18e propagate from branch 'ca.inverse.sogo.1_3_17' (head 7658ec99af152b2743393d20c3c4f2c23610ec4c)
to branch 'ca.inverse.sogo' (head c69af3e4b83d5cab3a52701fb736c8a149697338)

Monotone-Parent: 7658ec99af152b2743393d20c3c4f2c23610ec4c
Monotone-Parent: c69af3e4b83d5cab3a52701fb736c8a149697338
Monotone-Revision: fe40ce2ccc4fc2a690968594698949dc4b73f035

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-20T14:06:09
Monotone-Branch: ca.inverse.sogo
2012-06-20 14:06:09 +00:00
Ludovic Marcotte b88d623ad3 See ChangeLog
Monotone-Parent: b532b841f572a64aa9b471da32a51bb939539334
Monotone-Revision: 7658ec99af152b2743393d20c3c4f2c23610ec4c

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-20T14:05:40
2012-06-20 14:05:40 +00:00
Ludovic Marcotte 083c2d77b0 See ChangeLog
Monotone-Parent: 6105680d967d026c63b9b9f96cb3aeae9884e804
Monotone-Revision: b532b841f572a64aa9b471da32a51bb939539334

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-19T13:17:48
2012-06-19 13:17:48 +00:00
Wolfgang Sourdeau 988ca2d853 Monotone-Parent: 6748af72ecdd0c613acb968eb261448ae6b6982d
Monotone-Revision: c69af3e4b83d5cab3a52701fb736c8a149697338

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-18T17:50:31
Monotone-Branch: ca.inverse.sogo
2012-06-18 17:50:31 +00:00
Ludovic Marcotte b35f5f0ecb propagate from branch 'ca.inverse.sogo.1_3_17' (head 6105680d967d026c63b9b9f96cb3aeae9884e804)
to branch 'ca.inverse.sogo' (head b664e2e19975c70a7614aa975a3a045f0bec7ec3)

Monotone-Parent: 6105680d967d026c63b9b9f96cb3aeae9884e804
Monotone-Parent: b664e2e19975c70a7614aa975a3a045f0bec7ec3
Monotone-Revision: 6748af72ecdd0c613acb968eb261448ae6b6982d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-18T17:21:48
Monotone-Branch: ca.inverse.sogo
2012-06-18 17:21:48 +00:00
Ludovic Marcotte 917a857d6b Fixed crypt-md5 -> md5-crypt in the documentation
Monotone-Parent: 467dcaba599087c58981a3f656e961d7f6d0b19b
Monotone-Revision: 6105680d967d026c63b9b9f96cb3aeae9884e804

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-06-18T17:21:24
2012-06-18 17:21:24 +00:00
Wolfgang Sourdeau 07cc5e8cf8 Monotone-Parent: 8d523fe7796cff9d335706a89105b900379bfa52
Monotone-Revision: b664e2e19975c70a7614aa975a3a045f0bec7ec3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-15T13:33:21
Monotone-Branch: ca.inverse.sogo
2012-06-15 13:33:21 +00:00
Francis Lachapelle b7fc272680 Updated Installation guide.
Monotone-Parent: ea6bc80cdabf55c83e6df32dd1aaa4ecfa16a6e1
Monotone-Revision: 467dcaba599087c58981a3f656e961d7f6d0b19b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-13T18:35:22
2012-06-13 18:35:22 +00:00
Wolfgang Sourdeau dd0008f6ab Fixed version
Monotone-Parent: ea6bc80cdabf55c83e6df32dd1aaa4ecfa16a6e1
Monotone-Revision: 8d523fe7796cff9d335706a89105b900379bfa52

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-12T14:42:52
Monotone-Branch: ca.inverse.sogo
2012-06-12 14:42:52 +00:00
Wolfgang Sourdeau f5f66d0b74 Monotone-Parent: d537d152064e4fd06ac7b263bf3d3b3738715291
Monotone-Revision: ea6bc80cdabf55c83e6df32dd1aaa4ecfa16a6e1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-12T14:41:51
Monotone-Branch: ca.inverse.sogo
2012-06-12 14:41:51 +00:00
Francis Lachapelle 2f2446c9a6 Minor adjustment to the color of "invalid" input fields.
Monotone-Parent: 74828d7539e15e54c9b42034f03693356bb13912
Monotone-Revision: d537d152064e4fd06ac7b263bf3d3b3738715291

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-11T13:27:08
2012-06-11 13:27:08 +00:00
Francis Lachapelle ac46cef9b0 propagate from branch 'ca.inverse.sogo' (head ccc94ebd9d872963c33041a7cac766343762bef2)
to branch 'ca.inverse.sogo.1_3_17' (head 987a622d6acb514d5652a1125c4c320d585470ae)

Monotone-Parent: 987a622d6acb514d5652a1125c4c320d585470ae
Monotone-Parent: ccc94ebd9d872963c33041a7cac766343762bef2
Monotone-Revision: 74828d7539e15e54c9b42034f03693356bb13912

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-08T21:33:45
2012-06-08 21:33:45 +00:00
Francis Lachapelle 781c578fa2 Branch for SOGo v1.3.17
Monotone-Parent: 072c45571e241b757ad71ab4cf49f4e27b62142f
Monotone-Revision: 987a622d6acb514d5652a1125c4c320d585470ae

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-08T21:31:21
2012-06-08 21:31:21 +00:00
Francis Lachapelle 9803c02b72 Updated NEWS file.
Monotone-Parent: 049bd7ee68062beedf5bcfaf1ce10f128feb6ed6
Monotone-Revision: 072c45571e241b757ad71ab4cf49f4e27b62142f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-07T14:23:11
2012-06-07 14:23:11 +00:00
Francis Lachapelle f0012c6d36 Updated NEWS file and documentation.
Monotone-Parent: a9c7034315cda6b88728c872243d947a712f9e43
Monotone-Revision: 049bd7ee68062beedf5bcfaf1ce10f128feb6ed6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-06T15:28:35
2012-06-06 15:28:35 +00:00
Francis Lachapelle a47a7c9067 Updated German translation
Monotone-Parent: e0521e868d51799ef0a1be1a41939a06509efc6c
Monotone-Revision: a9c7034315cda6b88728c872243d947a712f9e43

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-06T14:15:35
2012-06-06 14:15:35 +00:00
Francis Lachapelle 33646f6e36 Updated French translation
Monotone-Parent: 66eec7d8f52f50c83b5b14fe250bc9c749c0f8e8
Monotone-Revision: e0521e868d51799ef0a1be1a41939a06509efc6c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-06T14:15:11
2012-06-06 14:15:11 +00:00
Francis Lachapelle a8e4974c96 Updated Dutch translation
Monotone-Parent: aa6dd506e01700aaff3aa383fbe31691b0d8c795
Monotone-Revision: 66eec7d8f52f50c83b5b14fe250bc9c749c0f8e8

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-06T14:13:34
2012-06-06 14:13:34 +00:00
Francis Lachapelle 012e59468d See ChangeLog.
Monotone-Parent: ae85556f790a11b8a40593a88822bee09e847d96
Monotone-Revision: aa6dd506e01700aaff3aa383fbe31691b0d8c795

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-04T19:47:36
2012-06-04 19:47:36 +00:00
Francis Lachapelle 939eeba1f7 See ChangeLog.
Monotone-Parent: d6ace8d3429bf9ad569fff969474bd5aa01214ae
Monotone-Revision: ae85556f790a11b8a40593a88822bee09e847d96

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-04T15:29:38
2012-06-04 15:29:38 +00:00
Wolfgang Sourdeau b4d8609236 Monotone-Parent: c8921f898d8810ab70f86851a0449a28dc34eb89
Monotone-Revision: ccc94ebd9d872963c33041a7cac766343762bef2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T15:15:30
Monotone-Branch: ca.inverse.sogo
2012-06-01 15:15:30 +00:00
Francis Lachapelle 33bb7e5556 merge of '40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768'
and 'f542ae0ee839e825fc2f1dae6c5d916237edb3e4'

Monotone-Parent: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768
Monotone-Parent: f542ae0ee839e825fc2f1dae6c5d916237edb3e4
Monotone-Revision: d6ace8d3429bf9ad569fff969474bd5aa01214ae

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-01T14:30:06
2012-06-01 14:30:06 +00:00
Francis Lachapelle 2c9a61f0c5 See ChangeLog
Monotone-Parent: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0
Monotone-Revision: f542ae0ee839e825fc2f1dae6c5d916237edb3e4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-01T14:29:30
2012-06-01 14:29:30 +00:00
Wolfgang Sourdeau 9690014465 propagate from branch 'ca.inverse.sogo.1_3_16' (head 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768)
to branch 'ca.inverse.sogo' (head b7eda388ab81350d88ecf1275f9481aae4f94bd8)

Monotone-Parent: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768
Monotone-Parent: b7eda388ab81350d88ecf1275f9481aae4f94bd8
Monotone-Revision: c8921f898d8810ab70f86851a0449a28dc34eb89

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T14:22:32
Monotone-Branch: ca.inverse.sogo
2012-06-01 14:22:32 +00:00
Wolfgang Sourdeau fd7f15c81e Monotone-Parent: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0
Monotone-Revision: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T14:22:28
2012-06-01 14:22:28 +00:00
Wolfgang Sourdeau 86fd762336 propagate from branch 'ca.inverse.sogo.1_3_16' (head 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0)
to branch 'ca.inverse.sogo' (head 08ebdafabc8167a4fc18a6a90be850eb8f0a5e1d)

Monotone-Parent: 08ebdafabc8167a4fc18a6a90be850eb8f0a5e1d
Monotone-Parent: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0
Monotone-Revision: b7eda388ab81350d88ecf1275f9481aae4f94bd8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T13:55:06
Monotone-Branch: ca.inverse.sogo
2012-06-01 13:55:06 +00:00
Wolfgang Sourdeau 9e842e7277 Monotone-Parent: 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f
Monotone-Revision: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T13:54:52
2012-06-01 13:54:52 +00:00
Wolfgang Sourdeau 5cbac94a71 propagate from branch 'ca.inverse.sogo.1_3_16' (head 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f)
to branch 'ca.inverse.sogo' (head 4e81d43596ddd37e670d5d889ac9d587abca3068)

Monotone-Parent: 4e81d43596ddd37e670d5d889ac9d587abca3068
Monotone-Parent: 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f
Monotone-Revision: 08ebdafabc8167a4fc18a6a90be850eb8f0a5e1d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-31T20:02:29
Monotone-Branch: ca.inverse.sogo
2012-05-31 20:02:29 +00:00
Wolfgang Sourdeau 005266ee5d Updated with missing LDAP config attributes
Monotone-Parent: 9f0e5527e462283d664abba2e2d57060f276c4d0
Monotone-Revision: 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-31T20:02:15
2012-05-31 20:02:15 +00:00
Ludovic Marcotte 1ca5818f89 propagate from branch 'ca.inverse.sogo.1_3_16' (head 9f0e5527e462283d664abba2e2d57060f276c4d0)
to branch 'ca.inverse.sogo' (head cb0fdb8e1df2644d8f633779e64cca48f332bbf6)

Monotone-Parent: 9f0e5527e462283d664abba2e2d57060f276c4d0
Monotone-Parent: cb0fdb8e1df2644d8f633779e64cca48f332bbf6
Monotone-Revision: 4e81d43596ddd37e670d5d889ac9d587abca3068

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T16:57:36
Monotone-Branch: ca.inverse.sogo
2012-05-31 16:57:36 +00:00