Commit Graph

5718 Commits

Author SHA1 Message Date
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
Tatyana Valkevych
c43c91e37c Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113291 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113279 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         113102 amorarasu: MNT-10305: DeletedNodeCleanupWorker should be improved.
            - Moved the retrying transaction helper declaration back in the while loop - fix test attempt.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-30 09:49:51 +00:00
Tatyana Valkevych
cb1d757f4b Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113290 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113278 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
         112985 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
            111742: MNT-10305: DeletedNodeCleanupWorker should be improved
               - Delete in multiple statements, filtering by transactions with commit time in a time interval.
            112722: Improved the algorithm that sets appropriate time windows for delete, based on the evolution of the purge process.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-30 09:49:37 +00:00
Alan Davis
884c49c228 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113194 abalmus: Merged DEV to 5.0.N (5.0.3)
      113149: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
         - Fixed issue that caused ACE-4194


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-28 21:48:32 +00:00
Alan Davis
a584404a7e 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/BRANCHES/DEV/5.1.N/root@113248 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-28 21:48:06 +00:00
Alan Davis
9acb2289d3 Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113036 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113030 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         113019 amukha: MNT-14862 MNT-13871: [UserAuth] Login via FTP works when the license limit exceed
            - Corrected the AlfrescoFtpAuthenticator to rollback teh transaction if an exception was thrown.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-25 13:44:17 +00:00
