Commit Graph

2894 Commits

Author SHA1 Message Date
Will Abson
0f4e84f5bf Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79308: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79082: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         79054: MNT-12070: CLONE - Could not delete "SiteManager" user after turning off/on Permission Inheritance


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:20:31 +00:00
Will Abson
93bd1d3eef Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79284: Merged BRANCHES/DEV/WAT1 to BRANCHES/DEV/HEAD-BUG-FIX:
      78676: Fix localisation formatting issue with downloadStatus numbers. See MNT-11977.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:20:04 +00:00
Will Abson
666bbfba02 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79277: Merged DEV to HEAD-BUG-FIX
      79272 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Fixed failures on V5.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:19:55 +00:00
Will Abson
38353562ec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
         rather than the changes from V4.2-BUG-FIX >>
      79166: Reverse merged V4.2-BUG-FIX (4.2.4)
         << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
            and Steve is on holiday for a week. >>
         << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
         79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
            67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Updated OpenCMIS to 0.11 version.
         79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
            79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:17:48 +00:00
Will Abson
2b46c68730 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79128: ACE-484: Merged V4.2-BUG-FIX to (4.2.4) to HEAD-BUG-FIX (5.0/R39)
      79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
         79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:16:52 +00:00
Will Abson
e616ff66ef Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79113: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
         67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Updated OpenCMIS to 0.11 version.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:16:06 +00:00
Erik Winlof
005a0fb137 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78929: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78916: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         78882: Merged DEV to V4.2.3-PATCHES
            78841: MNT-12070: CLONE - Could not delete "SiteManager" user after turning off/on Permission Inheritance
             - Allow deleting core groups while node inherits parent permissions  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82660 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:22:46 +00:00
Erik Winlof
4a0656e304 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78915: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78868: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
         78793: Merged DEV to V4.2.3-PATCHES
            78781: MNT-12067: Data Lists: Wrapped exception when navigating through the added items
             - Add IGNORED_ASPECTS to datalist filter and put "cm:workingcopy" to it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:22:05 +00:00
Erik Winlof
3fc6ce998b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78914: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78867: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         78822: Merged DEV to V4.1-BUG-FIX (4.1.10)
            76824 : MNT-11731:Non-locked document appears under "I'm Editing"/"Others are Editing" filter in DocumentLibrary
               - The logic of doclist.get webscript was updated. Items with expired lock should not be included in search results for "editingMe" or "otherEditing" filters.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:21:45 +00:00
Erik Winlof
215fbfbd72 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78865: Revert commit 76521 merged from V4.2-BUG-FIX: it was later reverted there, and is causing 2 failures in BlogServiceTest
      78779: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0) - mergeinfo had been lost and these 2 were never merged
         76521: Merged DEV to V4.2-BUG-FIX
            76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
             Add the changes - for discussion, blog and link containers we will get site permission.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82644 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 13:00:09 +00:00
Erik Winlof
1fcc978177 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78801: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0)
     78763: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
       78668: Merged DEV to PATCHES/V4.2.3
          78526 : MNT-12033 : Treeview filter shows Repository structure on Shared Files page
             - Changed references to shared files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:55:32 +00:00
Erik Winlof
fb3b0543ae Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78782: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78471: Merged dev. V4.2-BUG-FIX-2014_06_06 to V4.2-BUG-FIX (4.2.4)
         73309: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
           - Property value accessor for 'cmis:isPrivateWorkingCopy' has been implemented. This property is introduced in CMIS 1.1
      78473: MNT-11631: CMIS property isPrivateWorkingCopy not set for the checked out object
         Test for 'cmis:isPrivateWorkingCopy' has been added into 'org.alfresco.rest.api.tests.TestCMIS'. Also this test class has been a bit refactored


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:55:12 +00:00
Erik Winlof
68e809d8e7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78779: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0) - mergeinfo had been lost and these 2 were never merged
      76521: Merged DEV to V4.2-BUG-FIX
         76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
          Add the changes - for discussion, blog and link containers we will get site permission.
      76523: Merged DEV to V4.2-BUG-FIX
         58015 : MNT-5877 : Unable to move a working copy
          Add actions to move/copy/delete working copies.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:54:50 +00:00
Erik Winlof
37b45ae065 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78702: Align versions of dependencies - especially Surf ones - and declare them in parent pom for consistency
   Upgrade a few Maven plugins as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:52:47 +00:00
