Commit Graph

5874 Commits

Author SHA1 Message Date
Raluca Munteanu
94228f57a2 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:55:49 +00:00
Raluca Munteanu
e76a93cf89 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:30:21 +00:00
Raluca Munteanu
86dc6f3402 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/BRANCHES/DEV/5.1.N/root@125603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 10:21:07 +00:00
Andreea Dragoi
dc1efb2c98 MNT-16175 : Errors after merging MNT-15368
- added setInheritParentPermissions implementation to fix compilation error 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-20 09:43:02 +00:00
Matt Ward
cf51b701c3 ACE-5052: close stream
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 16:09:02 +00:00
Matt Ward
d5ac8580cd ACE-5052: added comment regarding close() expectations.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 15:53:24 +00:00
Matt Ward
d7a5ecfece ACE-5052: close file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 15:40:24 +00:00
Matt Ward
83e8af3b96 ACE-5052: close file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 15:37:34 +00:00
Matt Ward
ef9fa5faf6 ACE-5052: close stream
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 15:25:50 +00:00
Matt Ward
03c41432e1 ACE-5052: close FileInputStream
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 15:05:48 +00:00
Matt Ward
7a99c2dd88 ACE-5052: close spring application context in FTPServerBean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 13:32:10 +00:00
Matt Ward
e20622b1bf ACE-5052: close spring application context in CIFSServerBean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-19 13:30:06 +00:00
Ancuta Morarasu
3e0bd2e8ff Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
125055 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) (PARTIAL MERGE)
      124999 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
         124402 adragoi: MNT-15368 : Time Consumed for Updating Folder Permission
            - implemented an approach that uses a separate, asynchronous processes that sets fixed ACL's


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:56:00 +00:00
Ancuta Morarasu
52fd5a10c0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
125051 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124925 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
         124738 adragoi: MNT-14882 : NFS Client: Issuing 'list' command on a mounted directory with over 1000 entries does not return
            - save resumeId state on ContentSearchContext


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125470 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:45:12 +00:00
Ancuta Morarasu
32c4c9be05 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125307 gjames: ACE-5091: Changed the javadoc formatting for TransactionService


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:34:01 +00:00
Ramona Neamtu
2e65b6c74b Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125223 amukha: MNT-15743: documentlibrary generation anomaly in Share
      - Added a check to ensure that a proper doc lib container would be created.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:34:22 +00:00
Ramona Neamtu
9179d37c1e Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125215 bhorje: ACE-5308 set valid parent association qname 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:32:33 +00:00
Matt Ward
674dfb9570 ACE-5052: close spring application context in EmailServer.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 09:24:04 +00:00
Ramona Neamtu
bfb4c39628 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125148 bhorje: ACE-5307 the title property remains unset for smart virtual folders  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-13 13:37:00 +00:00
Ramona Neamtu
c1966f458d Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125138 bhorje: ACE-5306 added cm:titled aspect to virtual smart folder entries  


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125247 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-13 13:34:37 +00:00
Andrei Rebegea
58df45a289 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124889 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
      124745: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo test fixes, including:
      - FileFolderServiceImplTest.testMove


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-06 14:51:09 +00:00
Andrei Rebegea
e303d5348c Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124888 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
      124735: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo tests, including:
      - FileFolderServiceImplTest.testMoveCopyLotsOfFiles
      - DbNodeServiceImplTest.testDuplicateCatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-06 14:50:52 +00:00
Raluca Munteanu
33cc415ab0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124682 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
      124674: MNT-15211: Follow-on (note: only affects NDB)
      - use string_value 400 to enable schema bootstrap (and be consistent with existing customer pilot DBs)
      - minor tweaks to unit test cases (note: only affects NDB)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-01 08:27:45 +00:00
Raluca Munteanu
c9f13752c3 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124539 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
      124514: MNT-15211: NDB-specific workaround fix for trashcan restore (since NDB does not support partial rollback on constraint violation)
      - this fix is dialect-specific (hence does not impact existing supported DB types)
      - note: MySQL Cluster NDB - experimental/unsupported


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-30 08:01:49 +00:00
Alexandra Leahu
25d3a86f0b Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124465 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124433 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         124363 adragoi: MNT-15846 : The RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout fails on DB2
            - wait thread to finish checkout 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-25 13:13:42 +00:00
