Commit Graph

2607 Commits

Author SHA1 Message Date
Alan Davis
c456ae2d6b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57022: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56484: ALF-20275 Declare dependencies to alfresco-web-framework-commons as provided, so that they are not transitive


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 17:59:09 +00:00
Alan Davis
4c439e9fac MNT-10589: Merged V4.2-BUG-FIX (4.2.2) to V4.2.1 (4.2.1)
60891: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V4.2-BUG-FIX:
      60889: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
           60873: MNT-10560: Security: The Apache Xerces XML parser exposes security vulnerabilities
           60876: MNT-10560: Security: The Apache Xerces XML parser exposes security vulnerabilities
           60887: MNT-10560: Security: The Apache Xerces XML parser exposes security vulnerabilities


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@60909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-01 20:05:48 +00:00
Derek Hulley
62467c8dcc ACE-415: MT: Server bootstraps all tenants on startup - linear scaling
- Ripped out bootstrap calls to warm all tenants (uses of TenantService.getAllTenants)
 - This brings Enterprise in line with was used to be plugged into Cloud as an override


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@60265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-21 17:32:40 +00:00
Samuel Langlois
7a0c91dbd5 MNT-10118 Fix Maven dependencies to web-framework-commons
Deploy alfresco-web-framework-commons jar one more time in Maven Repo with a 'classes' classifier, and declare its war dependency as optional, so that both Ant and Maven builds succeed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-08 16:55:44 +00:00
Tatyana Valkevych
40b4d6abab Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59442: Merged DEV to V4.1-BUG-FIX (4.1.8)
      59317: MNT-9900 : Alfresco Explorer is using URL Encoding when downloading a file
      Removed additional encoding of file name for IE browser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-08 13:42:27 +00:00
Pavel Yurke
bf6a628aa2 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/BRANCHES/DEV/V4.2-BUG-FIX/root@59507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-08 11:24:59 +00:00
Pavel Yurke
b0071b8afb 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/BRANCHES/DEV/V4.2-BUG-FIX/root@59504 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-08 10:54:10 +00:00
Pavel Yurke
eefc607ebf MNT-10171: Merged DEV to V4.2-BUG-FIX
59289 : MNT-10171 : Exception thrown if Share metadata is longer than 1024 characters
  Set 'maxlength' attribute to 1024 (characters) for 'description' property in share and jsf client. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-08 07:42:05 +00:00
David Webster
dfce489eb8 Change Norwegian locale from nb_NO to just nb for MNT-9954. Also adds Norwegian to web-client-config.xml (it should have been there but was missing for some reason)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59432 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-06 16:09:55 +00:00
Alex Mukha
72d074416d Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59388: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
      - A few extra 4.x changes were required
      59380: MNT-10285 : Clone: Copyright notice shows Alfresco Software, Inc. © 2005-2013All rights reserved.... should now be to 2014
      Update Copyright notice to 2014.
      59387: MNT-10285 : Clone: Copyright notice shows Alfresco Software, Inc. © 2005-2013All rights reserved.... should now be to 2014
      Update Copyright notice to 2014 in enterprise overlays.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-01-04 16:56:13 +00:00
Gloria Broadbent
72fc65c9ac RUSSIAN: Russian Bundles updated with latest strings based on EN rev58544 and fix of:
MNT-10069
MNT-10093
ALF-20566
ALF-20356

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59047 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-16 16:46:19 +00:00
Alan Davis
da0cbae535 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58832: Merged DEV to V4.1-BUG-FIX (4.1.8)
      57649: MNT-9900 : Alfresco Explorer is using URL Encoding when downloading a file
      Changed the encoding/decoding behavior for filenames in different browsers.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-16 07:02:55 +00:00
Alan Davis
83c4f4826b Fix build error as a result of the merge of
58405 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
     58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
       58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
       Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-02 16:51:12 +00:00
