Commit Graph

1362 Commits

Author SHA1 Message Date
Andrei Rebegea
c59805a1cb Merged 5.2.N (5.2.2) to HEAD (5.2)
135802 amukha: MNT-16931 Partially revert the fix for MNT-14367


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-14 17:09:09 +00:00
Andrei Rebegea
25c8c95298 Merged 5.2.N (5.2.2) to HEAD (5.2)
135560 skopf: REPO-2112 - Security: MNT-17545: HTTP Header Injection in ContentStreamer
   MNT-17545 - HTTP Header Injection in ContentStreamer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-14 17:06:56 +00:00
Andrei Rebegea
4b23014fee Merged 5.2.N (5.2.2) to HEAD (5.2)
135537 skopf: REPO-2109 - Security: MNT-17475: WebDAV: SXSS+CSRF vulnerability in SSO environments
   MNT-17475 - WebDAV: SXSS+CSRF vulnerability in SSO environments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-14 17:06:49 +00:00
Andrei Rebegea
c1270defd1 Merged 5.2.N (5.2.2) to HEAD (5.2)
135255 arebegea: MNT-17427 : api/invite/cancel deletes records in the database with a GET: CSRF/XSS attack
      - delete the script/org/alfresco/repository/invite/invite.get
      - use the alternatives: script/org/alfresco/repository/site/invitation/invitation.post and script/org/alfresco/repository/site/invitation/invitation.delete
      - updating the tests
      - updating the controller for the invitation.delete to a java controller
      - fix test fallout (SiteServiceTest testInviteDisabledUser - expected error status code)
      - improve security by allowing only invitationIDs that belong the the site passed as parameter to be canceled
      - be consistent and return 404 when an invitationID can not be found


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-14 17:02:29 +00:00
Alan Davis
3a78216a43 Merged 5.2.0 (5.2.0) to HEAD (5.2)
134416 amukha: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      134396 amukha: Merged DEV to 5.2.N (5.2.1)
         133903 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" take user disabled status in to account for external authentication subsystem + tests
         133907 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" don't propagate user disabled exception
         133930 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" move test class and add to a test suite
         134295 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
            - Added a test to simulate creation of missing person during external auth log in.
         134315 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
            - Added a fallback to supprt the logging in by non provisioned users.
         134354 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
            - Added a test with deauthorized user. Refactored existing test to start context once.
         134359 jvonka: REPO-1227: External authentication - prevent disabled user from authenticating
            - add log warning (with masked username, similar to brute force attack) if authentication bypassed when setting user details
         134372 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
            - Updated core and data model (contain new logging)
         134390 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
            - isEnabled flag for users is returned correctly
            - Added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-02-07 15:05:53 +00:00
Alan Davis
5584458b2f Merged 5.2.0 (5.2.0) to HEAD (5.2)
133996 rneamtu: ACE-5416: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      133567 rneamtu: ACE-5639: Comment Activitiy Feed Entries made outside of site show @@NULL@@
         - If siteInfo does not exists do not post comment related activity


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-11 10:37:06 +00:00
Kevin Roast
2bcc803206 Merged 5.2.0 (5.2.0) to HEAD (5.2)
133416 rneamtu: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      133350 rneamtu: ACE-5647: [Win7,chrome] Configure dashboard - Configuration not saved after removing dashlets to trashcan	
         -Run the deleteDocument action as pathRunAsUser (system for non-admin users) same as is done for updateDocument and createDocument.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-12 09:38:58 +00:00