Derek Hulley
db240db28c Formatting during investigations
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-24 17:26:20 +00:00
Andreea Dragoi
77cbbce481 MNT-15909: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124244 abalmus: MNT-15497 : Keyword tags generated from metadata extraction are formed into a single string rather than split on delimiter
      - Fixed tag separation on delimiter
      - Enhanced existing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 15:24:58 +00:00
Ramona Neamtu
88c3c0e730 MNT-15881 : CLONE - Share rule constraints missing due to ActionExecuterAbstractBase's regression
Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124129 rneamtu: Merged DEV to 5.0.N (5.0.4)
         124118 rneamtu: MNT-15802: Share rule constraints missing due to ActionExecuterAbstractBase's regression
            - Set parameter constraint name for localized parameters
            - Added unit test for case

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 13:05:37 +00:00
Ancuta Morarasu
0e2d8b083a Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
124191 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124133 arebegea: MNT-14671 : Site with document locked for Edit Offline cannot be deleted
         - disabled the ASPECT_LOCKABLE when deleting a site
         - added tests for delete and restore site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 13:00:05 +00:00
Ancuta Morarasu
45c9d15805 Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
         - added a new method to InvitationService to make use of the limit in the searchInvitation
         - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
         - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
         - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
         - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:57:18 +00:00
Ancuta Morarasu
143b52b51c 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/BRANCHES/DEV/5.1.N/root@124145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-16 14:26:29 +00:00
Ancuta Morarasu
0bedf1813d Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123996 sglover: MNT-15655 "Possible to violate child cm:name uniqueness constraint via NodeService.addAspect"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:06:16 +00:00
Ancuta Morarasu
5ad98616ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123880 rneamtu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123574 amorarasu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123414 123524 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
            - Content Data should be created only when it has a binary, not as a side effect of getters on ScriptNode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124094 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 15:04:08 +00:00
Alan Davis
666a4bd587 Tidy up after merge from 5.1.N to HEAD
- This batch are to do with Mark's commits and reverts
     The 5.1.N 119393 record only merge should have had some changes from HEAD 118791

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 00:05:06 +00:00
Alan Davis
da58d9fe29 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123484 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
      - Fixed TransformerPropertyNameExtractor so that it discarded limit or
        max properties if its sibling max or limit value is supplied and has
        a lower value (i.e. it should be used).
      - Cleaned up TransformerConfigLimits.setTransformationLimitsFromProperties
      - This has been a problem since 4.2.
      - The problem only came to light with the switch to Java 8, as the order in which
        transformer properties are loaded changed. They were being loaded in MapEntry order.
        The problem did not show up in the unit tests, because they too were impacted by
        the MapEntry order and ironically loaded the properties in the same order.
      - Added unit tests that are supply both max an limit values.
      - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 20:33:58 +00:00
Ancuta Morarasu
57562b2557 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123356 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123206 adavis: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         123099 amorarasu: MNT-15798: CLONE - call to guessMimetype() on a node that has no content creates a content property
               Reverse merged V4.2.6 (4.2.6)
                  104274 mbobyleu: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
                     102794: MNT-8678 : call to guessMimetype() on a node that has no content creates a content property
                        - add check for empty content before saving a node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123433 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 13:14:11 +00:00
Ancuta Morarasu
80aa1b0ba3 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
123349 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123109 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
         123105 adragoi: MNT-15705 : CLONE - Receiving error when bulk deleting content in Share
            - created remove overloaded method in script node that uses a new transaction and used it for bulk delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-10 13:13:34 +00:00
Alan Davis
c6919d115a Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123406 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123405 adavis:       Reverse merged V4.2-BUG-FIX (4.2.7)
               123400 adavis: Merged 5.0.N (5.0.4) to V4.2-BUG-FIX (4.2.7)
                  123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
                     - Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
                       so that it does not clear the limit (e.g. readLimitTimeMs) when setting
                       the max value (e.g. timeoutMs) or the other way around. It is normal to
                       have both values defined for the default.transformer. 
                     - This has been a problem since 4.2.
                     - The problem only came to light with the switch to Java 8, as the order in which
                       transformer properties are loaded changed. They were being loaded in MapEntry order.
                       The problem did not show up in the unit tests, because they too were impacted by
                       the MapEntry order and ironically loaded the properties in the same order.
                     - Added unit tests that are not impacted by MapEntry order.
                     - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 23:29:42 +00:00
