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,176 Commits 339 Branches 2,245 Tags
2e4871ec6e5785e06ea818f2b53a2107df93094d
Commit Graph

5733 Commits

Author SHA1 Message Date
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
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
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
Alan Davis
3675027287 Merged HEAD (5.1) to 5.1.N (5.1.1) 
115382 dhulley: CachingContentStore handles "spoof://" content URLs (ACE-4516:DataLoad file spoofing fails with S3 connector)
    - Any store can now be used with the spoofed data load by wrapping it in the CachingContentStore (see S3 Connector)
    - Will work with S3 Connector against Alfresco 5.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:55 +00:00
Alan Davis
e78dc206db Merged HEAD (5.1) to 5.1.N (5.1.1) 
115346 dhulley: More formatting during investigation of ACE-4510


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@115615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 23:12:34 +00:00
Alan Davis
09e16185ee 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/BRANCHES/DEV/5.1.N/root@115535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-29 15:14:40 +00:00
Andreea Dragoi
50827d7789 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/BRANCHES/DEV/5.1.N/root@115292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-27 08:42:27 +00:00
Raluca Munteanu
d0f097601a 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/BRANCHES/DEV/5.1.N/root@114988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-23 07:46:06 +00:00
Raluca Munteanu
5ea0ea018f Merged HEAD (5.1) to 5.1.N (5.1.1) 
114774 gcornwell: ACE-4465: PolicyComponent is part of the public API for Spring injection, but getter is not available via ServiceRegistry


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 09:03:25 +00:00
Raluca Munteanu
6dfc8e8517 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114759 dwebster: ACE-4174: Add concept of hidden channels to ChannelService and mark old core social publishing channels as hidden by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 09:03:14 +00:00
Raluca Munteanu
a18bc456a6 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114730 sglover: ACE-4436 "[Upgrade]Wrong username displayed for the site's creator name after upgrade"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:58:36 +00:00
Raluca Munteanu
4262d7e705 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114666 sglover: ACE-3542 "server.maxusers count does not work correctly - TicketCountAll can be greater MaxUsers"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:53:40 +00:00
Raluca Munteanu
508e6e3d06 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114654 ahind: Fix for     ACE-4420   SOLR 4 - sharded - rename and move operations will not update descendants and add incorrect nodes to the shard


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:53:28 +00:00
Raluca Munteanu
80fb9ad682 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114653 kroast: ACE-4474 - ImageMagick typo in the Admin Console Summary


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-21 08:45:09 +00:00
Raluca Munteanu
206b58e99e 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/BRANCHES/DEV/5.1.N/root@114742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-20 08:56:12 +00:00
Ancuta Morarasu
16387feef9 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/BRANCHES/DEV/5.1.N/root@114588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-16 12:08:27 +00:00
Ancuta Morarasu
59251d836b Merged HEAD (5.1) to 5.1.N (5.1.1) 
114219 jvonka: ACE-4250: Revert r110119 (except keep 2 out of 4 unit tests)
   - note: related to ACE-4421/MNT-13836


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:21:11 +00:00
Ancuta Morarasu
d5ff074709 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114218 ahind: Fix for     ACE-4417    Search by Aspect within a site returns results from all sites


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:20:40 +00:00
Ancuta Morarasu
f9525f7723 Merged HEAD (5.1) to 5.1.N (5.1.1) 
114044 ahind: Fix for     ACE-4412    Dynamic shard registration should be an enterprise only feature


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-14 09:17:16 +00:00
Ana Bozianu
0507c4f5e4 Merged HEAD (5.1) to 5.1.N (5.1.1) 
113854 aowian: Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)
      113487 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
        - Removed user task step from add-direct workflow
        - Added check for completed start task in InvitationServiceImpl to avoid error throwing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-09 11:56:20 +00:00
Ancuta Morarasu
5a12b19331 Merged HEAD (5.1) to 5.1.N (5.1.1) 
113664 ahind: Fix for     ACE-4210    SOLR 4 - sharded - Dynamic shard information is not exposed via JMX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-06 09:31:41 +00:00
Ancuta Morarasu
a9cabada34 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
113704 adavis: Fix build error after
      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/BRANCHES/DEV/5.1.N/root@113729 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-06 08:59:13 +00:00
Ancuta Morarasu
998ebb98de 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/BRANCHES/DEV/5.1.N/root@113727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-06 08:58:59 +00:00
Alan Davis
8a84410b5a Merged HEAD (5.1) to 5.1.N (5.1.1) 
113336 ahind: Fix for     ACE-4209    SOLR 4 - sharded - registered shards can not be cleared out or aged out
   - shards age out, shards can be cleared out, index slices selected based on information volumne


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-02 15:55:45 +00:00
Tatyana Valkevych
38a6b0f1c2 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) 
113508 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113395 tvalkevych: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         113371 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
            113345: MNT-10305: DeletedNodeCleanupWorker should be improved.
               - Fixed the starting time for the purge old nodes process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-10-02 11:06:36 +00:00