Alan Davis
8edcef3a38 Merged 5.2.0 (5.2.0) to HEAD (5.2)
133188 ahind: Fix for     ACE-5615    Site cannot be found after several sites are created


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 17:21:45 +00:00
Alan Davis
7ffe84308a Merged 5.2.N (5.2.1) to HEAD (5.2)
132544 rneamtu: SHA-1867 : Unable to create links in Shared Files / My Files root node from the Search Results page
      - Added method WebScriptUtil.resolveNodeReference() which will resolve nodeRef


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-10 16:59:59 +00:00
Alan Davis
cc1598b3d1 Merged 5.2.N (5.2.1) to HEAD (5.2)
132357 adavis: Merged 5.2.N-SERVLET-3.0 (5.2.1) to 5.2.N (5.2.1)
      131490: REPO-1238 / REPO-1413: Use data-model with the OpenCMIS upgrade.,
      131493: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0.
          - Compilation errors fixed
          - Removed old JAX-WS listener from web.xml + sun-jaxws.xml - obsolete after the upgrade (OpenCMIS has replaced JAX-WS with Apache CXF)
          - Set chemistry-opencmis-test-browser version to 0.14.0, since it was removed in 1.0.0 (TODO: see if something from 1.0.0 can be used instead)
          - Changed dependency on XmlSchema 1.4.7 to xmlschema-core 2.2.1 (required by Apache CXF) - implications of this change still to be addressed.,
      131569: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0.
          - Possible fix for the browser binding - since OpenCMIS 0.13.0, repository URLs always require a cmisselector parameter (see CMIS-893).,
      131671: REPO-843 Upgrade our Servlet API usage to 3.0.1 (from 2.4 / 2.5)
         - Modifications to weblogic-application.xml to allow Weblogic 12.2.1.1 to start with the changes
           made so far for the 1.0 Open CMIS upgrade (REPO-1238). This follows the Servlet 3.0 upgrade
           which resulted in WebLogic not starting. The Open CMIS upgrade has helped with fixing the WebLogic
           start up issue, however...
         - Some of the changes are TEMPORARY to pick up classes and resources from either the JRE or WebLogic
           rather than the alfresco.war. These should be coming from the alfresco.war, but we will still need to
           upgrade the jars that we package. See comments being added to REPO-1413 related to the CMIS upgrade.
         - It is likely that there are other entries in this file that are not needed.,
      131758: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0 - Fix for CMISTCKVersioning tests.
          - The VersioningSmokeTest from the OpenCMIS TCK has been enhanced with the case of checking-in documents with new properties (not just new content). This touches the part of code in CMISConnector that parses the secondary types (aspects), removes the old ones and adds the new. The problem was that even the working copy aspect was removed for checked out documents. This is illegal and an error was thrown.
          - Applies to CMIS 1.1.,
      131815: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0 - Fix for CMISTCKVersioning tests.
          - The VersioningSmokeTest from the OpenCMIS TCK has been enhanced with the case of checking-in documents with new properties (not just new content). So the tests check-in a document with the same name as the original name causing the rename of the working copy to fail. I added an extra check on the name format for working copies.
          - Applies to CMIS 1.0.,
      131843: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0 - Fix for CMISTCKCRUD tests.
          - The SetAndDeleteContentTest from the OpenCMIS TCK has been enhanced with tests that append content. The case where the content was 0 bytes failed, because of an "unnecessary" (hopefully) check on the content data length.,
      131859: REPO-1413 : Upgrade to OpenCMIS 1.0 - update dependencies and fix compilation and/or build test failures
         - fixed failing testVersioningPropertiesHaveDefaultValue ,
      131868: REPO-1413 : Upgrade to OpenCMIS 1.0 - update dependencies and fix compilation and/or build test failures
         - fixed new failing tests,
      131876: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0
          - Fix for versioning related tests.,
      131907: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0
          - Removed unused dependency on chemistry-opencmis-test-browser,
      132064: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0
          - Removed unnecessary excludes, updated data-model, added junit dependency for legacy-lucene which was relying on a now unused dependency to get the junit.,
      132069: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0
          - Upgrade jaxb libraries to 2.2.11, alfresco-core to 6.7.,
      132110: REPO-843 Upgrade our Servlet API usage to 3.0.1 (from 2.4 / 2.5)
         - Further modifications to weblogic-application.xml
           - Checked file only contains references to files that we actually package in alfresco.war.
           - Add additional entries identified by WebLogic's CAT
             - Exclude myfaces-api-1.1.10.jar classes (used by the Explorer UI, removed in 5.0 but still used by Cloud).
             - Exclude classes that cause start up exception. We must use the RT or Weblogic versions.,
      132161: REPO-1238 / REPO-1413: OpenCMIS upgrade to 1.0.0
          - code review changes
      132356: Change to using data-model 6.6


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 20:07:41 +00:00
Alan Davis
4158363319 Merged 5.2.N (5.2.1) to HEAD (5.2)
131857 rneamtu: SHA-1629 : Creating a link to file in a different location
      - Added support for multiple files in doclink.post webscript
      - Added unit test for api/node/doclink api
      - Added marker aspect app:linked for nodes that have links attached


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:59:24 +00:00
Alan Davis
4618afdaa1 Merged 5.2.N (5.2.1) to HEAD (5.2)
131775 rneamtu:       Reverse merged 5.2.N (5.2.1)
            131742 rneamtu: SHA-1629 : Creating a link to file in a different location
               - Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:58:11 +00:00