Erik Winlof
1607f81742 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78680: ACE-1058 LiveSearch - correctly filter or handle non-document cm:content types.
    - fm:post type (forum discussion posts) removed at query level
    - Wiki pages - links generated correctly
    - Blog pages - links generated correctly


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:49:10 +00:00
Erik Winlof
296077ace3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78608: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78477: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76926 : MNT-11931 : Exception when opening Document Details with QuickShare disabled
            - Test that quick share webscripts returns 403 if quick share is disabled 
         76939 : MNT-11931 : Exception when opening Document Details with QuickShare disabled
            - Implement quick share enabled web script. Don't display quick share link if quick share is turned off 
         78462 : MNT-11931 : Exception when opening Document Details with QuickShare disabled
             - Use SingletonValueProcessorExtension to check if quick share is enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:44:38 +00:00
Erik Winlof
ece89ceea0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78551: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      77501: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76291 : MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
            - Using tagscope api at search for tags quantity in repository


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:32:55 +00:00
Erik Winlof
2d072a167a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78513: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76875: Merged DEV to V4.2-BUG-FIX
       76819 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
        Add the changes to ftl - for discussion, blog and link containers we will get site(parent of containers) permission.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:22:26 +00:00
Erik Winlof
18a8fb5763 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78450: ACE-2314 Error when Post Activity with 'parentNodeRef'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:18:59 +00:00
Erik Winlof
362a9da1a2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:18:05 +00:00
Erik Winlof
eb6e5e1ff0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78437: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76188: ACE-2149: EOL AVM / WCM
       - Force a type exclusion (act:actionbase) in order to test CMIS type exclusions
       - Originally, all wcm prefixes were ignored and that had been used by the CMIS exclusion test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:25 +00:00
Erik Winlof
eaa84fe057 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78436: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76187: ACE-2149: EOL AVM / WCM
       - Fix DictionaryRestApiTest to use 'cm:' model during testing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:15:05 +00:00
Erik Winlof
7599a9b24d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78432: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76036: Fixed PutMethodTest: Just throw unexpected exceptions in the test so that they are fully reported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:14:09 +00:00
Erik Winlof
4e8556fc9b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78421: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75797: ACE-2149: EOL AVM / WCM
       - Removal from 'remote-api' project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:11:32 +00:00
