Commit Graph

16 Commits

Author SHA1 Message Date
Derek Hulley
fe886f95dd Merged V3.1 to HEAD
12984: Sharepoint: Build fix after recent change to SiteService and bumped module version to 1.1
   12997: (RECORD ONLY - Already merged) Added home property to start scripts; updated readmes; updated installers
   13140: Merged V3.0 to V3.1
      13138 Merged V2.2 to V3.0
         13133: Fix ETWOTWO-1078: wcm submit does not complete when using Oracle
   13146: Merged V3.0 to V3.1
      13052: CIFS throws a NullPointerException if a non-relative path is received for a folder search. JLAN-69
   13147: Updated svn:mergeinfo
   13151: (RECORD ONLY) Changed labs -> enterprise for distribution bundles
   13157: Partial fix for ETHREEOH-1277 - fixes usage of Application.getMessage()
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13052,13138
      Merged /alfresco/BRANCHES/V2.2:r13133
      Merged /alfresco/BRANCHES/V3.1:r12984,12997,13140,13146-13147,13151,13154,13157


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-12 14:01:59 +00:00
Kevin Roast
f70b674593 Merged V3.0 to HEAD
12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-16 14:20:15 +00:00
Roy Wetherall
12656d59b8 Merged V2.2 to HEAD 8290: Merged V2.1-A to V2.2 8229: AWC-1149: Resource bundles in AMP files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8323 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-19 12:52:48 +00:00
Gavin Cornwell
a450598ecb Merge of all UI clustering changes originally applied to 2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-15 14:59:11 +00:00
Jan Vonka
f80c79335a AWC-1718 - fix I18N issue with dynamic message (property resource) bundles
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-12-06 14:09:23 +00:00
Jan Vonka
4c3222257e git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 2007-09-14 11:22:26 +00:00
Derek Hulley
6936c6e642 Merged V2.1 to HEAD
6694: Removal of explicit Log4J usage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-11 04:32:56 +00:00
Jan Vonka
af8a90ab45 Fix path for repo-based Web Client Extension
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 15:41:31 +00:00
Jan Vonka
ffc06927b4 First-cut dynamic WebClient.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-31 15:14:36 +00:00
Paul Holmes-Higgin
7fd19e7e88 Updated copyright
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Derek Hulley
aa5f666c21 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
      - FLOSS
      - Some files will need a follow-up
         -root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
         -root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
         -onContentUpdateRecord (not on HEAD)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 06:44:46 +00:00
Paul Holmes-Higgin
acb00e83dd Changed licence headers
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +00:00
Gavin Cornwell
8e9693d55a Added lookup of custom properties files, this means a webclient.properties can be added to alfresco.extension
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-11 12:42:53 +00:00
Kevin Roast
3c9f4d77e2 backed out previous checkin
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 14:42:36 +00:00
Kevin Roast
776d837c16 . Memory usage improvement:
- Web-client now caches ResourceBundle objects and shares them between all users.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 14:21:17 +00:00
Derek Hulley
d051d1153c Moving to root below branch label
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00