inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,445 Commits 339 Branches 2,245 Tags
143b52b51c7f77ca65bfb2b4a451e5d7eb6896dd
Commit Graph

765 Commits

Author SHA1 Message Date
Ramona Neamtu
c1cb1a43b2 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119732 sdinuta: ACE-4795: Adding as favorite a folder/file in virtual context doesn't work as expected


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-15 12:33:47 +00:00
Natalia Smintanca
0b95d698a8 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
120046 abozianu: Merged DEV to 5.0.N (5.0.4)
      117528 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - added a new aspect for cmis checked out documents : ASPECT_CMIS_CHECKEDOUT
      118441 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - changed aspect name from ASPECT_CMIS_CHECKEDOUT to ASPECT_CMIS_CREATED_CHECKEDOUT
      118775 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
         - fixed commit error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 12:21:09 +00:00
Natalia Smintanca
03deaa808f Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
         120019 amukha: MNT-14688: version revert on first version failure if type has aspect
            - Restoring a version now restores the node's type.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 12:16:35 +00:00
Natalia Smintanca
e2d50154b5 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 12:10:27 +00:00
Natalia Smintanca
71b8ebc2be Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
120044 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119749 gjames: MNT-15211 Disabled the non-auditable test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 12:10:01 +00:00
Natalia Smintanca
70095470b6 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
120043 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119724 gjames: MNT-15211 Added a test for restoring non-auditable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-14 12:09:35 +00:00
Raluca Munteanu
c62d655585 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119697 bhorje: ACE-4744 javadoc and cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-11 09:41:45 +00:00
Raluca Munteanu
206f8b08f9 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
119856 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119809 cturlica: Merged DEV to 5.0.3 (5.0.3)
         119807 cturlica: MNT-15329: NodeDAOTest.testSelectNodePropertiesByDataType() failing on Oracle
            - updated unit test (removed duplicate check)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-11 08:54:09 +00:00
Raluca Munteanu
9cf547a63d Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
119829 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      119792 slanglois: MNT-13919 Enable new test MappingMetadataExtracterTest in test suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:01:43 +00:00
Raluca Munteanu
093560c002 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119652 bhorje: ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-07 09:59:09 +00:00
Raluca Munteanu
3c5a92f708 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
119612 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      119559 ragauss: MNT-13919: Check for Metadata Embed Support is Incorrect
        - Added unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-07 09:29:56 +00:00
Ancuta Morarasu
f187db02f3 Merged HEAD (5.1) to 5.1.N (5.1.1) 
119450 mcozma: Merged BRANCHES/DEV/VF_REP_INT_51 to HEAD
   ACE-4716 Can't rename a document in a virtual context from CMIS
   ACE-4752 Type virtualization method does not work
   ACE-4717 Document name is renamed when making "Check in" for a document edited in Google Docs
   ACE-4700 Can't upload to a virtual folder when filename starts with a number and includes dashes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-04 09:10:57 +00:00
Ancuta Morarasu
38ab389189 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
119576 adavis: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
      119521 amukha: Merged 5.0.3-MNT-15258 (5.0.3) to 5.0.3 (5.0.3)
         118559 amukha: MNT-15258: Huge database after upgrade to 5.1.c
            - Added usage of JobLockService for prop cleanup job.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-04 08:58:36 +00:00
Ancuta Morarasu
fe9b8480a8 Merged HEAD (5.1) to 5.1.N (5.1.1) 
118826 mrogers: Rolled back CIFSComparator stuff incorrectly checked in


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-02 10:11:24 +00:00
Andrei Rebegea
721b1640e7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
118653 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118604 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
         118292 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
            - fixed tests by translating test_alf_17260.js to java code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-27 09:12:50 +00:00
Natalia Smintanca
efb26c99dc Merged HEAD (5.1) to 5.1.N (5.1.1) 
118256 sdinuta: ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-23 11:31:38 +00:00
Natalia Smintanca
0c55fc5905 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
118237 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Fixed spacing by removing tabs as per Derek's request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-23 10:57:08 +00:00
Natalia Smintanca
e00500f6f0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
118231 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Added the flag exportSecondaryNodes for the ExporterComponent, and if this is set on true we export the secondary nodes as actual nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-23 10:56:56 +00:00
Natalia Smintanca
f274fc9ce7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) 
118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
      - Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-23 10:56:43 +00:00
Natalia Smintanca
76b0d1dffb Merged HEAD (5.1) to 5.1.N (5.1.1) 
117981 amukha: Merged DEV (5.1) to HEAD (5.1)
      117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
         - Updated the BehaviourFilter interface accordingly.,
      115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
         - Modified the isEnabled(QName className) to correspond with the new logic
         - Modified the JUnit tests.,
      115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Added new API for disabling behaviours.
         - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:48:28 +00:00
