inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,459 Commits 338 Branches 2,260 Tags
41dbd4564b6cf1b0363f773eac07cb63ed142fb1
Commit Graph

6378 Commits

Author SHA1 Message Date
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
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
d9211f4d13 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117258 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114531 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114416 gjames: Added debug on startup MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:44 +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
a744153cb5 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117254 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114524 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114104 gjames: Added trace debugging MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:02:13 +00:00
Alan Davis
f9ff45eda1 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117253 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114523 adavis: Merged BCRYPT to 5.0.2-CLOUD
         114045 gcornwell: MNT-14892: Enabled the UpgradePasswordHashJob (it won't run until 2099 though due to the default cron experssion) and tweaked log statements.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117346 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 18:01:59 +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
6114fd34bf Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117245 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114514 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113819 gcornwell: MNT-14892: Final test fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:40 +00:00
Alan Davis
38c51705ab Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117244 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114513 adavis: Merged BCRYPT to 5.0.2-CLOUD
         113804 gcornwell: MNT-14892: More test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:34 +00:00
Alan Davis
4ef78ff58f Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1) 
117243 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114512 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
         113778 gcornwell: MNT-14892: Fixed tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 17:50:27 +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
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
Gavin Cornwell
1c63b2fe3a ACE-4598: ServiceRegistry exposes services that are not part of the public API (i.e. not annotated via @AlfrescoPublicApi) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 16:35:45 +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
Tatyana Valkevych
e14af3c7aa Merged HEAD (5.1) to 5.1.N (5.1.1) 
116895 dhulley: Fix leaked 'MLPropertyInterceptor.setMLAware' in data load API implementation (ACE-4552)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:07:51 +00:00
Tatyana Valkevych
ee559fcc8b Merged HEAD (5.1) to 5.1.N (5.1.1) 
116662 aowian: 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/BRANCHES/DEV/5.1.N/root@117205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:05:52 +00:00
Tatyana Valkevych
5073f04767 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116661 aowian: 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/BRANCHES/DEV/5.1.N/root@117204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 12:05:36 +00:00
Tatyana Valkevych
e5685d6885 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116423: Fix for     ACE-4038    SOLR 4 - Sharded - Suggestor fails 
   - sharded and unsharded suggestion behave the same,
   116559: Build fix after 116423  - Fix for     ACE-4038    SOLR 4 - Sharded - Suggestor fails 
   - missed default value in mock


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:55:39 +00:00
Tatyana Valkevych
d908acd417 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116418 mrogers: ACE-4523 - Binary File mimetype is set to files edited via CIFS/FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:50:23 +00:00
Tatyana Valkevych
900c723a70 Merged HEAD (5.1) to 5.1.N (5.1.1) 
116394 gcornwell: ACE-4570: RatingService is currently not marked with @AlfrescoPublicApi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-11 11:50:07 +00:00
Derek Hulley
bcf40c1b72 Fix leaked 'MLPropertyInterceptor.setMLAware' in data load API implementation (ACE-4552) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-10 10:39:07 +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
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
Andrew Hind
b745f8464f Fix for ACE-4038 SOLR 4 - Sharded - Suggestor fails 
- sharded and unsharded suggestion behave the same

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 14:32:27 +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
Gavin Cornwell
69dd91ff31 ACE-4570: RatingService is currently not marked with @AlfrescoPublicApi 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-06 13:03:34 +00:00
Alex Mukha
a38969a845 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/BRANCHES/DEV/5.1.N/root@116289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 15:21:35 +00:00
Alan Davis
7c4d5789b7 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
115965 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      115823 arebegea: MNT-14887 : Rework ChainingUserRegistrySynchronizer's methods that uses RetryingTransaction with 'requiresNew=true'.
         - removed the code that deleted the older property value that may have been present when updating a value.
         - fixed the tests from RepoUsageComponentTest.java
         - updated the authorised-users jar with the version that uses the attributeService again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@116130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-05 07:59:33 +00:00
Alan Davis
2efb428d36 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115803 mgardner: ACE-4317 parse emailed potential dbid as a long before using as a solr query parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-03 08:09:55 +00:00
Michael Gardner
f65f6790dd ACE-4317 parse emailed potential dbid as a long before using as a solr query parameter 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-11-02 21:29:57 +00:00
Alan Davis
80118cac2d Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115580 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      115535 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115533 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
            115531 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
               115517 abozianu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
                  115450 abozianu: MNT-15064 : [Cloud Upgrade] Errors apear in alfresco.log after Stop & Start upgrade Alfresco Cloud 39.6.5 to 40 on DP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:19:46 +00:00
Alan Davis
9fe8315e16 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115578 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      115292 adragoi: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115032 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.N (5.0.3)
            115030 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
               114982 gcornwell: RA-608: Cloud repo fails to startup following successful bootstrap


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:19:32 +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
113f170a22 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115569 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113040 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         112938 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112693 nsmintanca: Merged NESS/4.2.N-2015-09-17 (4.2.6) to V4.2-BUG-FIX (4.2.6)
               112598: MNT-13331 : Unfriendly error displayed to user while trying to complete a task once more
                  - added check on task status in workflow/TaskFormPersister.java;
                  - added localization for the error message in workflow/workflow-messages.properties;
                  - added condition to display a friendly error message in alfresco.js
                  - referenced  current object to access its properties in task-edit-header.js
                  - added noCache parameter to the URL to ensure that requests are always made to the server to update data at back action in data-loader.js


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:18:06 +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
aee9e920ed Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115566 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112558 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112545: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112271: Merged DEV to V4.2-BUG-FIX (4.2.6)
               111087: MNT-11957 - move approveModeratedInvitation to InvitationService so its auditable
               111792: MNT-11957: Approving a request to join site not available for auditing
                  - move rejectModeratedInvitation to InvitationService so its auditable
               111854: MNT-11957: Approving a request to join site not available for auditing
                  - move acceptNominatedInvitation and cancelInvitation to InvitationService so its auditable
               111890: MNT-11957: Approving a request to join site not available for auditing
                  - Removed obsolete methods from InviteHelper
               111991: MNT-11957: Approving a request to join site not available for auditing
                  - move deleteAuthenticationIfUnused and sendNominatedInvitationto InvitationService so its auditable. Excluded InviteHelper.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:17:43 +00:00
Alan Davis
89d9a2b55a Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115558 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      111896 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111501: Merged DEV to 5.0.N (5.0.3)
            110986: MNT-14221 : CMIS aclCapability.getPermissionMappings() returns permissions that are not returned in aclCapability.getPermissions()
               - Changed getRepositoryPermissions() to returned all repository permissions not only the exposed ones.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115688 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:16:33 +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
d505abcf14 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115473 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114742 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114701 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114590 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114466 abozianu: MNT-14994 : CLONE - Alfresco Mobile: All Sites is throwing error when listing sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-30 00:15:02 +00:00
Alan Davis
d00e8e6a83 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) 
115467 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114588 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114484 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114312 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               114244 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
                  113716 dhulley: MNT-14911: Fix formatting during bug fix


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