Alan Davis
9cfd6462f1 Merged 5.2.N (5.2.1) to HEAD (5.2)
131769 ahind: Fix for SEARCH-222    SOLR 6 - Improved indexing for categories
   - return ancestor based path for better support to internationalise categories etc (by UUID matching the public AIP)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132297 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:57:49 +00:00
Alan Davis
53cbbd39fe Merged 5.2.N (5.2.1) to HEAD (5.2)
131742 rneamtu:       131742 rneamtu: SHA-1629 : Creating a link to file in a different location
            - Added support for multiple files in doclink.post webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:56:56 +00:00
Kevin Roast
e511f5a13c Merged 5.2.N (5.2.1) to HEAD (5.2)
130451 jkaabimofrad: SHA-1598: Minor tweaks of parsing of the property parameter based on GavinC review.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-27 13:58:55 +00:00
Kevin Roast
a8edbc04e1 Merged 5.2.N (5.2.1) to HEAD (5.2)
130404 jkaabimofrad: SHA-1598: Added support to Get Task Instances API to filter result, based on the given property.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-27 13:57:46 +00:00
Alan Davis
55a405d41f Merged 5.2.N (5.2.1) to HEAD (5.2)
130285 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130022 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
         129926 ahind: SEARCH-31    SOLR 6 - Shard based on date - SOLR implementation
         - Support returning a date, datetime or string property to use for sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:08:39 +00:00
Alan Davis
2e47b0cce2 Merged 5.2.N (5.2.1) to HEAD (5.2)
129764 jvonka: REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API
   - remove duplicated code from various locations to use the new methods
   - add sanity checks to Lock*Test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:42:34 +00:00
Alan Davis
f968da0d26 Merged 5.2.N (5.2.1) to HEAD (5.2)
129501 jcule: REPO-1023: Service Pack: MNT-16454 Can't use WebDAV to delete files which have the versionable aspect
     - check that node is is actually locked before unlocking to avoid access denied


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130207 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 14:33:44 +00:00
Kevin Roast
064b771ae0 Merged 5.2.N (5.2.1) to HEAD (5.2)
129874 kroast: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      129680 kroast: Merged 5.0.N (5.0.5) to 5.1.N (5.1.2) (PARTIAL MERGE)
         129458 cpopa: Merged 5.0.2 (5.0.2.24) to 5.0.N (5.0.4)
            129454 cpopa: MNT-15376 : NTLM authentication sometimes fails with IE10+ (chrome OK) - concurrent socket threads   
               - Synchronize the processing of Type1 and Type3 messages on the same session.
               - Synchronize safely by using WebUtils.getSessionMutex(session) than the session object directly
               - Reuse the previously cached Type2Message in the Share SSOAuthenticationFilter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-25 10:41:18 +00:00
Kevin Roast
b0fe463739 Merged 5.2.N (5.2.1) to HEAD (5.2)
129608 mmuller: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      129597 mmuller: Merged 5.0.N (5.0.5) to 5.1.N (5.1.2) (PARTIAL MERGE)
         129593 mmuller: Merged 5.0.4 (5.0.4) to 5.0.N (5.0.5)
            129585 mmuller: Merged 5.0.3 (5.0.3.9) to 5.0.4 (5.0.4)
               129514 mmuller: MNT-16380, REPO-927, ESC-469 Regression fix from 4.2 --> 5.0. Can now use relative paths again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-25 10:39:50 +00:00
