Commit Graph

20 Commits

Author SHA1 Message Date
Alan Davis
7d4d15bbab Merged HEAD (5.2) to 5.2.N (5.2.1)
127556 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125604 jkaabimofrad: RA-933: Initial commit for ticket base authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 14:03:44 +00:00
Ancuta Morarasu
a9423c607a Merged HEAD (5.2) to 5.2.N (5.2.1)
126597 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124840 gjames: RA-847, RA-848 Adding the tests to the suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126942 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:14:32 +00:00
Ancuta Morarasu
b3d2375271 Merged HEAD (5.2) to 5.2.N (5.2.1)
126578 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124729 jvonka: RA-773: Try bumping retry count for async rendition creation on build m/c (SharedLinkApiTest)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:45 +00:00
Ancuta Morarasu
8570181ea2 Merged HEAD (5.2) to 5.2.N (5.2.1)
126577 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124721 jvonka: RA-773, RA-767: Oops - add test to suite (so that they're run as part of the build)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:11:34 +00:00
Ancuta Morarasu
ff84789b99 Merged HEAD (5.2) to 5.2.N (5.2.1)
126571 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124586 gjames: RA-884: Moved ActivitiesPostingTest up the APITest suite to avoid a permissions error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:39 +00:00
Ancuta Morarasu
e5ca888f6a Merged HEAD (5.2) to 5.2.N (5.2.1)
126570 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124580 gjames: RA-884: Adding ActivitiesPostingTest to the APITest suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 12:10:30 +00:00
Ancuta Morarasu
854869c4a9 Merged HEAD (5.2) to 5.2.N (5.2.1)
126470 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122329 jkaabimofrad: Fixed API tests failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:35:29 +00:00
Ancuta Morarasu
775380563a Merged HEAD (5.2) to 5.2.N (5.2.1)
126468 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122327 jkaabimofrad: RA-673, RA-678: Added node's renditions REST API. 
                    - Retrieve Renditions For Node + tests
                    - Create Rendition


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:35:12 +00:00
Ancuta Morarasu
f2c55e00af Merged HEAD (5.2) to 5.2.N (5.2.1)
126354 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119021 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:47:04 +00:00
Ancuta Morarasu
08f750ae65 Merged HEAD (5.2) to 5.2.N (5.2.1)
126352 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118861 jkaabimofrad: Added NodeApiTest to test suit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:46:47 +00:00
Raluca Munteanu
27333f1d39 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
386a4aca06 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Gethin James
54c5962983 Merge Sabre4 to HEAD
110682: Add ModulePackagesApiTest to the ApiTest suite RA-370


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-01 13:05:12 +00:00
Tatyana Valkevych
c70953278a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104025: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103975: MNT-13938: Public API does not set any HTTP caching headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:25:31 +00:00
Tatyana Valkevych
1675fee3b5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101647: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101286: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         100798: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case using jetty


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-10 21:03:26 +00:00
Alan Davis
1d16fa63ab Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100257: Reverse Merge 5.0.N (5.0.2)
         << Cause 4 build errors >>
         100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
            99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
               - Filter inherited permissions before try to remove them
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:16:14 +00:00
Alan Davis
64910942ed Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:14:56 +00:00
Steven Glover
bdb6746670 ALF-19690 "CMIS TCK Test Failures": fixed up failing TCK tests for 1.0 and 1.1 endpoints, refactoring of tests to aid in this aim, other fixes for things I found whilst testing, hopefully have addressed CLOUD-2051 too, upgrade alfresco-opencmis-extension (with updated chemistry dependency) to fix transitive dependency issue in maven
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-19 16:35:41 +00:00
Derek Hulley
21c2e26c2f Fomatting in passing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-03 20:41:40 +00:00
Samuel Langlois
788d3c9c89 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