Commit Graph

8668 Commits (9bd903e945164d0cab5a15e2c9266e07060ed7b0)

Author SHA1 Message Date
Jean Raby 9bd903e945 * Apache/SOGo.conf:
Use mod_expires to allow long term caching of static content. (1 year)
  Note that from now on, a resource's URL _must_ change to let the client
  reload it.  This is now done automatically for 'rsrc' in the wox templates,
  but must be done manually for files referenced from css and js.

Monotone-Parent: 217d9d9c614ee3505938f345452c5569bb650a58
Monotone-Revision: 7fa995267c41300aff7187361273b7fe03da3809

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-24T15:38:24
2012-05-24 15:38:24 +00:00
Wolfgang Sourdeau 782cf503af Monotone-Parent: 8c8a0d34571f1ad215b38b68796cff75b4bb787e
Monotone-Revision: 217d9d9c614ee3505938f345452c5569bb650a58

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-23T20:05:00
Monotone-Branch: ca.inverse.sogo
2012-05-23 20:05:00 +00:00
Wolfgang Sourdeau ea8143fb80 new branch
Monotone-Parent: 4139bd440f7c28fd59a0685b4ac2ca439778d5bf
Monotone-Revision: 8c8a0d34571f1ad215b38b68796cff75b4bb787e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-23T20:03:31
2012-05-23 20:03:31 +00:00
Jean Raby bc19c9bf28 propagate from branch 'ca.inverse.sogo.1_3_15' (head a4d3a18ad2c918187328e23c7ab29824357cd199)
to branch 'ca.inverse.sogo' (head c8046798bce0f997bfa345dc5831f718d02a2638)

Monotone-Parent: a4d3a18ad2c918187328e23c7ab29824357cd199
Monotone-Parent: c8046798bce0f997bfa345dc5831f718d02a2638
Monotone-Revision: 4139bd440f7c28fd59a0685b4ac2ca439778d5bf

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-18T15:04:39
Monotone-Branch: ca.inverse.sogo
2012-05-18 15:04:39 +00:00
Jean Raby 395a1b16e1 * SoObjects/Mailer/SOGoDraftObject.m (bodyPartForAttachmentWithName):
Merge back lost code to handle encoding of binary and rcf822 attachments.

Monotone-Parent: e4c701f2293beb98253d68bb64b7fa0133b1dda5
Monotone-Revision: a4d3a18ad2c918187328e23c7ab29824357cd199

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-18T15:02:42
2012-05-18 15:02:42 +00:00
Jean Raby 125c3fe24a add autodiscovery.example.com to hosts file
Monotone-Parent: 471dc0f5e3b2a6fc571aca4e14c0a5161cf7af0b
Monotone-Revision: c8046798bce0f997bfa345dc5831f718d02a2638

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-16T18:12:14
Monotone-Branch: ca.inverse.sogo
2012-05-16 18:12:14 +00:00
Francis Lachapelle 7f0eb1b8db Fixed calls to jQuery objects in DnD of messages and cards.
Monotone-Parent: 9c94aa2e20e881730ce518cc53bea638ece87f37
Monotone-Revision: e4c701f2293beb98253d68bb64b7fa0133b1dda5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-15T18:27:21
2012-05-15 18:27:21 +00:00
Francis Lachapelle 5e6d52be6a Updated installation guide.
Monotone-Parent: 1514217180eb9d60b9c680e5ce823ad8fbce42f2
Monotone-Revision: 9c94aa2e20e881730ce518cc53bea638ece87f37

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-15T18:07:18
2012-05-15 18:07:18 +00:00
Francis Lachapelle b81d985d9e Updated NEWS file.
Monotone-Parent: 1f2bd4b4727f3158ab77ca76322cd555967d326a
Monotone-Revision: 1514217180eb9d60b9c680e5ce823ad8fbce42f2

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-15T17:37:07
2012-05-15 17:37:07 +00:00
Jean Raby ea15cb5055 propagate from branch 'ca.inverse.sogo.1_3_15' (head 1f2bd4b4727f3158ab77ca76322cd555967d326a)
to branch 'ca.inverse.sogo' (head 3c99de4fc0fd90e4716ce18b2354e46dc72159ec)

