inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,351 Commits 337 Branches 2,253 Tags
e83e9f4bc1c3adc6d65ee6adff6b74e3d9397fa6
Commit Graph

6315 Commits

Author SHA1 Message Date
Raluca Munteanu
de37b8662d Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 
125577 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
      - Implemented new requirements and tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 12:40:15 +00:00
Raluca Munteanu
e88080bb6d MNT-16155 : Change source headers to new version 
- fixed more license headers

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-20 12:36:42 +00:00
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
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
Ancuta Morarasu
f12308b25d Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125304 mward: ACE-5052: close spring application context in EmailServer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-15 12:13:32 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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