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,237 Commits 339 Branches 2,245 Tags
02bccef478210b2dfe754a6e819cf1d9cc862f30
Commit Graph

694 Commits

Author SHA1 Message Date
Jean-Pierre Huynh
02bccef478 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119072 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117355 adavis: 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/HEAD/root@119911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:01:34 +00:00
Jean-Pierre Huynh
1d9ad4fcac Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119071 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117354 adavis: 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/HEAD/root@119910 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:01:25 +00:00
Jean-Pierre Huynh
9b124acb5b Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119070 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117353 adavis: 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/HEAD/root@119909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:01:19 +00:00
Jean-Pierre Huynh
5c4577d74e Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119069 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117352 adavis: 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/HEAD/root@119908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:01:14 +00:00
Jean-Pierre Huynh
5d17b7e9f3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119066 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117349 adavis: 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/HEAD/root@119905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:00:58 +00:00
Jean-Pierre Huynh
cb6e5c77c0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119065 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117348 adavis: 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/HEAD/root@119904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:00:52 +00:00
Jean-Pierre Huynh
d77754c63a Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119061 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117343 adavis: 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/HEAD/root@119900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:00:22 +00:00
Jean-Pierre Huynh
40a5aba99b Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119060 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117342 adavis: 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/HEAD/root@119899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:00:15 +00:00
Jean-Pierre Huynh
ae043651cb Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119059 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117341 adavis: 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/HEAD/root@119898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 10:00:09 +00:00
Jean-Pierre Huynh
47373d2dc0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119058 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117340 adavis: 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/HEAD/root@119897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:59:59 +00:00
Jean-Pierre Huynh
1670fcce1e Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119057 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117339 adavis: 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/HEAD/root@119896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:59:53 +00:00
Jean-Pierre Huynh
05375c63fc Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119056 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117338 adavis: 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/HEAD/root@119895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:59:44 +00:00
Jean-Pierre Huynh
133c8bf8ca Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119052 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117334 adavis: 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/HEAD/root@119890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:58:59 +00:00
Jean-Pierre Huynh
fc74df4ab8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119051 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117333 adavis: 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/HEAD/root@119889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:58:31 +00:00
Jean-Pierre Huynh
cdb95db67c Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119050 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117332 adavis: 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/HEAD/root@119888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:58:23 +00:00
Jean-Pierre Huynh
c47e0055b4 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119049 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117331 adavis: 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/HEAD/root@119887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:58:17 +00:00
Jean-Pierre Huynh
e7ad963bbc Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119047 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117329 adavis: 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/HEAD/root@119885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:57:56 +00:00
Jean-Pierre Huynh
d97bed0aaa Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119045 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117327 adavis: 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/HEAD/root@119883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:57:42 +00:00
Jean-Pierre Huynh
01ffcc2511 Merged 5.1-MC1 (5.1.0) to HEAD (5.1) 
119044 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117325 adavis: 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/HEAD/root@119882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-10 09:57:28 +00:00
Silviu Dinuta
71d9df71be 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/HEAD/root@119732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-07 15:28:30 +00:00
Bogdan Horje
e3032a1001 ACE-4744 javadoc and cleanup 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-07 09:32:31 +00:00
Bogdan Horje
4028bb28a2 ACE-4752 dynamic type filter creation - fixed invalid or missing namespace bug 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-04 14:36:11 +00:00
Mihai Cozma
6f16b07e61 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/HEAD/root@119450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-12-02 14:27:31 +00:00
Mark Rogers
030405dcb8 Rollback 118791 - ACE-1636 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-30 11:07:44 +00:00
Mark Rogers
b87ce71ebf Rolled back CIFSComparator stuff incorrectly checked in 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-30 09:59:55 +00:00
Mark Rogers
441a1f4ae4 Merged ACE-1636 to HEAD update to Activiti 5.19.0 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-27 15:59:58 +00:00
Silviu Dinuta
2ecad935cf 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/HEAD/root@118256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-20 17:46:04 +00:00
Alex Mukha
c0c2a9c1d1 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/HEAD/root@117981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-18 17:13:08 +00:00
Jean-Pierre Huynh
2c9020a904 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/HEAD/root@117633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-16 14:05:17 +00:00
Steven Glover
23db5ae0ff 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/HEAD/root@117625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-16 13:43:42 +00:00
Bogdan Horje
7dd19089b5 CM-690 annotated test aspect for IDE compliance 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117599 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-16 07:46:12 +00:00
Bogdan Horje
92cb3e2972 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/HEAD/root@117531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-13 12:47:13 +00:00
Bogdan Horje
005c9543f5 CM-690 extensions 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-12 19:32:24 +00:00
Tom Page
b8d49e79a0 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/HEAD/root@117315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 16:32:31 +00:00
Matt Ward
b2e328aba5 ACE-4565: removed redundant test. 
Test checked that the job wouldn't run in the forseable future.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-10 16:13:32 +00:00
Ahmed Owian
5bcbdef83c Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1) 
116654 aowian: ACE-4500: Updating links to the help from within Alfresco
      - Code formatting according to Alfresco standards. No functionality changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-10 06:03:28 +00:00
