Commit Graph

6464 Commits

Author SHA1 Message Date
Stefan Kopf
ba38ba1fe5 REPO-1110 - Apply patch provided in ALF-21632 (FreeMarker performance improvement)
ALF-21632 - FreeMarker API node.childByNamePath can be very slow

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-04 16:59:43 +00:00
Derek Hulley
b81b8714e3 MNT-12194: Unhelpful error message in AlfrescoCMISServiceImpl.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-04 14:10:48 +00:00
Derek Hulley
75d056f198 MNT-16527: Improve API documentation description for deleteNode, purgeArchivedNode and NodeService
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-04 11:45:54 +00:00
Alex Mukha
de2f2f00d7 REPO-1468: MNT-15627: clear password for Outbound SMTP is shown ACE-5304: Provide method of encrypting LDAP bind properties
- Changed the default mask for protected properties.
   - Removed "show password" buttons as non functional any more (kudos arebegea)
   - Added LDAP sync password to the list of protected.
   - Changed the way protected properties are saved.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 18:24:30 +00:00
Alan Davis
2789661377 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/BRANCHES/DEV/5.2.N/root@132357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 17:28:19 +00:00
Steven Glover
761b6c2b21 Merged from DEV/SG/REPO1259 to 5.2.N
MNT-16541 "Cache update for custom workflow model fails" update to use released alfresco-core and alfresco-data-model

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 17:04:49 +00:00
Alexandra Leahu
6c41a4f779 REPO-1219: Allow file content URLs to be generated by a provider
- merged implementation from ACE-5093
   - marked the FileContentUrlProvider as public
   - added the default implementation bean, and injected it in the TenantRoutingFileContentStore 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-02 15:43:31 +00:00
Derek Hulley
6451543233 Remove redundant setter and related bean injection (deprecated in 3.0)
Remove deprecated NodeArchive-related methods

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-02 14:40:24 +00:00
Alex Mukha
1a8c5236b2 REPO-1471: MNT-15895 Masking of Admin User Password in the debug log
- Modified the regex to fullfill more usecases.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-02 14:13:53 +00:00
Andrew Hind
6e3ab8a166 Fix for SEARCH-228 SOLR - version store nodes are indexed with the wrong ACL and PATH
- Index the ACL and PATHs for the current live version (which will not be updated).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-01 22:00:11 +00:00
Andrei Rebegea
1e97c7c275 ALF-18332 : WorkflowObjectFactory.createTransition doesn't use the description property
- Fixed default description key for transition + added testcase
   - merged from DEV/HEAD_WROKFLOW to 5.2.N

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-01 09:07:52 +00:00
Alex Mukha
ff2009d2a6 REPO-1471: MNT-15895 Masking of Admin User Password in the debug log
- The username and password strings are removed from debug logs in JSON format.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131910 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-31 18:06:00 +00:00
Martin Muller
94cebbefbc MNT-15024. Implemented content.metadataExtractor.pdf.overwritePolicy property and get rid of a redundancy setter for the the overwritePolicy which causes a ambitious warning.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-31 15:41:32 +00:00
Derek Hulley
308da0f956 Further to MNT-16375: Updated API to reflect requirement to have a 'maxResults' parameter.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-31 11:52:37 +00:00
Alex Mukha
26812efe29 REPO-1082: ACE-5304: Provide method of encrypting LDAP bind properties
- Fixed creation of subsytems, now the encrypted properties are passed to them.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131875 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-28 17:54:50 +00:00
Ramona Neamtu
fee7ef2ad4 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/BRANCHES/DEV/5.2.N/root@131857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-28 12:09:59 +00:00
Andrew Hind
7457fa5b13 Build fix after - Further fix for MNT-16921 Unnecessary search calls on type ahead component in Tag Component on the Document Library
- over fetch by one to resolve has more for paging

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 19:55:32 +00:00
Andrew Hind
884ece5cc0 Further fix for MNT-16921 Unnecessary search calls on type ahead component in Tag Component on the Document Library
- bulk fetch for categories/tags is now limited to 5000 it can be configured higher

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 17:44:11 +00:00
Ramona Neamtu
354f66df4c 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/BRANCHES/DEV/5.2.N/root@131775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 09:39:37 +00:00
Andrew Hind
f5602d00b4 Fix for https://issues.alfresco.com/jira/browse/SEARCH-188
- support creator and modifier

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-26 08:47:10 +00:00
Ramona Neamtu
2d7b780763 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/BRANCHES/DEV/5.2.N/root@131742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-25 14:39:25 +00:00
Andreea Dragoi
c95cbaccd9 MNT-16709 : Metadata extraction on 200MB PDF file causes large heap utilization
- added concurrent extraction limit
   - added max document size limit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-24 12:13:50 +00:00
