20025: Created Enterprise branch V3.3
20026: ALF-2597 : IMAP : permissions on home space.
- now, by default, people can't read other's mail.
20030: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
19919: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
19766: Fixed ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle
20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
20032: Merged HEAD to BRANCHES/V3.3 (RECORD ONLY)
20031: Fix ALF-2626 - Share Repository browser broken
20035: Enterprise branding for Share & Explorer - DO NOT MERGE (RECORD ONLY)
Also: SAIL-282: Update the Help URLs for 3.3 Enterprise
20039: Fix ALF-2393 - Alfresco Comunity 3.3 deployment error on JBoss v6
20044: Fix ALF-750 (versioning does not persist node associations)
- TODO: review version migrator (if upgrading directly from Ent 2.x to Ent 3.3)
20049: Merged PATCHES/V3.2.r to BRANCHES/V3.3
20047: Fix for ALF-2640: Share: Edit Offline and Upload New Version fails with HTML uploader on FF3.5, works on IE
20054: Fix ALF-750 (versioning does not persist node associations)
- update version migrator (only applies if not already run, ie. upgrading directly from Ent 2.x to Ent 3.3)
20057: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20033: Accordion example was broken when FDK is deployed as a JAR
20064: Fix for ALF-2623: Alfresco 3.3G's Share site is prone to cross site scripting attacks
- Bug is actually in the wiki components
20065: Fix unreported issue (auto-versioning for metadata-only updates stops working after checkin) & additional improvements to LockService
- explicitly remove lockable aspect (rather than nullifying properties) for unlock / checkin
- use txn resource to track ignorable nodes (for lockable aspect behaviours)
- note: currently affects Alfresco Explorer only (since Alfresco Share explicitly disables autoVersionOnUpdateProps)
20066: Increased PermGen space for tests to 256M from 128M
20071: AVM - check for circular layered directories (ALF-813 / ALF-910)
20073: Fix LockService tests
- fix typo (introduced in r20065)
- TODO: review LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities
20076: Fix LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities
20078: Fixed ALF-2464 "Missing i18n labels when rules fail to run"
20081: Fixed ALF-1626 "The position:absolute behaviour of the Flash preview container needs a re-think"
- Now handles long file names (resize was already fixed)
20083: Fix for ALF-2708: Unmodifiable exception thrown when Web Script f/w attempts to report error (latest Spring Surf webscripts libraries)
20084: Fixed ALF-253 "Unfriendly message appears when trying to login with username which contains symbol '\'"
- also fixed bug whereerror messages for illegal characters was displayed as undefined for FF on Mac
20085: Merging HEAD into BRANCHES/V3.3:
20074: ALF-959 The invitation email 'subject' can now be set as a localizable property in invitation-services.properties:
20080: Fixing failing test InvitationServiceImplTest.
20087: ALF-1498: RM web script puts Alfresco in endless loop
This was a general issue with the onUpdateProperties behaviour in the versionable aspect. This code now disables the behaviour whilst it is executing to prevent the endless loop occuring.
20088: Fixed an issue when uploading 2 or more documents for a new site.
- A failure occured since it asynchronously tried to create the documentLibrary container twice and the second attempt failed since it already existed.
20089: SAIL-356: Action label changes
20090: Dynamic models: minor improvements to DictionaryModelType
- add (optional) concurrency locking
- remove duplicate bean def
- bind remaining class behaviours (onCreateNode, onRemoveAspect) based on type
20091: Fixed ALF-1046 "Leave button is displayed for admin on Site Finder page near private site where admin is not invited"
20092: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.3
20043: ALF-928: Upgrade from 2.1.7 to 3.2 with lots of content items - GC overhead limit exceeded exception
Call getChildAssocs(NodeRef, QNamePattern, QNamePattern, boolean) with a value of 'false' for the preload argument to avoid preloading all the child nodes
20093: Fix for ALF-2721: Upgrade clean 2.2.current + 20k users to 3.3.current fails in CalendarModelUriPatch updating URI that does not exist
20094: ALF-2630: LDAP differential sync was failing to sync group memberships of users who themselves hadn't changed
- New post process deals with group associations of unprocessed users
- Modified unit test to properly simulate differential sync
20095: Fix for ALF-2715: Rule creation in Alfresco Share 3.3G leads to an "Internal Server Error" failure message
20096: Fix webview and wiki dashlet titles in yellow and gdocs themes.
20097: Follow-up fix to cross-browser WebView dashlet (iframe) resizing
20098: Workaround for ALF-2211: Share - Accessing User homes from Share/JSF integration freezes the browser.
- The tree control has been given a configurable maximum folder count setting for both Site and Repository working modes. By default these are "unlimited" in Site mode and 500 in Repository mode. These values can be overridden in share-config-custom.xml - see the sample configuration file for details.
- The workaround is to display a "Too many sub-folders to display" message when the maximum number of folders has been reached.
- To aid users to select their User Home space (or sub-folder thereof) for Copy and Move actions, a new "My User Home" button is provided on the folder picker control.
20099: Fix for ALF-2606: Manage Permissions on multiple nodes.
- Toolbar action removed when in Repository Browser, as the fine-grained permissions page does not support multiple nodes.
20100: Merged Outlook Meeting Workspace integration from BRANCHES/DEV/BELARUS/V3.2-2010_01_11
20102: Fix for ALF-478: Authority CRC calculations must use UTF-8
20103: Follow up from ALF-253 (Unfriendly message appears when trying to login with username which contains symbol '\')
- Making lastName mandatory in Share ui since service otherwise complains
20106: Fixed ALF-1041 "Revert action is available for SiteContributor and SiteConsumer" (and added a missing msg key for blogs)
20108: ALF-2235: Permission exception when creating non-electronic records by Power User with Read and File permssions
20109: Fix for ALF-2706 "ConcurrentModificationException in AsynchronousActionExecutionQueueImpl"
20110: Merge Dev to V3.3
ALF-1980 - Huge UIDVALIDITY giving IMAP client problems
20111: Latest webeditor JAR containing change to orientation strings in WEF
20113: Fix Share DocLib copy/move actions from recent refactor. Picker now appears with correct Site/Repository mode set upon opening.
20114: Fix for ALF-2726: 'Transform and Copy content' action causes error.
20115: Fix for ALF-2697 - File encoding is hard-coded for upload.post.js (Webscript API)
20116: Fix for ALF-1090
20119: ALF-2734 - Incorrect behaviour on creating google docs in Repository Browser
20120: Enterprise build fix for Index check tests
- disable user usage updates
- this should not be required
20121: ALF-959 The site name/title should now correctly appear in the invite email subject, replacing '{0}'.
20123: Merged HEAD to V3.3 (RECORD ONLY)
20122: First part of fix for ALF-2718: DOD5015 module breaks CMIS Atom DiscoveryService webscripts
20126: Fix rule rest api json so numbers are not incorrectly formatted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
- Unit tests failures for excel sheets fixed
- Able to now create and checkout docs, sheets and presentations successfullly
- Docs, sheets and presentations downloadable and viewable
- Fixed ALF-2700
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Google Doc Integration
- The following configuration must be added to your alfresco-global.properties in order to enable the googleeditable repository behaviour:
googledocs.username=myuser@bob.com
googledocs.password=pwd123pwd
googledocs.googleeditable.enabled=true
Google Docs Share Integration
- Enabled via share-config (see share-config-custom.xml.sample for details)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
The code for extracting .dwg files has been contributed to Apache tika, and the Alfresco metadata extractor deep calls into Tika to have the work done. We retain our own tests of this however.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16971: Merged V3.1 to V3.2
14282: (RECORD ONLY) Updated version to 3.1.1
14565: (RECORD ONLY) Updated version to include revision number (x.y.z)
14848: (RECORD ONLY) Updated version number
15029: (RECORD ONLY) ETHREEOH-441 and ETHREEOH-1862 Exceptions in server when certain PDFs are uploaded.
- Probably done already without merge info
- Renamed source zip to help tracking
15985: ETHREEOH-2292: Deployment failure in case of IPv6 on Win 2k8
16164: Fixed ETHREEOH-2690: JGroups TCP doesn't bind to specified address
16240: (RECORD ONLY) Fix typos in installer
16726: Fix ETHREEOH-2677 - user usages (when taking ownership)
16745: Fix ETHREEOH-2991 - Deployment exception, unable to deploy - when deploying a manual snapshot with a stale file
16771: (RECORD ONLY) Fix to ETHREEOH-441
- Probably merged without merge info
16822: Merged DEV/BELARUS/V3.1 to V3.1
16753: ETHREEOH-1951: when versionable aspect is active, using the Microsoft Word option ...
16825: Fixed ETHREEOH-803: Incorrect mimetype is displayed for .pps and .pot files
16862: Fix for ETHREEOH-801 Fail to extract some kind of PDF file metadata
- Resolved merge by prefering merged-in fix
16880: Merged V2.2 to V3.1
13966: (record only) Updated to use ALF-BINARIES version of installjammer
14340: (record only) Fix so deployment installers build
14719: (record only) Tweaks to AMP
15153: (record only) Fix ETWOTWO-1264 - PHP integration
15287: Fixed ETWOTWO-989: MS Sql server upgrade from 2.1.6 failed
15351: ETWOTWO-1345 (script not matching patch ID)
16928: Fixed shutdown: Task threads are now daemon threads
16986: Merged V3.1 to V3.2
16932: Moved Lucene ResultSet prefetch code to use NodeBulkLoader (backed by common code in Node DAO)
16945: (RECORD ONLY) Merged V3.2 to V3.1
16931: Fixed build unit test path for recent Chiba lib change
16957: Removed Hibernate event listener after 3.2.3 CGLib fixes
16959: Applied fix for ETHREEOH-2121: ContentUtils.getContentAsString does not pass JSESSIONID into the request
16961: (RECORD ONLY) Updated db settings in configs
16964: (RECORD ONLY) Merged V3.2 to V3.1
16308: ETHREEOH-2833: The Content rule with 'Items with specific text value in property' condition can't be created.
16968: Fixed ETHREEOH-2120: Recently Modified Documents Dashlet failed to load after a big upload
16983: Build fix: avoid queries for parent assocs if no nodes were found during child node in caching
16991: Merge V3.1 to V3.2
15136: (RECORD ONLY) : changes have already been merged.
MERGE 2.2 to 3.1
14985 - ETWOTWO-1174 - Preview of protected PDFs results in an error
14305 - ETWOTWO-951 - contribution
14601 - ETWOTWO-1236 - Make FSR deployment case sensitive.
17022: MT - fix fallout from r16924 - add inbound collection support to MT node service interceptor (caught by MultiTDemoTest.testCreateGroups)
17023: Fixed parentAssocCache bug when adding assocs against an empty cache
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15297: Merged V3.1 to V3.2
15093: Merged V2.1-A to V3.1
12428: Fix for ADB-150
13461: Fix for ADB-163 - Generic picker now resizes but has minimum width
13462: Fix for ADB-164 ACT 7788 - Search button label now configurable as component attribute.
13757: Fix for ADB-155
14113: Fix for ABD-143
14115: Fix for ADB-144
14493: Fixes for ADB-155 (correction) and ADB-161, ADB-184, ADB-185, ADB-186, ADB-188, ADB-189.
15162: Fix for ETHREEOH-2278 - missed during merge of ABD-143
15278: Fix for ETHREEOH-2474 - search regression
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12950: JAWS-11 - Integrate OpenOffice addin contribution (webscripts only)
ETHREEOH-991 - Window without scroll bars is opened when we click "Manage" button on "Task details" screen(Microsoft Office Add-in)
ETHREEOH-994 - Incorrect work when we try to open document by cliking on its version number on View Details tab(Microsoft Office Add-in)
ETHREEOH-988 - Incorrect work of Search Alfresco tab(Microsoft Office Add-in)
12951: ETHREEOH-1010 - IE window was not closed when we click "Save Changes" button on "Manage Task" page(Office Add-in)
12952: JAWS-226 - Support Office 2007 Transformations
12953: ALFCOM-2490 - MS Office 2007 documents can't be previewed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13532 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Merged DEV/LIVECYCLE-3.1 to V3.1
12665: Merged V2.1-A to DEV\LIVECYCLE-3.1
8615: Cluster startup and property setting enhancements
8657: Fixed shutdown procedure for JGroups
8676: Enable system property overriding of more JGroups TCP stack properties
- ${alfresco.tcp.start_port:7800}
- ${alfresco.tcp.port_range:3}
8678: More logging of cluster view changes and channel factory config during startup
12667: Merged V2.1-A to DEV/LIVECYCLE-3.1
9188: Index recovery job only calls through if property 'alfresco.cluster.name' has been set
9197: Fixed unit test after bean property name change
12793: Merged V2.1-A to DEV/LIVECYCLE-3.1
7765: Requested mimetypes
8526: Updated Mimetypes
8610: Mimetype changes
Many branding and other non-core changes were omitted
12848: Fixed JAWS-223: Adobe LC Hibernate Dialect Loading
- Hibernate dialect can be null or empty and will be autodetected from the database metadata
- Property 'hibernate.dialect' is set on the System
- iBatis loading (activities) checks for 'hibernate.dialect'
- SchemaBootstrap checks for 'hibernate.dialect'
12854: Merged V2.1-A to DEV/LIVECYCLE-3.1
8681: Fixed mimetype 'application/photoshop'
12856: Merged V2.1-A to DEV/LIVECYCLE-3.1
9008: Fixed ADB-64: NPE when applying aspect cm:mlDocument
12857: Merged V2.1-A to DEV/LIVECYCLE-3.1
9032: ACT-2303: "Namespace is displayed in the Node browser is www.alfresco.org ...
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r7765,8526,8610,8615,8657,8676,8678,9188,9197
Merged /alfresco/BRANCHES/V3.1:r12894
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12665,12667,12793,12848,12854,12856-12857
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Earlier the the repo webscripts for wiki, blog, forum/discussions and comments stripped the userinput (content field) from un-safe html tags such as scripts. Only white listed tags was allowed (specified in StringUtils.safeTags). Now <strong> and <em> has been added to the list but the method to strip away the tags, StringUtils.stripUnsafeHTML() is no longer used from these scripts.
Instead the share webtier is doing the cleaning of these tags when they are rendered using a html.ftl file. (this is the case for the wiki)
If they are requested from the client directly through an ajax proxy call the result is stripped using the Alfresco.util.stripUnsafeHTML in alfresco.js. (this is the case for blog, forum/discussions and comments).
base.css has been updated to display "rich content", in other words user input that has been formatted, correctly.
A new mimetype for installing air applications has also been added to the list of mime types.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8289: Added jpeg2000 mimetype
8302: Fix for Adobe (ACT 1487)
8306: Solution for Adobe raised ticket ACT 1384
8310: Fix for location based breadcrumb when navigating discussions
8432: ADB-48 - in case of multi-domain lookup, also consistent with AWC LoginBean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8429: Merged V2.1 to V2.2
8387: Fix for WCM-1090 see ACT 1551
8421: Minor typo fix to OpenOffice document formats descriptions
8422: Fixed AR-2145: ContentStore cleaner was not watching out for VM shutdowns
8423: Removal of default root objects responsible
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6455: OpenOffice transformer and extractor register regardless of the initial connection state.
6456: Fix for WCM-636 (Clicking OK twice while deleting web project results in exception)
6457: Updated installers and associated config
6458: AR-1669 Add getQnamePath to Javascript
6459: Fix for AWC-1456 - Word and Excel documents were being stored as octet streams rather than their correct mimetype
6460: Reverse order of reject & approve transitions, so that approve appears first in list of ui actions.
6461: Removed Process.exe (often detected as a virus) and updated config wizard.
6462: Switch to synchronous indexing for AVM by default
6463: Better support to query the state of AVM indexes
6464: Added Office 2007 document mimetypes and icons
6465: Added Office 2007 icons without the typo this time
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
The following filename is valid now: "x ¬ £ % & + ; x.txt"
This was a restriction imposed by WebDAV, but the encoding of the repsonses is working well and these restrictions be removed as a result.
Fixed AR-1281: WebDAV upload was assigning incorrect encoding
I added a bean 'charset.finder', which can be fetched from the MimetypeService.
Various pluggins now exist to decode a stream and figure out what the encoding is.
WebDAV and CIFS/FTP are now hooked into this so that they guess a little better.
Fixed others:
Added retrying transactions to WebDAV.
Read/write transactions for WebDAV.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6073 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Import action moved to top-level in the main browse screen now it is useful on a day-to-day basis.
The 'import' repository action (ImporterActionExecuter) extended to support import of any zip flavour file.
More zip flavour filetypes added to mimetype map.
Improved debugging output added to BasePathResultsMap for xpaths executed in templates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added Edit and Delete actions for AVM files and Delete action for AVM folders
- Available on the Modified Items list for a user and also in the website sandbox browse screens
- Edit is working using the inline editors for plain text and HTML files - XML form content editing to be integrated shortly!
- Edit for non-inline editable files is working (i.e. download file), but no "Update" action available at present for saving updates
- Delete will delete files/folders structures from the current sandbox, deleted files in a layer are shown in My Modified Files (see below)
- User sandbox My Modified Files now shows deleted files as differences (as ghosted out rows)
- Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
- responsible for creating content in the AVM store rather than usual SpacesStore
- removed XML specific handling from Create Content Wizard (now only present in Create Web Content Wizard)
- Create Content action added to sandbox view - NOTE: does not yet create content in the AVM world!
- Added "jsp" filetype as plain text format mimetype (to allow inline-edit for JSP files as website content)
- Open/closed state of My Modified Files panel is remembered between screen refreshes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
