Alan Davis 2d972d8861 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) ...

60603: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60460: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect property being set to 'false' in the contentModel.xml
      Updated the test content model for 4.2-BF branch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2014-02-12 14:14:37 +00:00

..

activiti

Merged CONV_HEAD to HEAD

2013-03-25 09:37:19 +00:00

activities/org/alfresco

Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD

2011-06-20 12:42:10 +00:00

alfresco

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-12 14:14:37 +00:00

bulkimport

Initial commit for ALF-10419:

2011-10-10 18:45:00 +00:00

bulkimport1

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-11 23:56:37 +00:00

bulkimport2

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-11 18:49:38 +00:00

bulkimport3

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-11 18:52:11 +00:00

cache-test

Merged BRANCHES/DEV/HEAD-QA to HEAD:

2013-07-01 09:35:59 +00:00

cachingstore

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-12 09:42:08 +00:00

filefolder

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

filesys

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

images

FIXED : ALF-10578: iPad uploaded files appear upside down in share preview

2011-12-05 14:46:57 +00:00

imap

Merged DEV/SWIFT to HEAD (FTP Tests, Tika and Poi)

2011-06-07 07:36:37 +00:00

jbpm-test

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

2012-10-01 12:17:53 +00:00

jbpmresources

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

2012-10-01 12:17:53 +00:00

JSONtoFmModel

Util to convert JSON to (FreeMarker-compatible) Data Model

2008-05-14 10:49:15 +00:00

log4j

Merged V3.1 to HEAD

2009-03-10 16:26:40 +00:00

misc

Merged V3.4 to HEAD

2011-04-11 14:24:38 +00:00

module

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:

2013-02-19 10:18:01 +00:00

opencmis

Merged HEAD-BUG-FIX to HEAD (4.2)

2013-09-08 07:43:48 +00:00

org/alfresco

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-11 23:08:43 +00:00

quick

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

ratings

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

schemacomp

Schema comparator: added optional <schema> level attribute to allow ignoring of table column ordering during schema validation.

2013-02-12 15:03:01 +00:00

sites

Merged V4.0-BUG-FIX to HEAD

2012-06-02 07:56:08 +00:00

solr

Merged DEV/SWIFT to HEAD

2011-05-30 16:15:56 +00:00

tenant

Merged V4.0-BUG-FIX to HEAD

2012-05-18 17:00:53 +00:00

test/alfresco

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-11 20:44:18 +00:00

version-history

Merged V3.1 to HEAD

2009-04-09 13:54:02 +00:00

wcm

WCM/AVM - fix for AVMServiceLocalTest.testLayeredFolderDelete2, also decrease poll for WCMTestSuite

2009-10-23 08:29:01 +00:00

xml-metadata

Merged DEV/SWIFT to HEAD

2011-05-30 16:15:56 +00:00

auto-thumbnail-context.xml

Merging BRANCHES/DEV/CMIS_10 to HEAD:

2010-02-23 17:23:42 +00:00

farmers_markets_list_2003.doc

Moving to root below branch label

2005-12-08 07:13:07 +00:00

Plan270904b.xls

Moving to root below branch label

2005-12-08 07:13:07 +00:00

session-size-test-context.xml

Merged V3.2 to HEAD

2009-10-19 11:48:23 +00:00

subsystem-test-context.xml

Merged V4.1-BUG-FIX to HEAD

2012-11-14 11:56:36 +00:00

sync-test-context.xml

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-12 09:24:13 +00:00

test-cmisinteger_modell-context.xml

Reverse the reverse merge now that the problem has been fixed on HEAD-BUG-FIX

2013-09-08 07:33:28 +00:00

test-database-context.xml

Merging DEV/ACTIVITI_INTEGRATION2 to HEAD

2011-03-02 17:12:35 +00:00

test-ftp-auth-context.xml

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-11 23:09:36 +00:00

test-nodeLocatorServiceImpl-context.xml

Merged DEV/SWIFT to HEAD

2011-06-08 14:47:59 +00:00

testQueryRegister.xml

Moving to root below branch label

2005-12-08 07:13:07 +00:00

web_app.zip

This is a blobule containing a basic set of webapp tests suitable

2006-09-23 00:12:53 +00:00