Commit Graph

5052 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 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/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 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/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Raluca Munteanu
96e14d1f6f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125602 adragoi: MNT-16175 : CLONE - Time Consumed for Updating Folder Permission
      - added setInheritParentPermissions implementation to fix compilation error 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:20:26 +00:00
Raluca Munteanu
21563c3946 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125597 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:19:38 +00:00
Raluca Munteanu
118bed4ed5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125596 mward: ACE-5052: added comment regarding close() expectations.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:19:23 +00:00
Raluca Munteanu
2938c9620a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125595 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:19:08 +00:00
Raluca Munteanu
90b0d1072e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125594 mward: ACE-5052: close file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:18:54 +00:00
Raluca Munteanu
fd071daef2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125593 mward: ACE-5052: close stream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:18:32 +00:00
Raluca Munteanu
622390d88f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125473 amorarasu: 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.2.N/root@125767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:15:31 +00:00
Ancuta Morarasu
2de22b5ec5 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125335 rneamtu: 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.2.N/root@125442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:16:07 +00:00
Ancuta Morarasu
b6cc69db9b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125333 rneamtu: 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.2.N/root@125440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-15 12:15:32 +00:00
Ramona Neamtu
14d4cb8166 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125250 rneamtu: 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.2.N/root@125326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:25:50 +00:00
Ramona Neamtu
fefddb593a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125247 rneamtu: 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.2.N/root@125324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-14 11:24:43 +00:00
Cristian Turlica
4b0a7f9650 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124939 arebegea: 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.2.N/root@125039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:40:10 +00:00
Cristian Turlica
fa503e9c2d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124938 arebegea: 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.2.N/root@125038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-08 14:39:58 +00:00
Cristian Turlica
95332d3c8b Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124703 rmunteanu: 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.2.N/root@124856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-05 12:55:11 +00:00
Raluca Munteanu
c9032ad3e7 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124582 rmunteanu: 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.2.N/root@124656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-31 14:43:48 +00:00
Raluca Munteanu
b2188fa39a Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124491 aleahu: 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.2.N/root@124519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:01:42 +00:00
Alexandra Leahu
463aa9508f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124472 dhulley: Formatting during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-25 13:07:37 +00:00
Andreea Dragoi
5d13806c7e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124313 adragoi: 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.2.N/root@124364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-22 14:32:10 +00:00
Andreea Dragoi
fc26cc8af1 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124303 rneamtu: 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.2.N/root@124310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 15:18:46 +00:00
Alan Davis
47464aa8c2 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124237 amorarasu: 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.2.N/root@124278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:06:14 +00:00
Alan Davis
741769a993 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124236 amorarasu: 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.2.N/root@124277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:05:59 +00:00
Ancuta Morarasu
d20141eb13 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/BRANCHES/DEV/5.2.N/root@124228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:49 +00:00
Ancuta Morarasu
fef6fa3dd0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124096 amorarasu: 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.2.N/root@124222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:49:57 +00:00
Alan Davis
941ca950a9 Merged 5.0.N (5.0.4) to 5.2.N (5.2.1)
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.2.N/root@123892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-14 16:15:59 +00:00
Alan Davis
d945d8d955 Merged 5.1.N (5.1.1) to HEAD (5.2)
123502 adavis: 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/HEAD/root@123711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:35:33 +00:00
Alan Davis
e35fbf5222 Merged 5.1.N (5.1.1) to HEAD (5.2)
123433 amorarasu: 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/HEAD/root@123708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:35:13 +00:00
Alan Davis
f15b433ef4 Merged 5.1.N (5.1.1) to HEAD (5.2)
123431 amorarasu: 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/HEAD/root@123706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:35:00 +00:00
Alan Davis
31d91c1fd5 Merged 5.1.N (5.1.1) to HEAD (5.2)
123329 cturlica: 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/HEAD/root@123696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:33:49 +00:00
Alan Davis
38f73d02ae Merged 5.1.N (5.1.1) to HEAD (5.2)
123152 amorarasu: 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/HEAD/root@123694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:33:33 +00:00
Alan Davis
8f7e06cb95 Merged 5.1.N (5.1.1) to HEAD (5.2)
123030 rmunteanu: 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/HEAD/root@123692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:33:17 +00:00
Alan Davis
c4b6a1e7a7 Merged 5.1.N (5.1.1) to HEAD (5.2)
122997 mrogers: 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/HEAD/root@123690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:52 +00:00
Alan Davis
f7ce09fe3e Merged 5.1.N (5.1.1) to HEAD (5.2)
122984 rmunteanu: 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/HEAD/root@123687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:30 +00:00
Alan Davis
9aea46c7ae Merged 5.1.N (5.1.1) to HEAD (5.2)
122983 rmunteanu: 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/HEAD/root@123686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:22 +00:00
Alan Davis
c6eef005f3 Merged 5.1.N (5.1.1) to HEAD (5.2)
122735 adragoi: 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/HEAD/root@123684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:32:08 +00:00
Alan Davis
b6bec0669e Merged 5.1.N (5.1.1) to HEAD (5.2)
122665 aleahu: 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/HEAD/root@123682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:52 +00:00
Alan Davis
963320d6c2 Merged 5.1.N (5.1.1) to HEAD (5.2)
122653 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122623 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122577 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122484 amukha:       Reverse merged V4.2.6 (4.2.6)
                     118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
                        117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
                           - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:44 +00:00