Natalia Smintanca
30aae9969e Merged HEAD (5.1) to 5.1.N (5.1.1) 
117633 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
      117189 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship
         - Removed unit test RenditionServiceIntegrationTest.testRenderPdfDocumentToFlash
           The only one that failed in the build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:33:48 +00:00
Natalia Smintanca
9b21aed622 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117625 sglover: ACE-4347 "5.1 Build has had three transient failures related to locking"
   Increase timeouts in JobLockServiceTest tests to account for slower database updates


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:29:47 +00:00
Natalia Smintanca
ecfdf3b35f Merged HEAD (5.1) to 5.1.N (5.1.1) 
117599 bhorje: CM-690 annotated test aspect for IDE compliance 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-19 09:26:22 +00:00
Alan Davis
9e202dcd66 Merged HEAD (5.1) to 5.1.N (5.1.1) 
117531 bhorje: CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite  run with vf enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-14 13:38:20 +00:00
Alan Davis
1ec4f05efc Merged HEAD (5.1) to 5.1.N (5.1.1) 
117489 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-14 13:37:20 +00:00
Alan Davis
80e02b2c8f Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117494 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      117395 gjames: MNT-14892: BCRYPT Added an additional test to CompositePasswordEncoderTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 23:20:46 +00:00
Gethin James
c2eb0c8277 MNT-14892 RA-604 BCRYPT test fix. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 16:48:21 +00:00
Tatyana Valkevych
3ca1dfd1ea Merged HEAD (5.1) to 5.1.N (5.1.1) 
117315 tpage: ACE-2671 Unit tests for QNameTypeEditor.
   The QNameTypeEditor was migrated from RM to repo in r83388, but
   at the time there were no unit tests. This closes the issue by
   adding unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 10:21:30 +00:00
Gethin James
15f7d63375 Fixing a compilation error after the merge for AuthenticationTest 
Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
      117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
         114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 09:00:56 +00:00
Alan Davis
12ec947712 Fix compile error after: 
Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
      117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
         114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 23:11:28 +00:00
Alan Davis
3e5bf71699 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117263 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114898 gjames: BCRYPT MNT-14892 RA-609, better logging messages and added OnStartup validation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:28 +00:00
Alan Davis
de46f81829 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117262 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114826 gjames: BCRYPT RA-609: Not double hash encoders if not safe so fixing the test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:21 +00:00
Alan Davis
2e4871ec6e Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117261 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114795 gjames: BCRYPT RA-609: Ensure system does not double hash encoders if not safe


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:10 +00:00
Alan Davis
5e217990c7 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:03:01 +00:00
Alan Davis
e0f9b3e705 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117259 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114532 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114417 gjames: Test to confirm onpremise defaults to md4 for backwards compatibility MNT-14892,RA-599


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:52 +00:00
Alan Davis
4f3ec1b547 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117256 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114527 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114255 gjames: createUser with a password that has already been hashed MNT-14892,RA-601


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:29 +00:00
Alan Davis
141b506072 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117255 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114526 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114254 gjames: Making sure md4 doesn't use a salt MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:21 +00:00
Alan Davis
aced90a40a Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117251 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114521 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114037 gjames: Added UpgradePasswordHashTest to SecurityTestSuite MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:00:53 +00:00
Alan Davis
88aa26aa17 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117250 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114520 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114036 gjames: Improving UpgradePasswordHashTest MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:00:47 +00:00
Alan Davis
b175a6421c Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117249 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114518 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114018 gcornwell: MNT-14892: Fixed tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:00:40 +00:00
Alan Davis
d048e04218 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117248 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114517 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114012 gcornwell: MNT-14892: Updates to upgrade password hash job and test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:52:16 +00:00
Alan Davis
1c1a381c2c Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117247 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114516 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114004 gjames: Added a hashUserPassword method, and working on UpgradePasswordHashTest MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:52:09 +00:00
Alan Davis
d2185fc267 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117246 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114515 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113961 gcornwell: MNT-14892: Added UpgradePasswordHashWorker job and skeleton test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117338 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:52:02 +00:00
Alan Davis
d916cc40dd Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117242 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114511 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113774 gjames: Better updateUser and test MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:20 +00:00
Alan Davis
dbc4c03da7 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117241 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114510 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113765 gcornwell: MNT-14892: Users password now gets re-hashed when they login if it is not using the preferred encoding (removes old MD4 and SHA encoded passwords)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:09 +00:00
Alan Davis
e53f2ad430 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117240 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114509 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113728 gjames: Changed updateUser to use a List MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:46 +00:00
Alan Davis
571afcb46c Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117239 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114508 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113726 gjames: Fixing AuthenticationTest, switch char[] to String for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:36 +00:00
Alan Davis
4d1580c256 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117237 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114506 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113723 gjames: Fixing up failing AuthenticationTest for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:23 +00:00
Alan Davis
fa42023233 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117235 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114504 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
         113666 gjames: Initial integration of CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:49:01 +00:00
Alan Davis
a39107a09e Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117234 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114503 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113532 gjames: Adding a CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:47:49 +00:00