Commit Graph

417 Commits

Author SHA1 Message Date
Martin Muller
88818dca9a Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Raluca Munteanu
6bd3928c70 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125591 mward: ACE-5052: close FileInputStream


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:17:55 +00:00
Raluca Munteanu
b2eb37c75e Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125587 mward: ACE-5052: close spring application context in FTPServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:17:24 +00:00
Raluca Munteanu
27e7f6fd21 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125586 mward: ACE-5052: close spring application context in CIFSServerBean


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:17:06 +00:00
Raluca Munteanu
3d05032155 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125470 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125051 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124925 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
            124738 adragoi: MNT-14882 : NFS Client: Issuing 'list' command on a mounted directory with over 1000 entries does not return
               - save resumeId state on ContentSearchContext


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:14:53 +00:00
Ancuta Morarasu
d20141eb13 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124145 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124106 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124105 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.7)
            123915 rmunteanu: Merged V4.1.7 (4.1.7.18) to V4.1-BUG-FIX (4.1.11)
               MNT-15801 : onContentUpdate policies not working for updates via webdav
                  - Reverted changes made for MNT-11185 and MNT-10966 , reverts that will fix MNT-15746
                  - Changed fix for MNT-5882 by adding the ASPECT_NO_CONTENT after the content is updated, this way preventing MNT-10966 from reproducing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-18 12:50:49 +00:00
Alan Davis
de8c1e0af5 Merged 5.1.N (5.1.1) to HEAD (5.1)
121671 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121619 mrogers: MNT-14860 - Unit test failure in CIFS Content Comparator for PPT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:24 +00:00
Alan Davis
2fab2cb742 Merged 5.1.N (5.1.1) to HEAD (5.1)
113042 adavis: 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/HEAD/root@123575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:25:11 +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
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
1bf5fb2b73 Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115426 adavis: ACE-4520: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      << All the MNT-13871 commits at the end of phase 2 testing of 4.2.5 >>
      111899: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
         111834: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111589: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               111531: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
                  -  Added small changes required for compilation of authorization module.,
      111901: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0) (PARTIAL MERGE)
         111836: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111765: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111600: Merged V4.1-BUG-FIX (4.1.11) to PATCHES/V4.2.5 (4.2.5)
                  MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
                     - Extra changes that are required to make authorization module build green.,
      112553: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112540: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112447: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
               - Added configuration required to compile authorised-users module.,
      113101: 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,
      113103: 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.,
      113215: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113213 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            113209 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113124: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
                  - Added the scripts to the main code base.
                  - Updated the authorised-users.jar,
               113203: MNT-13871: MNT-14875: The table creation code for authorised-user (MNT-13871) need to be moved back into the main Alfresco code base
                  - Moved the patch to the main code.
                  - Updated the authorised-users.jar
               113128: MNT-14867 (MNT-13871) : [UserAuth] License user limit exceeded by adding users to ALFRESCO_ADMINISTRATORS LDAP group
                  - Updated auhtorised-users jar.,,
      113246: MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
         - Try to fix one of the two build errors on 5.1.N as a result of r113101,
      113578: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Fixed the test SiteServiceImplTest.testGroupMembership ,
      113647: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Fixed the test SiteServiceImplTest.testListSiteMemberships that failed after testGroupMembership was fixed, but didn't delete the created site.,
      113935: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113924 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113914 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113903 gbroadbent: GERMAN: Updated bundle based on EN-rev112938,
      113936: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113925 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113915 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113904 gbroadbent: SPANISH: Updated bundle based on EN-rev112938,
      113937: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113926 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113916 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113905 gbroadbent: FRENCH: Updated bundle based on EN-rev112938,
      113939: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113927 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113917 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113906 gbroadbent: ITALIAN: Updated bundle based on EN-rev112938,
      113940: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113928 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113918 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113907 gbroadbent: JAPANESE: Updated bundle based on EN-rev112938,
      113941: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113929 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113919 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113908 gbroadbent: NORWEGIAN Bokmal: Updated bundle based on EN-rev112938,
      113942: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113930 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113920 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113909 gbroadbent: DUCTH: Updated bundle based on EN-rev112938,
      113943: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113931 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113921 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113910 gbroadbent: BRAZILIAN PORTUGUESE: Updated bundle based on EN-rev112938,
      113944: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113932 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113922 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113911 gbroadbent: SIMPLIFIED Chinese: Updated bundle based on EN-rev112938,
      113945: MNT-13871: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)
         113933 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113923 adavis: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113912 gbroadbent: RUSSIAN: Updated bundle based on EN-rev112938,
      114046: MNT-14901 MNT-13871: 4.2.5 User Auth code merged to 5.1.N caused 2 build failures
         - Removed the hardcoded value in the test.,
      114589: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114485 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114335 amukha: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
               114334 amukha: MNT-14984 MNT-13871: Modification to the User Authentication Warning wording.
                  - Changed the warning message.,
      114828: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114749 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114703 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114574 gbroadbent: GERMAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114829: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114750 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114704 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114575 gbroadbent: SPANISH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114830: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114751 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114705 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114576 gbroadbent: FRENCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114831: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114752 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114706 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114577 gbroadbent: ITALIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114832: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114753 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114708 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114578 gbroadbent: JAPANESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114833: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114754 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114709 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114579 gbroadbent: DUTCH: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114834: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114755 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114710 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114580 gbroadbent: RUSSIAN: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114835: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114756 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114711 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114593 gbroadbent: SIMP CHINESE: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871,
      114836: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114757 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114712 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114594 gbroadbent: NORWEGIAN Bokmal: Updated file based on EN-rev114472. Fix for MNT-14984 MNT-13871


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:09:37 +00:00
Mark Rogers
db4195196d Merge WOLF-1 to HEAD
EOL-2 : Remove NFS

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-29 16:57:14 +00:00
Alan Davis
4db208e306 Merged 5.0.N (5.0.3) to HEAD (5.1/Cloud) (PARTIAL MERGE)
108522: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      108469: Merged DEV to V4.2-BUG-FIX (4.2.5)
         108349: MNT-12361 : CIFS reports wrong usage with system.usages.enabled=true
            - Made changes to report the correct usages when user quota is enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-18 08:45:31 +00:00