Alexandru Epure
b456267c47 Merged 5.2.N (5.2.1) to HEAD (5.2)
129220 kroast: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      129145 kroast: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         128659 cpopa: Merged 5.0.2 (5.0.2.22) to 5.0.N (5.0.4)
            128657 cpopa: MNT-15376 : NTLM authentication sometimes fails with IE10+ (chrome OK) - concurrent socket threads   
               - Reuse the previously created NTLM details cache when a type1 request is being reissued on the same session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:18:03 +00:00
Alexandru Epure
e420e9b477 Merged 5.2.N (5.2.1) to HEAD (5.2)
129216 kroast: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128735 kroast: MNT-16510 - Chrome/Firefox Download action issue for document name without extension


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:17:47 +00:00
Alexandru Epure
e637bcbd6e Merged 5.2.N (5.2.1) to HEAD (5.2)
128660 jkaabimofrad: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128649 jkaabimofrad: Merged JAMAL/MNT-16371 (5.1.2) to 5.1.N (5.1.2)
         128626 jkaabimofrad: MNT-16371: Turned off Inherit Permissions and explicitly added the Site Manager role for the Site to the surf-config folder when it is first created. Also, revoked ownership privileges for surf-config contents.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:06:17 +00:00
Alexandru Epure
a91104fd15 Merged 5.2.N (5.2.1) to HEAD (5.2)
128607 mmuller: Fixed some more javadoc errors after reviewing. REPO-466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:06:08 +00:00
Alexandru Epure
3486d60d90 Merged 5.2.N (5.2.1) to HEAD (5.2)
128569 adavis: MNT-16381 Transformers must validate the content stream mimetype
      - Ensure error when indexer is the caller includes the file name rather than null.
        NodeContentGet now calls transform method with TransformationOptions parameter and the original
        transformer method was deprecated as it should be been when this extra parameter was added.
      - Set the strictMimeTypeCheck and retryTransformOnDifferentMimeType properties on dynamically created
        pipeline and fail over transformers from global properties as is don for static transformers.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:57:13 +00:00
Alexandru Epure
d73d4e1a71 Merged 5.2.N (5.2.1) to HEAD (5.2)
128510 mmuller: Fixed some javadoc errors. REPO-466


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:56:54 +00:00
Alexandru Epure
9621978d0c Merged 5.2.N (5.2.1) to HEAD (5.2)
128215 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128190 amorarasu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         128171 amukha: MNT-16401: Delete comment notification from Blog or Links is not displayed in Site Activities dashlet
            - Corrected the comemnts webscript.
            - Added JUnit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:51:28 +00:00
Alexandru Epure
0dffb373fd Merged 5.2.N (5.2.1) to HEAD (5.2)
128168 adavis: MNT-16381 Transformers must validate the content stream mimetype
      - Addition of AbstractContentTransformer2.strictMimeTypeCheck(...) to check that the
        declared mimetype is the same as the Tika derived mimetype. Controlled by a new alfresco
        global property content.transformer.strict.mimetype.check (set to true by default).
      - Added the UnsupportedTransformationException to a number of transformation callers as
        they should have been handling it already.
      - Modified DifferrentMimeTypeTest to test the new strictMimeTypeCheck.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129272 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:22:16 +00:00
Alexandru Epure
9d7fda1b38 Merged 5.2.N (5.2.1) to HEAD (5.2)
128093 arebegea: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128045 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         127999 rneamtu: Merged DEV to 5.0.N (5.0.4)
            127518 rneamtu: MNT-15457 : Can not define site filter via solr-facets-config-custom.properties file
               - Set qname for SITE special facetable property


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129267 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 13:17:12 +00:00
Jan Vonka
d57202f68b Merged 5.2.N (5.2.1) to HEAD (5.2)
128386 jvonka: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128375 jvonka: MNT-16446: Edit Comment permission (part 3) 
      - for CMIS (and also future v1 Nodes REST API)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-12 12:00:37 +00:00
Alan Davis
3e1e1edbaa Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: 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/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
19fcf2c411 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: 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/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
da8101a5ba Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: 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/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Alan Davis
68165dc843 Merged 5.2.N (5.2.1) to HEAD (5.2)
124450 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124423 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124409 cturlica: MNT-15715: CLONE - The file extension of any unknown mimetype is lost during download and replaced by .bin.
            - Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                  122029 amukha: MNT-14412: The file extension of any unknown mimetype is lost during download and replaced by .bin.
                     - Now the mimetype guessing is not done for IE if the mimetype is binary (possibly unknown for Alfresco)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:03:41 +00:00
