Commit Graph

2424 Commits

Author SHA1 Message Date
Erik Winlof
3071b55a6a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82371: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76477: Removed the Raise Browser Event logic on webpreview. No longer required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:49:39 +00:00
Erik Winlof
1b36f7b4e0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82288: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80935: Merged DEV to V4.2-BUG-FIX (4.2.4)
         80901 : MNT-12221 : Due date is not displayed for Pooled Review and Approve task
            - task-delegate duedate property should be used for pooled review and approve workflow.
            - completing fix for ALF-8617 made in revision 28032
      81519: MNT-12221 : Due date is not displayed for Pooled Review and Approve task
         - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:29:55 +00:00
Erik Winlof
cf7f623db5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
81869: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81096: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76610: MNT-11444: Locally set permissions on moderated public sites lead to unexpected results
            - Set siteId to the location to avoid redirection for a user, who is not a member of a site, but has access to a document.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:27:52 +00:00
Erik Winlof
22be126dec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
      << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
      80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         << And added alfresco-opencmis-extension 1.0 >>
         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
      80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         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
      80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
      80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
      80814: MNT-11223: Fix build (pt1)
         - 80366: pom.xml contained a reference to an external surf which is now back in house.
      80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
      80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
      80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
      80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Changed Solr to Lucene for tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:01:21 +00:00
Erik Winlof
dfc91becc7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80924: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80469: ACE-2091 EOL Explorer.
      ACE-2014 EOL URL Addressibility API
       - 90% of the Explorer Client config, pages and assets moved to privatemodules/thor
       - Explorer client available via mvn -Pcloud build only
       - Alfresco minimal index page added
       - Deprecated and disabled: Servlets related to Explorer e.g. ExternalAccessServlet, CommandServlet - will be removed fully in 5.1
       - Removed: Explorer liferay portlet context, jboss portlet context, collaboration WebScript remoteapi (Explorer), old web assets no longer used
       - Tested: Enterprise build, Cloud build, build unit tests, NTLM SSO/Cookie SSO path


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 05:52:30 +00:00
Will Abson
62d83b04bb Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80904: ACE-2543 (Node browser does not support printing maps for property values)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:14:04 +00:00
Will Abson
cf79281a30 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
      Changed Solr to Lucene for tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:06:52 +00:00
Will Abson
ec5b493b64 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80854: Minor white space correction in web-scripts-application-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:05:45 +00:00
Will Abson
7194a62354 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80834: Further correction following merge of WAT1 to HEAD-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83111 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:03:02 +00:00
Will Abson
15a761f816 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80832: Corrections following merge of WAT1 to HEAD-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 18:02:44 +00:00
Will Abson
72f0e836a4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80736: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78923: ACE-2370: Changed facet config web-scripts URL from /api/solr/facet-config TO /api/facet/facet-config to fix the facets retrieval when Solr SSL is enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:46:01 +00:00
Will Abson
5bb3de7195 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80729: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78874: Added tests for facet config rest api (Cloud). Part of ACE-1582


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:44:52 +00:00
Will Abson
ffb416a5f8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80709: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78667: ACE-1582: Made the facet config service and the relevant web scripts to accept single/multiple value(s) update (to support inline edits).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:41:45 +00:00
Will Abson
cde57422fc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80701: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78593: First attempt at fixing FacetRestApiTest to run in bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:31:22 +00:00
Will Abson
dcb3bc2934 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80698: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78457: ACE-1582: - Fixed facet's custom properties.
                - Made the GET facets web-script to be accessed by all authenticated users rather than just the Search-Admin/Network-Admin users. 
                - Fixed FacetRestApiTests and added more tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:30:54 +00:00
Will Abson
9f2d601915 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80673: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78188: Made facet's "scope" and "scopedSites" properties, optional when updating/saving a facet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:19:21 +00:00
Will Abson
383b977c08 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80669: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78166: ACE-1582: Enhancements to the facet service to persist only the modified value(s) rather than the whole facet's properties. Also fixed facets cache and facets reordering NPE.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:18:39 +00:00
Will Abson
14f95a1a31 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80656: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77535: Adding first JUnit test of facet config rest api. Part of ACE-1582.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:16:41 +00:00
Will Abson
5b59889b1b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80653: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77394: Aikau/Surf - removed client-side error reporting capalities from Repo and moved to Surf (Aikau client-side errors will now show in the Surf logs)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:16:11 +00:00
Will Abson
1e6ba3e86c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80643: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76831: Enhancement to the /api/solr/facet-config REST endpoint to support facet reordering.
      If you add a query parameter like so: /api/solr/facet-config/{filterID}?relativePos={relativePos?}
      then the specified filterID will be moved by the specified relative position.
      '3' means move it 3 places down the list. '-1' means move it one place up the list.
      Note that currently you cannot provide a HTTP request body (JSON) at the same time as the relativePos param,
      in other words you cannot update the facet metadata and reposition in in one REST call. It is either or.
      We may enhance the webscript to support simultaneous edits of metadata and position at a future date.
      Also added automatic management of facet position on facet create and delete. New facets are put at the
      end of the list - this can easily be changed if it is not what's wanted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 16:14:31 +00:00
Will Abson
31dd6cfa6e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80547: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75652: Aikau - Added Aikau service for posting client-side errors back to the server and a Repository service for handling the error reports


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82842 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:59:09 +00:00
Will Abson
fa0b3b7ab4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80520: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74961: ACE-1582: Added index control and custom data support for the facet configs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:53:15 +00:00
Will Abson
69d382274b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80509: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74144: ACE-1582: added:
           - more facet props to the Model and the related JSON response
           - GET one facet API
           - Sorting by facet index


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:51:24 +00:00
Will Abson
126b6c04cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80504: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73946: ACE-1582: First cut of Solr faceted-search configuration.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:50:43 +00:00
Will Abson
171e7794b1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80483: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73380: Added lastThumbnailModification property into the facet search result.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:39:24 +00:00
Will Abson
5afeb35a07 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80362: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      80296: Merged DEV to V4.2-BUG-FIX (4.2.4)
         61470: MNT-10647 : Discussions: Username link is absent after removing User
            - Disable link for non-existing users in "My Discussions" dashlet. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:30:17 +00:00
Will Abson
f9a98f5466 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << And added alfresco-opencmis-extension 1.0 >>
      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@82736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:29:34 +00:00
Will Abson
bac8ab52c2 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80111: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79532: MNT-11450: Merged DEV to V4.2-BUG-FIX (4.2.4)
         70775: MNT-11450: New filter works incorrect on Discussions Topic List.
            - "New" discussion topics section displays the topics created or updated in the past seven days


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:22:52 +00:00
Will Abson
a4b129feab Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80106: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79276: Merged DEV to V4.2-BUG-FIX (4.2.4)
         77363: MNT-11964 : Users other than admin are unable to start discussion/link/blog.
         Added additional permission check for site container, required in case if there are no items created yet.
         79160: MNT-11964 : Users other than admin are unable to start discussion/link/blog.
         Added tests to simulate the issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:22:04 +00:00
Will Abson
edc8ebc3a5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
      79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
           and multiple versions of opencmis-gnamefilter-context.xml)
      78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
         - Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
         - SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
         - There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
         - Left a few  references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:21:53 +00:00
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