Alan Davis
d1ace29bf3 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58384: MNT-9979 : Merge DEV to V4.1-BUG-FIX
    58338 : MNT-9979 : External authentication fails if Kerberos SSO is also enabled, although Kerberos is later in the chain than External
    Add new unit test. Add remoteUserMapper for webDavAuthenticationFilter in kerberos authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-28 21:48:53 +00:00
Pavel Yurke
2e9fff978f Merged DEV to V4.2-BUG-FIX (4.2.1)
57514: MNT-7235: WCM - Fields with a maxlength validation rule report an error if any other fields are in error
   - Return the value contained by the widget, or null if none is set 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-25 11:14:52 +00:00
Alan Davis
357d8b9671 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58177: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
      57174: Merged DEV to V3.4-BUG-FIX (3.4.14)
         56813: MNT-9749: AVM - copy and pasted link in TinyMCE (xs:string) renders full url and not relative URL in Firefox
          - Remove current host:port from links. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-22 17:27:02 +00:00
Pavel Yurke
f06b15a35a Merged DEV to V4.2-BUG-FIX (4.2.1)
49098 : MNT-7059 : Search description in search result not sensible when using only advanced fields.
      - Added a method, that get a search value by fields "title", "description", "author" for advanced search in Alfresco Explorer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-22 12:33:40 +00:00
Alex Mukha
e9ce4b2464 Merged DEV no V4.2-BUG-FIX (4.2.1)
58127: MNT-10027 : IE10 specific: The buttons "Create Space", "Advanced Space
   Wizard", "Manage Space Users", "Manage Content Rules" etc. don't work
   Changed width of menus to auto to correctly display it in IE 10.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-22 12:11:01 +00:00
Andrew Hind
d7822298b1 Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
         56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                 - Creation of the duplicated authorities is fixed. Unit tests are added.
     58059: Revised for for     MNT-9794   Authorities with duplicate names can be easilly created using « AuthorityService »
     Includes build fix from this merge
     - MNT-10010   In some cases (e.g. SiteServiceImpl) we are using onBootstrap to bind behaviour multiple times


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-21 11:30:29 +00:00
Samuel Langlois
552167a028 CLOUD-2182 Bring activity-list*.properties and slingshot*.propertie from share into alfresco war
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-20 15:57:01 +00:00
Alan Davis
833aff69dc Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
- Correct merge error
   57582: Merged DEV to V4.1-BUG-FIX (4.1.8) with corrections
      56334: MNT-9712: VTI doesn't allow external authentication.
       - Modify org.alfresco.web.sharepoint.auth.BasicAuthenticationHandler to check Remote User 
       - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-05 12:31:19 +00:00
Alan Davis
40a176205a Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
57582: Merged DEV to V4.1-BUG-FIX (4.1.8) with corrections
      56334: MNT-9712: VTI doesn't allow external authentication.
       - Modify org.alfresco.web.sharepoint.auth.BasicAuthenticationHandler to check Remote User 
       - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-05 10:19:01 +00:00
Alan Davis
ee5e06e66b Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
57425: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
      57422: MNT-9767: Merged DEV to PATCHES/V4.1.7
      57268: MNT-9767 : Navigation arrows of the document details view do not work when a search result is displayed
      Was added the check for currentSortColumn when it is null in SpaceDetailsDialog.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-01 13:20:44 +00:00
Samuel Langlois
9c2961d149 CLOUD-2159 Move server-config.wsdd from remote-api to web-client, where it belongs, otherwise it is missing in Cloud build
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@57456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-31 15:29:22 +00:00
Alan Davis
6e4c59fee5 Reverse Merged. Commit to wrong branch. Should have been HEAD-BUG-FIX.
57334: Moved test_indexCheckService.js to test-resources, BDE-195
   57335: Enterprise depends on wdr-deployment, BDE-195
   57336: An explicit instruction to Junit to ignore this class, BDE-195
   57337: Excluding wcm tests that aren't run in ant, BDE-195
   57339: Fixed failing tests by loading the test resource config from the class path, BDE-195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-30 10:29:01 +00:00