Alan Davis
03c9eaeb9f Merged 5.1.N (5.1.1) to HEAD (5.2)
122488 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122474 rneamtu: Merged DEV to 5.0.N (5.0.4)
         122425 rneamtu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
            - fixed cancel editing and delete failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:27:02 +00:00
Alan Davis
fd10e5112f Merged 5.1.N (5.1.1) to HEAD (5.2)
122472 dhulley: Increase the TTL for the property value cleaner to 1 hour (ACE-5153)
    - Simplify the lock code because it's not iterative i.e. just lock and unlock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:40 +00:00
Alan Davis
0035333246 Merged 5.1.N (5.1.1) to HEAD (5.2)
122470 dhulley: Request failure details from SQL execution in method 'PropertyValueDAOImpl.cleanupUnusedValues()' (ACE-5143)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:23 +00:00
Alan Davis
66c532ceb6 Merged 5.1.N (5.1.1) to HEAD (5.2)
122469 dhulley: Add option to propagate exceptions out during SQL execution, in order to detect failures (ACE-5143)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:16 +00:00
Alan Davis
fd37b8d6d8 Merged 5.1.N (5.1.1) to HEAD (5.2)
122467 dhulley: Add back missing code for MNT-12716 in order to address ACE-5143 correctly
    - MNT-12716: 3.4 -> 4.2 Upgrade does not migrate locales of translated documents 
    - ACE-5143: CLONE - CleanAlfPropTables deleting more than it should
    - The move of the SQL execution framework to a ScriptExecutor seems to have dropped the feature allowing --ASSIGN to have a default value
    - Added back the feature
    - Added check of variable assignment with system message giving details e.g.
       Caused by: ... Variable assignment '--ASSIGN:PROP_DOUBLE_MAX_ID' produced no value. A default can be assigned e.g. '--ASSIGN:PROP_DOUBLE_MAX_ID!-1'. (line 80 of ...\CleanAlfPropTables.sql).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:26:01 +00:00
Alan Davis
0c0dbb8d60 Merged 5.1.N (5.1.1) to HEAD (5.2)
122427 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
         -added validation on backend to prevent multiple requests for joining a site
         -updated unit tests
         -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:47 +00:00
Alan Davis
259d5ebea7 Merged 5.1.N (5.1.1) to HEAD (5.2)
122341 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122280 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122237 amukha: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122236 amukha: Merged AMUKHA/MNT-15509 (4.2.6) to V4.2.6 (4.2.6)
               122202 amukha: MNT-15509: Changing a Site from Private to Public duplicates permissions
                  - Removed duplicate permissions for ScripNodes
                  - Added JUnit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:39 +00:00
Alan Davis
06cc11ae36 Merged 5.1.N (5.1.1) to HEAD (5.2)
122216 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122101 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122078 amukha: MNT-15654: Un-sharing updates the modified properties of a file
            - Disabled audit during unshare.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:32 +00:00
Alan Davis
42bc4fcb7d Merged 5.1.N (5.1.1) to HEAD (5.1)
121797 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121765 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         121735 rneamtu: 121670: MNT-13814 : Using MS word Save As pdf does not work correctly.
            - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:43:05 +00:00
Alan Davis
05fd2f8800 Merged 5.1.N (5.1.1) to HEAD (5.1)
121796 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
            121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
               - Added new mimetype "application/applefile" and set it for files that starts with "._"
               - Added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:56 +00:00
Alan Davis
678273be01 Merged 5.1.N (5.1.1) to HEAD (5.1)
121674 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      121659 abozianu: Merged DEV to 5.0.N (5.0.4)
         121643 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
            - fixed webscript error


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