Alan Davis
418c658ac7 Merged 5.2.N (5.2.1) to HEAD (5.2)
124229 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124146 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124109 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124108 amorarasu: MNT-15801 : onContentUpdate policies not working for updates via webdav
               - Fixed code merged from 4.1.N, a different LockInfo method is used.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:23 +00:00
Alan Davis
01c9e0a933 Merged 5.2.N (5.2.1) to HEAD (5.2)
124228 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124145 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
               123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
                  MNT-15801 : onContentUpdate policies not working for updates via webdav
                     - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
                     - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:00:17 +00:00
Jamal Kaabi-Mofrad
e04f7136be Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127462 jkaabimofrad: Merged 5.1.N (5.1.2) to API-STRIKES-BACK (5.2.0)
      127454 jkaabimofrad: MNT-16224, RA-1093: Fixed Quickshare issue where deleting a shared node didn't remove the 'shared' aspect. The fix also takes care of the shared nodes that have been deleted but not yet restored, as well as, shared nodes that have already been restored from the trashcan (allow the user to un-share).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:25:00 +00:00
Jamal Kaabi-Mofrad
f79e7be94d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
123868 jkaabimofrad: RA-856: Added support for REST APIs “/content” endpoints to optionally set their own cache. (Currently, only the Renditions API is setting its own cache)
       - Removed the http attachment header setting from the AbstractResourceWebScript, as the ContentStreamer already has this feature
       - Reformatted ContentStreamer according to Alfresco code standards 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:24:48 +00:00
Alan Davis
7a8ad6e632 Merged 5.1.N (5.1.1) to HEAD (5.2)
123429 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123347 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123049 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122966 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed compilation error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:47 +00:00
Alan Davis
d62ac8b95a Merged 5.1.N (5.1.1) to HEAD (5.2)
123428 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123346 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123048 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122964 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:39 +00:00
Alan Davis
6da9f1acc7 Merged 5.1.N (5.1.1) to HEAD (5.2)
123426 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123344 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123045 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122858 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Java-backed webscript CommentDelete added
               - Auditable behavior is disabled around deleting comment-node
               - Added unit test for case: CommentsApiTest.testDeleteCommentDoesNotChangeModifiedDate


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:24 +00:00
Alan Davis
26b47e74dd Merged 5.1.N (5.1.1) to HEAD (5.2)
122553 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122494 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122434 rneamtu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122333 amorarasu: Merged DEV to V4.2.6 (4.2.6)
               121922 122190 122271 122292 amorarasu: MNT-13739: Site consumers are able to lock documents (they did not create) via WebDAV
                  - Went back to using the secured lock service
                  - Unlock resource after MOVE only if the it was locked


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:09 +00:00
Alan Davis
2d6b854cc5 Merged 5.1.N (5.1.1) to HEAD (5.1)
121691 adavis: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      121100 amorarasu: Merged DEV to 5.0.N (5.0.4)
         120779 amorarasu: MNT-14416: Click the document uploaded via protocol like AOS in Share site My Activities will take you to a folder view
            - Set null path for newly created files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:48 +00:00
Alan Davis
1ca60fc47a Merged 5.1.N (5.1.1) to HEAD (5.1)
121627 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
         - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
         - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
         - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:09 +00:00
Alan Davis
98a4e139b4 Merged 5.1.N (5.1.1) to HEAD (5.1)
120594 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120538 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:35 +00:00
Alan Davis
33bb9e3ad3 Merged 5.1.N (5.1.1) to HEAD (5.1)
120443 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:10 +00:00
Alan Davis
d3d2a6612a Merged 5.1.N (5.1.1) to HEAD (5.1)
120429 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:00 +00:00
Alan Davis
de829cb701 Merged 5.1.N (5.1.1) to HEAD (5.1)
120428 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:51 +00:00
Alan Davis
21549b96bc Merged 5.1.N (5.1.1) to HEAD (5.1)
120414 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120386 abozianu: Merged DEV to 5.0.N (5.0.4)
         120352 abozianu: MNT-14411 : Re-created user can't cancel created task
            - fix and unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:42 +00:00