Pavel Yurke
6a0db7b688 Merged DEV to V4.2-BUG-FIX (4.2.1)
57347 : MNT-9838 : Some images are absent on "About Alfresco" page
       - New logos added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-30 09:08:00 +00:00
Gethin James
21a71e8f34 Fixed failing tests by loading the test resource config from the class path, BDE-195
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-29 16:40:48 +00:00
Alan Davis
68fae4cd34 Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
56837: MNT-9767: Merged DEV to V4.1-BUG-FIX
   	56823: MNT-9767 : Navigation arrows of the document details view do not work when a search result is displayed
   	Was added the check for currentSortColumn when it is null. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-22 22:16:57 +00:00
Alan Davis
6583a37b9f Merged V4.2-BUG-FIX (4.2.1) to HEAD (Cloud/4.3)
56634: Merged V4.2.0 (4.2) to V4.2-BUG-FIX (4.2.1)
      56458: Fix for ALF-20277 - Impossible to login to Alfresco JSF client when alfresco is read only.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-14 17:32:24 +00:00
Alan Davis
55eaa9d238 Merged V4.2.0 (4.2) to V4.2-BUG-FIX (4.2.1)
56458: Fix for ALF-20277 - Impossible to login to Alfresco JSF client when alfresco is read only.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-14 17:07:28 +00:00
Alan Davis
911621be2a Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
55942:  Merged DEV to V4.1-BUG-FIX (4.1.7)
      52177: MNT-8884: URL of the "View in CIFS" link is not URL encoded
     - Utils.java was updated. Fix does URL encoding for CIFS link except a link that will be displayed in IE.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-11 16:34:59 +00:00
