Commit Graph

15 Commits

Author SHA1 Message Date
Ancuta Morarasu
a75200b776 REPO-2043 / MNT-16053: Extending cm:person causes activiti to fail
- Ensure the 'scope' is set when converting properties with multiple=true, on ActivitiScriptNode nodes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-06 16:41:28 +00:00
Kevin Roast
829474d7e4 Merged DEV/WEBAPP-API (5.2.0) to 5.2.N (5.2.N)
131265 kroast: Merged 130934 from HEAD - SHA-1698

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-17 15:47:06 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
941ca950a9 Merged 5.0.N (5.0.4) to 5.2.N (5.2.1)
123880 rneamtu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123574 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123414 123524 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
            - Content Data should be created only when it has a binary, not as a side effect of getters on ScriptNode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@123892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-14 16:15:59 +00:00
Alan Davis
d2742fc893 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108045: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107732: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107703: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Fix up hanging test
         Tidy up imports


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-09 22:12:54 +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
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Mark Rogers
a576035f0f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77150: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73977: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:02:04 +00:00
Mark Rogers
90712bd712 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77099: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73031: ACE-956 - fixes to other unit tests affected by the change of interface.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:13:26 +00:00
Alan Davis
f68b048cbf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60604: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60461: 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
      Fixed the security context error.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:15:28 +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
Neil McErlean
d6c28d0f2f Fixing a typo in test code. I accidentally put two @Rule annotations in when there only should have been one.
For the record, I think the presence of two of these @Rule annotations would mean that all @Test methods in this class would run inside *two* RunAs blocks instead of one. So wrong, but shouldn't have caused any problems.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 13:23:28 +00:00
Neil McErlean
9fbba5a5e0 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
54638: As part of work investigating ALF-19783 I have created a test case. I'm checking this in on 4.1 bugfix (where the issue is not reported)
Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
   54640: (RECORD ONLY) (Part of prep work for ALF-19783) Moving a test class to the correct source tree.

Note that in doing the record-only merge above, the file ScriptNodeTest had been created on V4.1-BUG-FIX *and* on HEAD independently.
So I got a tree conflict in merging 54640 to HEAD as this attempted to svn mv ScriptNodeTest on top of HEAD's existing copy of that file.
So instead, I manually resolved the conflict by merging the two files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 13:15:35 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00