Alan Davis
be1414ecde Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112930: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112707 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         112677 dvaserin: MNT-14780 (MNT-13871): Licence Error message when in overage
          - Place overage buffer information into License MBean and use it in admin license ftl.
         112634 adavis: MNT-13871: Merged DEV (V4.2.5-MNT-13871-LATEST) to V4.2.5 (4.2.5)
            111550: Merged DEV (4.1.11) to DEV (4.2.5)
               MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Merged all made changes in core alfresco projects as single commit to fresh dev branch forked from V4.1-BUG-FIX.
               MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - added try/finally approach to reset show delete users flag to default value.,
            111574: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Added V4.2.5 specific changes.,
            111582: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Updated the jar to correspond with the latest changes in authorised-users/4.2,
            111751: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Removed unnecessary configuration.,
            111752: Merged DEV (V4.1.11) to DEV (V4.2.5)
               111632: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Fixed unit tests for build plan: https://bamboo.alfresco.com/bamboo/browse/DEV-ENT414-1,
            111753: Merged DEV (4.1.11) to DEV (V4.2.5)
               111719: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Updated authorization related icons with ones provided by Mark Howarth.
                  - Information message in Deauthorize Dialog was changed to the on provided by Mark Howarth.,
            111754: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
               - Updated to the latest authorised-users lib.,
            111761: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Fix for the SchemaReferenceFileTest.,
            111800: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Modified the test to create a tenant in a retrying transaction to solve the DataIntegrityViolationException.,
            111801: Megred DEV (4.1.11) to DEV (4.2.5)
               111795: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                  - Updated Deleted column to display text instead of tick icon.
                  - Added name for actions column.,
            111813: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Updated to the latest authorisation jar to fix the Scema Reference test.,
            112020: MNT-14775: De-authorisation pop-up has similar title to first line of text
              - Remove the duplicated text from the pop-up body
              - Updated link to point the 4.2 documentation,
            112134: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
             - Update authorization jar,
            112144: MNT-13871: Optimized strings in users.get.properties,
            112184: MNT-14762 : [UserAuth]Users from the ALFRESCO_ADMINISTRATORS LDAP group are not pre-authorized
               - Updated authorized-users jar with fix for ldap administrators pre-authorization.,
            112196: MNT-14729 : [UserAuth] The column header for the Deauthorize and Reauthorize button should have a name
               - Updated name for re/de-authorize actions column.,
            112202: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
             - Add new authorization jar to fix null errors,
            112203: MNT-14779: System behaviour when system set read only due to licence exception
             - Force read-write transaction for LoginPost script.,
            112225: MNT-14763: [UserAuth] New entries are added in the authorization table for each different username case
             - Add new authorization jar after unit test fixing.,
            112226: MNT-14740 : [UserAuth] The message for the failed re authorization is not displayed onIE
               - Code for reloading page was wrapped with YAHOO.lang.later() function.,
            112247: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
               - Updated authorization jar with fix for kerberos unit test.,
            112259: MNT-14776: Heading banner text when using all allowed authorised users.
               - Changed the message.
               - Updated the authorised-users jar.,
            112269: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
             - Wrap methods that uses 'authenticationComponent.setCurrentUser' into RetryingTransaction for retrying on DataIntegrityViolationException.,
            112285: MNT-14747 : [UserAuth]The Autorization State isn't change when the user logs via FTP.
               - Updated version for authorized-users jar.,
            112388: MNT-14809: [UserAuth] On a cluster setup after running the hourly job only one node goes into R/O mode
               - Updated the authorised-users.jar,
            112439: MNT-14815 : Wrong documentation link used in the deauthorize message window
               - Corrected link to documentation.,
            112445: MNT-14818 : [UserAuth] Missing quotation mark in the user reauthorization window message
               - Corrected message for reauthorization dialog.,
            112450: MNT-14802: [UserAuth] License warning message displayed for all the users
               - Updated the authorised-users jar.,
            112454: MNT-14780: Licence Error message when in overage
             - Make license warn messages on admin console the same as banner warn messages.,
            112471: MNT-14773 : Sort state not persisted after authorisation action
               - Sorting/paging state is now persists in sessionStorage.,
            112478: MNT-14773 : Sort state not persisted after authorisation action
               - Corrected previous fix.,
            112483: MNT-14814: [UserAuth] System goes into R/O mode after running the hourly job
               - Updated the authorised-users jar to the latest version.,
            112512: MNT-14833: [UserAuth] User cannot login on both nodes (cluster env.)
             - Update authorization jar.,
            112556: MNT-14787: [UserAuth] Login via NFS works when the license limit exceed
               - Modified the exception handling of setCurrentUser method. Now all the exceptions are rethrown.,
            112570: MNT-14838: Correct the Max Users string in the Admin Console License Screen
               - Corrected the string, remove the incorrect translations from the bundle.,
            112572: REVERSE MERGED  <<code is not worth to implement>>
               112471 : MNT-14773 : Sort state not persisted after authorisation action
                  - Sorting/paging state is now persists in sessionStorage. 
               112478 : MNT-14773 : Sort state not persisted after authorisation action
                  - Corrected previous fix. ,
            112610: MNT-14837 : Report license overage to the log files on authorization/deauthorization of users
               - Updated users authorization jar file.,
            112627: MNT-14839: [UserAuth]Alfresco goes in read -only after reauthorize a user from LDAP ALFESCO_ADMINISTRATORS group
               - Updated the authorised-users jar to the latest version.
   Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
      111954: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Removed context reference to authorization.,
      112003: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         -  Added copying of sources and configuration from authorised-users to the output directory during build.,
      112014: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Modified the build configuration to unpack the resources to the test folders.,
      112027: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Added unpacking of authorisation resources to repoitory-crypto project.,
      112067: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Removed unpacking of resources, changed the context imports to point to authorization.,
   112952: Merged DEV (V5.0.2-MNT-13871) to 5.0.N (5.0.3)
      111887: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
         - Corrected the authorised-users version to correspond to 5.0.,
   113060: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      113059 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         113058 adavis: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
            - Version dependency for alfresco-authorised-users moved to top level pom


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-25 13:42:39 +00:00
Alan Davis
dfe03d979b Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
112968 mrogers: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      112583: MNT-14817 - Alfresco keeps file handlers on deleted temporary files created by CIFSContentComparator


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-24 20:03:57 +00:00
Alan Davis
3f9ad58202 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/BRANCHES/DEV/5.1.N/root@113040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-24 20:02:22 +00:00
Alan Davis
2ebd8f7074 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/BRANCHES/DEV/5.1.N/root@112922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 20:36:28 +00:00
Alan Davis
bf40bd0c26 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/BRANCHES/DEV/5.1.N/root@112920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 20:35:38 +00:00
Alan Davis
9f209f804b Merged HEAD (5.1) to 5.1.N (5.1.1)
112631 gjames: Better Null handling, ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 10:56:22 +00:00
Alan Davis
561fbcf4a0 Merged HEAD (5.1) to 5.1.N (5.1.1)
112630 gjames: Removed the use of Locale.setDefault(locale) ACE-4246


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112681 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-23 10:56:05 +00:00
Alan Davis
eaeae43110 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/BRANCHES/DEV/5.1.N/root@112558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-22 09:33:33 +00:00
Alan Davis
ea6904a2e5 Merged HEAD (5.1) to 5.1.N (5.1.1)
112467: Merged HEAD_ACE198_MNT14743 (5.1) to HEAD (5.1)
      111889: ACE-4189 (MNT-14743 / ACE-198): Perf boost when listing/sorting large folders (CMIS GetChildren / Share DocLib)
      - trivial: follow-on fix to r111851 to remove spurious (dead) code


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112532 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-21 22:49:35 +00:00
Alan Davis
2d9eb4789d Merged HEAD (5.1) to 5.1.N (5.1.1)
112466: Merged HEAD_ACE198_MNT14743 (5.1) to HEAD (5.1)
      111851: ACE-4189 (MNT-14743 / ACE-198): Perf boost when listing/sorting large folders (CMIS GetChildren / Share DocLib)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-21 22:49:27 +00:00