Alan Davis
76dc3c06f5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
      - Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
        so that it does not clear the limit (e.g. readLimitTimeMs) when setting
        the max value (e.g. timeoutMs) or the other way around. It is normal to
        have both values defined for the default.transformer. 
      - This has been a problem since 4.2.
      - The problem only came to light with the switch to Java 8, as the order in which
        transformer properties are loaded changed. They were being loaded in MapEntry order.
        The problem did not show up in the unit tests, because they too were impacted by
        the MapEntry order and ironically loaded the properties in the same order.
      - Added unit tests that are not impacted by MapEntry order.
      - Enhanced the debug and toString methods in order to trace the problem.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 19:31:53 +00:00
Cristian Turlica
b2789f4f12 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123182 gjames: MNT-15494: Added a blacklist of attributes (passwords) no longer shown via JMX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-09 12:22:33 +00:00
Ancuta Morarasu
12f7eeba90 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123098 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122976 tvalkevych: MNT-15783: Merged V4.2.4 (4.2.4.20) to V4.2-BUG-FIX (4.2.7)
         113807 adragoi: Merged DEV to V4.2.4 (4.2.4.16)
            113780: MNT-12240 : Loading of available Tags is slow at 'Edit Properties' -> 'Select Tags' dialog.
               - limited query results sin webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123152 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-07 11:14:26 +00:00
Alan Davis
5b53ff357c Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122920 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122864 sdinuta: ACE-5162: added some logging and made a little change after Bogdan's review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:54 +00:00
Alan Davis
927878fba2 Merged 5.1.0 (5.1.0) to 5.1.N (5.1.1)
122919 jphuynh: Merged SAVA/BRANCHES/ACE-5162 (5.1.0) to 5.1.0 (5.1.0)
      122838 sdinuta: ACE-5162: commited the changes for the solution before internal review


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-04 15:01:45 +00:00
Raluca Munteanu
779c0fc241 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122981 rmunteanu: MNT-15167 : PageLimit value no longer pick up in 5.x with or without Transformation Server installed
      - Preserved transformer properties order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-03 12:00:54 +00:00
Mark Rogers
74686dc957 Merged WOLF-8 (5.1.0) to 5.1.N (5.1.1)
114287 mward: UTF-170: Move TrueZip unmount call to a final block.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122997 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 14:52:16 +00:00
Raluca Munteanu
7721384025 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122911 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122835 gjames: MNT-15114: Adding invokeBeforeDeleteChildAssociation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 13:04:35 +00:00
Raluca Munteanu
06dc388d3d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
         - Allow 'use' style properties to be set
         - Combine 'use' properties more flexibly with the default ones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-02 13:04:05 +00:00
Andreea Dragoi
6a3df9f323 Merged HEAD (5.1) to 5.1.N (5.1.1)
122918 adragoi:       Reverse merged HEAD (5.1)
            122540 adragoi: Merged DEV to HEAD (5.1)
               122252 ACE-5093 : Allow file content URLs to be generated by a provider
                  - implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider  and test classes
               121979 ACE-5093 : Allow file content URLs to be generated by a provider
                  - added deprecated annotation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-01 10:49:17 +00:00
Andreea Dragoi
1e7347116d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
122668 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      122625 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
         122548 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
            122546: MNT-14204: Enterprise bulkimport tool is not versioning for inplace import from two different batches
               - If only version files are imported, version history is no longer removed and the version number is incremented
               - Added new in-place import test and updated one streaming import test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-26 07:46:12 +00:00
Alexandra Leahu
31afcc9f1b Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
122615 rneamtu: Merged DEV to 5.0.N (5.0.4)
      122454 rneamtu: MNT-14602: Add config to support Visio 2013 previews and thumbnails
         - Added support for vsdx mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-02-24 14:55:27 +00:00