Erik Winlof
4249c9ac4b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78412: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75749: ACE-2149 Remove references to deployment project in both Ant and Maven build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:07:24 +00:00
Erik Winlof
0546224e23 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Stefan Kopf
b2d7a39178 Revert r78925 to fix ACE-2393
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-05 09:43:41 +00:00
Stefan Kopf
5599194b2b ACE-2379 - 'Edit online' action is not working
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-08-04 19:36:26 +00:00
Mark Rogers
61aca470a0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78213: Fixed ACE-2280 to allow the Repo Admin access the site admin console.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-24 15:13:16 +00:00
Mark Rogers
72baa4c274 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77259: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76447: SOLR node metadata includes getNamePaths, which is a Collection<Collection<String>>
       - JSON serialization stubbed out; fix TODOs in NodesMetaDataGet to transfer serialize to specification
       - The name paths are the largest list of names of nodes that culminate in the target node.
       - The top parent is the last highest parent with a cm:name property
       - ALL paths are introspected but it does not mean that the node path count will always equal the name path count


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:56:36 +00:00
Mark Rogers
f146545510 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77215: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75542: WIP    ACE-2114    SOLR 4 - port query languages - Part 1
      - move to antlr 3.5.2 to resolve library issue between SOLR and alfresco use of antlr


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:35:33 +00:00
Mark Rogers
8b87bbf09a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77207: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75127: Test a fix for oauth breakage in Cloud build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:31:26 +00:00
Mark Rogers
e0cd637688 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
fb70692bac Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77129: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73474: ACE-1685: aclsReaders.post WebScript now includes denied authorities in results


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:41:36 +00:00
Mark Rogers
53eb8be74a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77127: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73448: Added SubscriptionServiceRestApiTest (not in any suites) to WebScriptTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:40:11 +00:00
Mark Rogers
8fbde8d254 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77125: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73446: ACE-1685: added transaction usage to failing test (SOLRWebScriptTest.testAclReadersGet()) and added to TestSuite (test wasn't being run in CI)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:36:03 +00:00
Mark Rogers
ac506b2b31 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76994: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70127: MNT-9882 - refactoring of caches


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 12:01:01 +00:00
Mark Rogers
100c5e6f93 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76635: Merged EOL2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76545: ACE-2016: EOL Google Docs v1 in 5.0


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:13:06 +00:00
Mark Rogers
a5e4c44e29 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76632: Merged EOL2 to HEAD-BUG-FIX (5.0/Cloud)
      76533: ACE-2219 - EOL external Surf - remove Surf mobile project
      76536: ACE-2219 - Surf external - cleanup of obsolete Eclipse projects, developer local maven projects now mandatory as ANT no longer builds Surf. SVN ignore patterns for Eclipse projects.
      76540: ACE-2219 - Surf external - more cleanup of obsolete Eclipse projects, more SVN ignore patterns.
      76541: ACE-2219 - Surf external - more cleanup of obsolete Eclipse projects, more SVN ignore patterns - 2.
      76542: ACE-2219 - Surf external - restore privatemodules classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:11:27 +00:00
Mark Rogers
29973b9124 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76608: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
      << Commits from broken build on V4.2-BUG-FIX >>
      76591: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76521: Merged DEV to V4.2-BUG-FIX
          76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
           Add the changes - for discussion, blog and link containers we will get site permission. 
      76592: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76523: Merged DEV to V4.2-BUG-FIX
          58015 : MNT-5877 : Unable to move a working copy
           Add actions to move/copy/delete working copies.
      76593: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         76534: MNT-10226: Merged DEV to V4.2-BUG-FIX (4.2.4)
            76512: MNT-10226: Web Script - Status 500 error on 'Edit Properties' page after adding 'Restrictable' aspect through CMIS 1.1 API
               - Convert default value in appliance with type of the property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:06:29 +00:00
Mark Rogers
06a2d4a2aa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76591: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76521: Merged DEV to V4.2-BUG-FIX
       76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
        Add the changes - for discussion, blog and link containers we will get site permission. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:57:24 +00:00
Mark Rogers
0dfc1fb49d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76576: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76403: Merged DEV to V4.2-BUG-FIX (4.2.4)
         60219: MNT-10403 : Improve description of provided Services for Documentation
         Improved documentation for webscripts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:41:13 +00:00
Mark Rogers
874f632d1b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76575: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76363: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-452


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:40:31 +00:00
Mark Rogers
079b879c67 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76573: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76287: MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Merge to incorrect branch was removed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:39:29 +00:00
Mark Rogers
ffbd5d1143 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76572: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76284: MNT-11511 : All tags are not displayed in repository when the number of nodes taggable is over 1000
         - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:38:10 +00:00
Mark Rogers
cd7943b92a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76566: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76181: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      Additional fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-447


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:31:56 +00:00
Mark Rogers
615d5bf409 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76562: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76043: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
      The fix for build failure: https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-JOB1-446/log


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:30:17 +00:00
Mark Rogers
fe8594a249 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76558: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      75813: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
         65552: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'hasMoreItems' value calculation has been modified to take into account skipped elements
         67687: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'org.alfresco.rest.workflow.api.impl.ProcessesImplTest' has been implemented to cover both test cases of the issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:26:48 +00:00
Mark Rogers
60e59533eb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76552: Merged EOL2 to HEAD-BUG-FIX (5.0/Cloud)
      76438: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - SpringSurf is coming home. Part 1 - copy of remaining SpringSurf projects from r1567 and refactor
           of pom files to build in Alfresco parent structure.
      76444: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - Merge of r1568 from SpringSurf - Clear an additional cache in DojoDependencyHandler to
           prevent a cached reference being found for a resource that doesn't exist.
      76445: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - Ignore patterns for surf projects
      76450: ACE-2219 EOL use of external spring surf (bring spring surf back into Alfresco)
         - Surf now building from root alfresco pom - full maven builds for Community,
           Enterprise and Thor all building and working. SURF IS HOME.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:21:41 +00:00
Mark Rogers
9e6949acdc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76510: ACE-2217 - Node Browser Page not loading & Searching Popup runs forever. WebScript definition of NodeBrowser bean was in the wrong context file - was in WS API context file which has been deleted, nicely done.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 15:15:59 +00:00