Ahmed Owian
3adb8621ac Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1) 
116550 aowian: ACE-4500: Updating links to the help from within Alfresco
      - Updated error message to include correct version of the docs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-10 06:03:09 +00:00
Steven Glover
25976a2559 ACE-4347 "5.1 Build has had three transient failures related to locking" 
Increase the logging for the failing tests to DEBUG so that we can see what's happening during the next failure

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-09 18:51:30 +00:00
Alex Mukha
e967a9389a Merged 5.1.N (5.1.1) to HEAD (5.1) 
116331 amukha: ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      116327 amukha: Merged 5.0.2 (5.0.2.5) to 5.0.N (5.0.3)
         116326 amukha: MNT-15091: CLONE - 5.0.2 [Pentest 121015] ZIP extraction code execution
            - Fixed the test to use a classloader to load a test file, not the relative path.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116584 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-09 11:54:44 +00:00
Alex Mukha
cdefbd2bf1 Merged 5.1.N (5.1.1) to HEAD (5.1) 
116289 amukha: ACE-4513: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      116284 amukha: MNT-15091: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         116280 amukha: MNT-15090: Merged DEV to V4.2-BUG-FIX (4.2.6)
            115799: MNT-15075 : [Pentest 121015] ZIP extraction code execution
               Fix and test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-09 11:51:52 +00:00
Mark Rogers
b9ad98ba62 ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-09 10:09:22 +00:00
Mark Rogers
7e546d5ba0 ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 14:13:58 +00:00
Alan Davis
aaa621c981 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115572 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114988 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         114790 amorarasu: MNT-15007: CLONE - String values when migrating from MySQL to other DBs
            Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
               114311 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
                  114245 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
                     113717 dhulley: MNT-14911: String values when migrating from MySQL to other DBs
                      - Add a new job that allows node string values to be re-persisted according to the current 'system.maximumStringLength' value
                      - Job is unscheduled by default
                      - Set the 'system.maximumStringLength' and the 'system.maximumStringLength.jobCronExpression'
                      - Various touched code format fixes, method naming fixes, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:18:31 +00:00
Alan Davis
77434f1795 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115568 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112922 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112636 abozianu: MNT-14687 : Creating a document as checkedout and then canceling the checkout should delete the document
            - reverted fix due to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:17:59 +00:00
Alan Davis
349ad866a5 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115567 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112920 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112568 abozianu: MNT-14687 : Creating a document as checkedout and then canceling the checkout should delete the document


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:17:51 +00:00
Alan Davis
3434a81b7d Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115548 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112342 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         112260: MNT-14526 : JobLockService add getLock with refresh callback variant


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:16:08 +00:00
Alan Davis
4165e47032 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115460 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113727 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113684 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
               113602 cturlica: MNT-14504: Cloud pull process not working after large delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:10:30 +00:00
Alan Davis
9f4fdeb0e4 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115457 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113252 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113201 vshikunets: MNT-11220: Access Denied thrown if model is missing
            - Fixed build failure. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:10:02 +00:00
Alan Davis
3114f75a0d Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115456 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113249 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113035 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112991 pyurkevich: MNT-11220 : Access Denied thrown if model is missing
               - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:09:55 +00:00
Alan Davis
4948a79966 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115455 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113248 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113032 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112701 vshikunets: Merged DEV to V4.2-BUG-FIX (4.2.6).
               112128: MNT-11220: Access Denied thrown if model is missing. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:09:47 +00:00