Samuel Langlois
30be652c8e ALF-20275 Declare dependencies to alfresco-web-framework-commons as provided, so that they are not transitive
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-10 17:12:33 +00:00
Kevin Roast
c81bb3391a Fix for ALF-20277 - Impossible to login to Alfresco JSF client when alfresco is read only.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.0/root@56458 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-10 11:16:58 +00:00
Samuel Langlois
893797f72f Update version to 4.2.1, pom files to 4.2.1-SNAPSHOT and version.schema to 6100
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-08 16:24:25 +00:00
Samuel Langlois
559322dfa5 Update version to 4.3.0 (except for community, still 4.2.e), pom files to 4.3.0-SNAPSHOT and version.schema to 7000
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-08 16:01:10 +00:00
Alan Davis
7e44580cb3 Merged HEAD-BUG-FIX to HEAD (4.2)
55497: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55387: Fix for MNT-9628 - CLONE - uploadFileServlet return-page vulnerability javascript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-20 20:48:03 +00:00
Gloria Broadbent
54659289ea BRAZILIAN PORTUGUESE: Updates to 4.2 Brazilian Portuguese files based on EN rev55273
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-19 18:04:30 +00:00
Gloria Broadbent
b4a1931147 DUTCH: Updates to 4.2 Dutch files based on EN rev55273 and fix to MNT-9406
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55345 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-16 15:04:26 +00:00
Brian Remmington
7c9d9afe68 Merged BRANCHES/V4.2 to HEAD:
55206: Branch created for 4.2.x releases.
   55209: Merged HEAD to BRANCHES/V4.2:
        55208: Added Sharepoint config to unit test classpath to fix VtiRequestDispatcherTest.
   55222: Merged HEAD-BUG-FIX to V4.2
        55220: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
           55218: Fix for ALF-19894 Site is not displayed after restoring from Trashcan
             This bug was reported on 4.2, but the bug is also present on 4.1.
             I have added a testcase to reproduce the bug along with a fix.
             The problem was in SiteServiceImpl.delete where the code was writing an empty property value into the {}memberships property
             and therefore there was no record of which users had been members of the deleted site.
   55245: Fixed javadoc while checking that ALF-19055 was fixed.  ActivityService no longer uses 'format
   55246: CLOUD-2050 -Content changes are not synced from Cloud to On-Premise (errors in the logs)
   55249: Hazelcast: Added ability to create cache with 'read-backup-data' via property *.readBackupData
   55250: Hazelcast cache builder now accepts 'async-backup-count' value and any error in setting a value logs the full exception
   55251: Asynchronous cache: Better logging of in- and after-transaction processes
   55252: Asynchronous cache: Better logging of in- and after-transaction processes
   55266: Workflow REST API fix for variable retrieval
   55276: Merged HEAD to BRANCHES/V4.2:
        55274: Disabling Sharepoint unit tests until we can make them run properly in the build.
   55278: ALF-19889 - String for Brazilian Portuguese
   55279: Merged DEV to 4.2
        ALF-17464 : Replication jobs aren't displayed until sorting by some characteristic
           - Changing not exact equals (!==) to not euqals (!=)
   55280: Fix for ALF-19865 - Forgot password link redirects to Login page. Also cleaned up the mess that is the 'Sign in to Alfresco in the cloud' dialog.
   55281: Probable fix for ALF-19225 Intermittent test failures in SubscriptionServiceActivitiesTest
   55282: ALF-19865 - Cloud Sync profile area now looks like the rest of profile area.
   55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
        55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55286: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_29 to BRANCHES/V4.2:
        55207: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
        55210: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55297: As part of prep work for fixing ALF-20023 Recent Sites and Favorite Sites in copy/move pickers empty,
   55299: ALF-19556: IE10 specific fix for file upload browse (impressive how IE finds more and more innovative ways to spoil things for itself)
   55300: Fixed date issue when creating a new process instance
   55308: Resync to HEAD@55302


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-15 15:00:13 +00:00
Alan Davis
0c41c99509 RUSSIAN: More fixes applied to Russian files based on EN rev54125 Using L10nUpdater java program
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55112 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-09 09:33:05 +00:00
Alan Davis
29289fbd2e Merged HEAD-BUG-FIX to HEAD (4.2)
54935: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      54755: Merged V4.1.6 (4.1.6) to V4.1-BUG-FIX (4.1.7)
         54620: Merged DEV to PATCHES/V4.1.6 (4.1.6)
            54599: ALF-19801 (MNT-9534) : OpenCMIS endpoint HTTP 302 redirect to Explorer login page!
            Switched /cmisatom context to use WebDAV authentication filter.
            Injected remoteUserMapper to the AlfrescoNtlm WebDAV filter implementation to support external together with
            NTLM.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-08 07:39:28 +00:00
Gloria Broadbent
ddf07e0131 RUSSIAN: More fixes applied to Russian files based on EN rev54125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-05 14:51:06 +00:00
Gloria Broadbent
10d7312017 RUSSIAN: Review fixes applied to Russian files based on EN rev54125
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-05 08:49:10 +00:00
Gloria Broadbent
60462857aa BRAZILIAN PORTUGUESE: New language pack for 4.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-02 11:23:27 +00:00
Samuel Langlois
a45dcd7f8f CLOUD-1967 Put log4j config in WEB-INF/classes, so that it's first in classloader
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 14:47:08 +00:00
Samuel Langlois
ad8b19e173 ALF-19863 Partially revert r49154: Enterprise overlay had been wrongly committed where it shouldn't
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-29 11:25:37 +00:00
Samuel Langlois
e8627b539f BDE-215 Set version in POM files to 4.2.0-SNAPSHOT
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-28 14:39:00 +00:00
Samuel Langlois
7f11700f57 Merged HEAD-QA to HEAD (4.2) - final one
r54310-54386


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-22 08:25:02 +00:00
Samuel Langlois
e60d57ea42 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00
Alan Davis
5a8f6ee635 Merged HEAD-QA to HEAD
<< remerge r50306 to HEAD as part of the change was lost >>
   50306: Fix to merge causing ALF-18979 - Activiti servlet references on by default in web.xml
   Removed duplicated class now that the LoggerFilter is part of code webclient code

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-07-08 09:58:35 +00:00