Monotone-Parent: 1f2bd4b4727f3158ab77ca76322cd555967d326a
Monotone-Parent: 3c99de4fc0fd90e4716ce18b2354e46dc72159ec
Monotone-Revision: 471dc0f5e3b2a6fc571aca4e14c0a5161cf7af0b

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-15T14:40:37
Monotone-Branch: ca.inverse.sogo
2012-05-15 14:40:37 +00:00
Jean Raby 9b814bc58c * SoObjects/Appointments/SOGoAppointmentObject.m (_handleResourcesConflicts):
Deny access to resources if the resource's ACL don't allow the organizer
  to read its freebusy info.
  Without this, sogo would always auto-accept invitations from 'unprivileged'
  users, potentially bypassing the multiplebooking parameter.

Monotone-Parent: 8ac367dca61f0a4a66df59c7c786dd0f5016050d
Monotone-Revision: 1f2bd4b4727f3158ab77ca76322cd555967d326a

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-15T14:36:52
2012-05-15 14:36:52 +00:00
Wolfgang Sourdeau dbc75ceddb alignment
Monotone-Parent: 22cbe59df1fd7bc7e696537291a1822e5d95e2f1
Monotone-Revision: 3c99de4fc0fd90e4716ce18b2354e46dc72159ec

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-15T13:24:15
Monotone-Branch: ca.inverse.sogo
2012-05-15 13:24:15 +00:00
Wolfgang Sourdeau ec6d36656b Monotone-Parent: fa858afb28392ab411b14c34ac2889901bc0e49a
Monotone-Revision: 22cbe59df1fd7bc7e696537291a1822e5d95e2f1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-15T13:24:04
Monotone-Branch: ca.inverse.sogo
2012-05-15 13:24:04 +00:00
Wolfgang Sourdeau 9692f0a73a propagate from branch 'ca.inverse.sogo.1_3_15' (head 8ac367dca61f0a4a66df59c7c786dd0f5016050d)
to branch 'ca.inverse.sogo' (head 25f8df1c5f86087b0e7ba1ba87e86db95ad798ab)

Monotone-Parent: 25f8df1c5f86087b0e7ba1ba87e86db95ad798ab
Monotone-Parent: 8ac367dca61f0a4a66df59c7c786dd0f5016050d
Monotone-Revision: fa858afb28392ab411b14c34ac2889901bc0e49a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-15T02:33:16
Monotone-Branch: ca.inverse.sogo
2012-05-15 02:33:16 +00:00
Francis Lachapelle 5d149a53c7 Monotone-Parent: 253b9d96f0f6706a2b889ef7fa7b42009eb20cd3
Monotone-Revision: 8ac367dca61f0a4a66df59c7c786dd0f5016050d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-14T23:58:40
2012-05-14 23:58:40 +00:00
Wolfgang Sourdeau 1a46b346aa Monotone-Parent: 896076b20bdf94cbc408070acc36cdf121794929
Monotone-Revision: 25f8df1c5f86087b0e7ba1ba87e86db95ad798ab

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:40:37
Monotone-Branch: ca.inverse.sogo
2012-05-14 20:40:37 +00:00
Wolfgang Sourdeau cf1e0e3bc4 Modernized/simplified syntax
Monotone-Parent: b458e410b31539173b547c1c563f0b7ce41f6252
Monotone-Revision: 896076b20bdf94cbc408070acc36cdf121794929

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:25:12
Monotone-Branch: ca.inverse.sogo
2012-05-14 20:25:12 +00:00
Wolfgang Sourdeau 214030da9a Monotone-Parent: f4084f570506f57a1c5cce79d74ec2112e81733e
Monotone-Revision: b458e410b31539173b547c1c563f0b7ce41f6252

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:20:26
Monotone-Branch: ca.inverse.sogo
2012-05-14 20:20:26 +00:00
Wolfgang Sourdeau 5ef5bd94ee Monotone-Parent: ec60fc6d9bbb30cc304f19f19609c756f5bebcd0
Monotone-Revision: f4084f570506f57a1c5cce79d74ec2112e81733e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:17:21
Monotone-Branch: ca.inverse.sogo
2012-05-14 20:17:21 +00:00
Wolfgang Sourdeau c8b1f70ca4 propagate from branch 'ca.inverse.sogo.1_3_15' (head 253b9d96f0f6706a2b889ef7fa7b42009eb20cd3)
to branch 'ca.inverse.sogo' (head 2978fb164d72d09703322ba90dde130c04b410b2)