David Draper
2b4db66fbe SHA-1771: Final (hopefully) bug fix on search term highlighting parameter handling
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-22 19:05:29 +00:00
David Draper
2f24cb6e45 SHA-1771: Improve handling of search term highlighting parameters in script object
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-21 18:16:52 +00:00
David Draper
2ca1dffb63 SHA-1771: More script object updates for search term highlighting
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-21 14:39:22 +00:00
David Draper
bbe7bd712b SHA-1771: Search script object updates for highlighting
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-21 08:38:40 +00:00
Martin Muller
9c906b9857 Reverting 131547
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 15:05:06 +00:00
Martin Muller
7fc64be964 REPO_1259, MNT-16541. Using init instead of destroy for workflow listener. Otherwise it could lead to a deadlock since 5.0.3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 12:56:30 +00:00
Derek Hulley
567dbf9dd5 Fixed imports found during investigation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 11:20:35 +00:00
Gethin James
3c7a0a0e2e SEARCH-107: Extend search public API for multi-select facets
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 07:58:16 +00:00
David Draper
edba48ea75 SHA-1771: Update Search script object to support search term highlighting
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-18 16:02:13 +00:00
Kevin Roast
829474d7e4 Merged DEV/WEBAPP-API (5.2.0) to 5.2.N (5.2.N)
131265 kroast: Merged 130934 from HEAD - SHA-1698

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-17 15:47:06 +00:00
Iuliana Danea
7e51279b82 ACE-5463: 500 error: GET /nodes/{nodeId}/comments?skipCount=XXX
-implemented fix and added new unit test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-17 10:55:17 +00:00
Iuliana Danea
5283ba4762 ACE-5453: 500 error: GET /nodes/{nodeId}/ratings?skipCount=XXX
- implemented fix and added new unit test 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-13 06:52:01 +00:00
Gethin James
8942cd5586 SEARCH-195: Removed duplicate code
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-12 16:06:38 +00:00
Cristian Turlica
cf5a52b978 REPO-1394: Discovery: merge back to 5.2.N (from feature branch)
Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      130980 jkaabimofrad: REPO-224: API for retrieving detailed repository information.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131056 jkaabimofrad: REPO-224: Removed "transformationServerExpiresAt" attribute from the license JSON response as it is not part of AC.
   Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
      131179 jkaabimofrad: REPO-224: Modified the license's entitlement response to always return "isClusterEnabled" and "isCryptodocEnabled".

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-12 05:14:58 +00:00
Gethin James
f32522319d SEARCH-181: Sending CountDocsMissingFacetField to solr
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 15:48:10 +00:00
Gethin James
99a47b92e7 SEARCH-106: Fix highlighting typo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 10:59:54 +00:00
Gethin James
595d281c20 SEARCH-106: Add hightlighting to the ResultSet
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131294 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 07:12:32 +00:00
Gethin James
7c7587e477 SEARCH-106: Add hightlighting to the ResultSet
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 07:12:30 +00:00
Gethin James
460db685d7 SEARCH-194: Adding hightlighting to the Solr Http request
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-11 07:12:19 +00:00
Alex Mukha
33ee24817c Merged DEV to 5.2.N (5.2.1)
131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-10 17:34:57 +00:00
Derek Hulley
245770e049 Updated to use alfresco-data-model:6.1-SNAPSHOT that includes the removal of ContentStore.getUrls methods
- Fixed derived code to remove the implementations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-06 19:46:02 +00:00
Derek Hulley
4125597e28 Removed redundant content replication-related code. AggregatingContentStore replaced it.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-06 19:43:51 +00:00
Alex Mukha
395ff422c5 REPO-1357: HotFix: MNT-16889: With encryption enabled alf_content_url_encryption not set using ContentService getWriter(null,,false)
- Fixed creation of the content URL so that the key is not lost.
   - Added a test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-06 16:28:14 +00:00
Joel Bernstein
5efe89b616 SEARCH-175: Support Solr4 and Solr6 spellcheck response formats
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-04 21:42:20 +00:00
Constantin Popa
c4484c18e3 SHA-1779 : Double slash in the pending invites link
- Get rid of the double slash in the pending invites link

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-23 12:22:28 +00:00
Derek Hulley
f593629a86 Removed tabs found during investigation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-20 01:24:21 +00:00
Steven Glover
a11c8778e9 Reverse Merge:
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-19 10:23:19 +00:00
Steven Glover
e83e9f4bc1 Merged DEV/SG/MNT15135 to 5.2.N
MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-15 13:06:35 +00:00