Alan Davis
e5dc02a8c1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108293: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108286: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         108236: Merged /NESS/5.0.2-2015_07_13 (5.0.2) to URL: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.0.2 (..)
            108185: MNT-14370 : Cannot delete a folder through FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-15 17:12:59 +00:00
Alan Davis
f13dc0a415 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
108205: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108186:       Reverse merged 5.0.N (5.0.3)
               << Better solution found >>
               106968: Merged DEV to 5.0.N (5.0.3)
                  106962: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
                     - Implemented fix for Transformations (JodConverter), FTP, SMTP and IMAP.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-14 07:03:15 +00:00
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Alan Davis
594145b66b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107012: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106968: Merged DEV to 5.0.N (5.0.3)
         106962: MNT-13706 : Admin console unusable after we set any  busy port in Port Number Value for subsystem
            - Implemented fix for Transformations (JodConverter), FTP, SMTP and IMAP.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-25 08:28:27 +00:00
Alan Davis
f86985fae1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
105576: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      105514: Merged DEV to 5.0.N (5.0.3)
         105289 : MNT-14107 : Deleting folder using CIFS doesn't work when display of pseudo-files is disabled
            - Use user-defined value for "PseudoFilesEnabled" variable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-08 09:21:39 +00:00
Tatyana Valkevych
7027a0871e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104252: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104183: Merged DEV to V5.0.N (5.0.2)
         104081 : MNT-12874: FTP: 0kb file when uploading file via ftp (drop network connection)
            - Added timeout for server session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-18 15:12:34 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
68759a226f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99398: Use TransactionalResourceHelper.getList and correct TransactionListenerAdapter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:37:16 +00:00
Alan Davis
90d417a6a9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
95988: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94475: Merged DEV to 5.0.N (5.0.1).
         94140: MNT-13010: CIFS: CIFS desktop action ShowDetails is absent. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-04 07:43:30 +00:00
Alan Davis
cb9064aa14 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94142: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94079: Merged DEV to 5.0.N (5.0.1)
         93735 : MNT-13078: Office2013 : Incorrect version history for .xlxs files created via CIFS
            - Added shuffle scenario for MS Excel 2013
         94001 : MNT-13078: Office2013 : Incorrect version history for .xlxs files created via CIFS
            - Added a test for "MultipleRenameShuffle" pattern


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32:16 +00:00
Alan Davis
961623f6e6 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89958: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89872: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         89708: MNT-12290: Merged PATCHES/V3.4.14 to V4.1-BUG-FIX
          88898 : MNT-12291 : CLONE - disconnectClientSessions assumptions don't work on Terminal Servers
           Added a couple of new configuration values for the CIFS server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:45:07 +00:00
Mark Rogers
1ae074b266 ACE-2735 : CIFS desktop actions should be re-worked to use Share URLs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 14:59:20 +00:00
Mark Rogers
85f1e5b819 Merged DEV to HEAD : 54690, 54691 : ACE-2783 - Opening and closing a *.xls and *.ppt files with the CIFS interface(without saving) creates a new version
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-23 16:08:15 +00:00
Alan Davis
1743d7997e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84382: Merged DEV (5.0.0.BF) to HEAD-BUG-FIX (5.0/Cloud)
      83951: ACE-968 : CIFS: folder is not deleted if it has subfolder and document inside
      The folder is now not deleted if it has pseudo files inside.
      The info about deleted pseudo files is not returned to the client.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:34:18 +00:00
