Commit Graph

6 Commits

Author SHA1 Message Date
Natalia Smintanca
9d316188c1 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120081 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
      - fixed failing unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-14 12:21:26 +00:00
Alan Davis
62d972f622 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:29 +00:00
Mark Rogers
45c31e0fe9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84760: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80304: Build fix: ACE-2428   SOLR 4 - DD facetable & tidy up doc value support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:29:21 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
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
Alan Davis
05e0f93494 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60598: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60375: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60154: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60062: 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
            Added loading of default properties from Dictionary for versionable aspect.
            60063: 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
            Added a test to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:10:32 +00:00