Monotone-Parent: 253b9d96f0f6706a2b889ef7fa7b42009eb20cd3
Monotone-Parent: 2978fb164d72d09703322ba90dde130c04b410b2
Monotone-Revision: ec60fc6d9bbb30cc304f19f19609c756f5bebcd0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:03:13
Monotone-Branch: ca.inverse.sogo
2012-05-14 20:03:13 +00:00
Wolfgang Sourdeau 7aa524ad54 Monotone-Parent: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a
Monotone-Revision: 253b9d96f0f6706a2b889ef7fa7b42009eb20cd3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:02:56
2012-05-14 20:02:56 +00:00
Wolfgang Sourdeau 7895169695 propagate from branch 'ca.inverse.sogo.1_3_15' (head 4806c2af0bd085e4a9d26b15d540681d4a14cb0a)
to branch 'ca.inverse.sogo' (head 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9)

Monotone-Parent: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9
Monotone-Parent: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a
Monotone-Revision: 2978fb164d72d09703322ba90dde130c04b410b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:06:30
Monotone-Branch: ca.inverse.sogo
2012-05-14 19:06:30 +00:00
Wolfgang Sourdeau 5fba279690 Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0
Monotone-Revision: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:06:28
2012-05-14 19:06:28 +00:00
Wolfgang Sourdeau 88065426fe propagate from branch 'ca.inverse.sogo.1_3_15' (head 908e524c769a51dae0dcb912328a3f394bff90c0)
to branch 'ca.inverse.sogo' (head 60ad1ae0d352bd61f6595c24b454acb729bdaadf)

Monotone-Parent: 60ad1ae0d352bd61f6595c24b454acb729bdaadf
Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0
Monotone-Revision: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:04:17
Monotone-Branch: ca.inverse.sogo
2012-05-14 19:04:17 +00:00
Wolfgang Sourdeau 782709f0a7 Monotone-Parent: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2
Monotone-Revision: 908e524c769a51dae0dcb912328a3f394bff90c0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:04:11
2012-05-14 19:04:11 +00:00
Wolfgang Sourdeau f5ea18a605 propagate from branch 'ca.inverse.sogo.1_3_15' (head 4158f1d28c04b0be7b69ff93cf2e4b055de655a2)
to branch 'ca.inverse.sogo' (head 115d1815352fd6df1b6effd9e0c7adea24a0b9cf)

Monotone-Parent: 115d1815352fd6df1b6effd9e0c7adea24a0b9cf
Monotone-Parent: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2
Monotone-Revision: 60ad1ae0d352bd61f6595c24b454acb729bdaadf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T17:11:42
Monotone-Branch: ca.inverse.sogo
2012-05-14 17:11:42 +00:00
Wolfgang Sourdeau 94aa42a4ab merge of 'bb27badf50d6df9168d73f3e08a4f10ce3626700'
and 'd63fe31c81597a22c53b5925bcf6bca60fc0e252'

Monotone-Parent: bb27badf50d6df9168d73f3e08a4f10ce3626700
Monotone-Parent: d63fe31c81597a22c53b5925bcf6bca60fc0e252
Monotone-Revision: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T17:11:33
2012-05-14 17:11:33 +00:00
Wolfgang Sourdeau 364b9f3d61 Monotone-Parent: d4a2b559c00ba43032aff09497fe8be50f429e21
Monotone-Revision: bb27badf50d6df9168d73f3e08a4f10ce3626700

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T17:11:10
2012-05-14 17:11:10 +00:00
Jean Raby 65890cea7d propagate from branch 'ca.inverse.sogo.1_3_15' (head d63fe31c81597a22c53b5925bcf6bca60fc0e252)
to branch 'ca.inverse.sogo' (head 96b915fdcf61ba0f6228b00597529086ab181a3b)

Monotone-Parent: 96b915fdcf61ba0f6228b00597529086ab181a3b
Monotone-Parent: d63fe31c81597a22c53b5925bcf6bca60fc0e252
Monotone-Revision: 115d1815352fd6df1b6effd9e0c7adea24a0b9cf

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T20:01:24
Monotone-Branch: ca.inverse.sogo
2012-05-11 20:01:24 +00:00
Jean Raby eea3154fc1 Delete attendee from exception and master event with 2 PUTs
Monotone-Parent: e5f291945f01977de333fd7aabf6d7109c8ec335
Monotone-Revision: d63fe31c81597a22c53b5925bcf6bca60fc0e252

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T20:01:06
2012-05-11 20:01:06 +00:00
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 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