Erik Winlof
e94f8f8351 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:13:50 +00:00
Erik Winlof
0baa0f74f4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Mark Rogers
7678ef43cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76924: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65751: Merge Dev to PLATFORM 1
        58339 :     ACE-968 CIFS: folder is not deleted if it has subfolder and document inside


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 10:49:25 +00:00
Mark Rogers
9a685756c1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76888: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      65459: MERGE DEV to PLATFORM1 
        ACE-968 - CIFS: folder is not deleted if it has subfolder and document inside


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-22 16:41:30 +00:00
Will Abson
c624f32acf Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
72011: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71988: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71877 : MNT-11380 : Content of folder gets lost, if moving it via CIFS from source to target, where a folder of the same name already exists
            - Folder is not empty if it contains filders or files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:36:00 +00:00
Alan Davis
6a0ead3dc1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68536: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68314: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68272: MNT-11349: Merged V4.1.7 (4.1.7.9) to V4.1-BUG-FIX (4.1.9)
            67241: MNT-11185 : 4.1.7.7HF calls onContentUpdate policies twice when using ftp or cifs (once with webdav)
               - Remove ASPECT_NO_CONTENT after content is added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:35:51 +00:00
Mark Rogers
df7594460a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68142: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67640: MNT-11096: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67391: MNT-11096: org.alfresco.error.AlfrescoRuntimeException Session timeout out of range (0 - 3600)
            - Do sessionTimeout validation in the CIFSConfigBean setter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:15:52 +00:00
Alan Davis
3af879b55e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63637: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63563: MNT-10384: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63550: MNT-10384: when using CIFS on windows, alfresco should raise an error is the cifs.name is the windows server name
            - Throw AlfrescoRuntimeException if the cifs.name is the windows server name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:27:05 +00:00
Alan Davis
71324ac54f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63086: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
            Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
   		 and PassthruCifsAuthenticator.
      62968: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
         Fix CifsAuthenticatorKerberosTest: to check person existence in V4.2-BUG-FIX RunAsUser is required to be set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:49:58 +00:00
Alan Davis
6a048b6b85 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63085: Reverse merged
      63077: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
         62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
               Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
               and PassthruCifsAuthenticator.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64264 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:45:59 +00:00
Alan Davis
22e9128f35 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63077: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62850: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62709: MNT-10644: autoCreatePeopleOnLogin=false allows unauthorized users to log in via CIFS
            Force user creation on CIFS log in only if autoCreatePeopleOnLogin=true. Add unit tests for EnterpriseCifsAuthenticator
            and PassthruCifsAuthenticator.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:42:10 +00:00
Alan Davis
dbcef62a9c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59886: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59621: Merged DEV to V4.2-BUG-FIX
         58258: MNT-10038 : CIFS and FTP accessing repo without transactions for MNT-9806
         58307: MNT-10038 - MNT-9806 Corrected transaction test error in ContentDiskDriverTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:15:52 +00:00
Alan Davis
ad1026086f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59741: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59512: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
         59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
            - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 07:56:11 +00:00
Alan Davis
b9aed87767 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59734: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59507: Reverse Merged - Wrong commit was made
         59504 : MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
            59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
               - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation). 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:15:46 +00:00
Alan Davis
55fb129877 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59732: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59504: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
          59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
                 - In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:13:58 +00:00
Alan Davis
da4170e6f2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58970: ALF-20668 - hidden Files not shown in CIFS-Client


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:30:45 +00:00
Alan Davis
b8ff47de1e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57792: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57768: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57694: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57603: MNT-9284 : Upload speed using CIFS between PostgreSQL and SQL Server 2008
            Deleted an unnecessary transaction in org.alfresco.filesys.auth.cifs.CifsAuthenticatorBase#setCurrentUser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:05:12 +00:00
Alan Davis
2472193140 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57504: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57345: MNT-8689 : Merged DEV to V4.2-BUG-FIX
        54262: MNT-8689 : GenerateSubnetMask() do not allow usage of master browser detection in a classless addressed network 
        Try and get the broadcast mask from the network interface. MNT-8689 (1 of 2) 
        54264: MNT-8689 : GenerateSubnetMask() do not allow usage of master browser detection in a classless addressed network 
        Added broadcast mask override property for cases where the broadcast mask cannot be determined automatically. MNT-8689 (2 of 2) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:56:52 +00:00
Alan Davis
7b0bd9b5dd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57054: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56522: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         56431: (MNT-9755) ALF-20071 -NodeMonitor onUpdateProperties method can be optimized


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61688 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:02:36 +00:00