- As long as a template for a control is configured fields without a definition can now be displayed
- Added 3 well known transient properties; mimetype, encoding and size (these are similar to the propertyResolvers we had in the JSF client)
- Added explicit persistence handling for the new transient properties, the name property and adds aspect if title/description and/or author property is present
- Added saveForm test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13659: Fix NTLMAuthenticationFilter to call super.afterPropertiesSet()
13658: MOB-424: Utility to Dump JMX Data
- new enterprise distributable jmx-dumper.jar
- command line invocation via "java -jar jmx-dumper.jar"
- admin web access via http://localhost:8080/alfresco/faces/jsp/admin/jmx-dumper.jsp
13575: Preconfigured authentication stacks for alfresco, LDAP, Kerberos and NTLM. TODO: file server config.
13493: Initial work to enable selection, configuration, testing and hot-swapping of different authentication subsystems via JMX or admin UI.
13309: Changes to allow datasource and property configuration via JNDI
- Move AVM catalina .jars into 3rd-party/lib/virtual-tomcat so that they don't get automatically included in the .war file and hence stop JNDI lookups from working
- Allow JNDI lookup of datasource – use standard app server mechanisms for managing it but still fall back to 'normal' one
- Allow properties to be overridden by JNDI env-entries as well as system properties. Including hibernate dialect ones. Web.xml can then declare required env-entries and these can be defined on deployment.
- Rewire iBatis so that no config file edits are necessary when dialect is changed
- Use proxy around datasource so that auto-commit is always activated for iBatis
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- New edit metadata page linked from document details page only
- Form UI component is now a lot more configurable/customisable
- Form UI component can now optionally show a caption area, reset and cancel button
- Minor fixes in textfield & textarea controls
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
13436: Merged V2.2 to V3.1
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
13491: Chaining example for DOC-84
13492: Fixed paths in zip file
13494: Fixed GenericBootstrapPatch when overriding bootstrap views
13495: Added @version javadoc
13496: Minor logging updates
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
13500: Temporary fix for Sharepoint issue raised last week
13502: ETHREEOH-1575: It's impossible to create Change Request task
13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
13529: Fix for ETHREEOH-1595
13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
13537: Build fix ... exclude the system user from auto creation
13538: Build Fix - further contraints to aviod auto-creation of guest
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1:r12307
Merged /alfresco/BRANCHES/V2.2:r13435
Merged /alfresco/BRANCHES/V3.1:r
13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- incl. taking Hibernate libs from 3.1 and adding missing file from earlier merge
13321: Fix ETHREEOH-1407: System error occur during "Undo Selected" action if no items are selected
13322: ETHREEOH-1206: Throwing Alfresco Exception on OnUpdateProperties behaviour resets Encoding field to Big (first entry)
13326: (RECORD ONLY) Removed 'dev' from version label.
13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
13338: Removed svn:mergeinfo
13346: Make startup bat script check JAVA can be found.
13351: ETHREEOH-1386 validate ASR and FSR hostname.
13359: ETHREEOH-1435: Share doesn't extract document metadata correctly
13360: Fix ETHREEOH-821: SDK dependencies
13369: Fixed distribute-sdk target for when it's run locally
13382: ETHREEOH-1437: Container creation induces an unexpected permission allocation in Share
13391: Shutdown backstop continues if logging throws errors.
13394: Fix ETHREEOH-1457 - MT coci issue with bootstrap (eg. data dictionary) content
13400: Activate JAWS-223: Adobe LC Hibernate Dialect Loading
13401: Support for JAWS-215, mysql and oracle
13413: Fix ETHREEOH-1458 - MT delete->archive
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r
13321-13322,13326-13327,13330,13337-13339,13341-13347,13351,13354-13355,13358-13363,
13365,13367,13369,13382,13385-13392,13394,13400-13403,13405-13406,13413
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13218: Partial fix for ETHREEOH-1259 - the null pointer exceptions are gone to be replaced by sensible error messages.
13220: Merged V3.0 to V3.1
13219: Build Fix for error in hand merge of r13141 from V2.2 to V3.0
13226: Clearer debugging of exceptions during NodeService cleanup
13228: ETHREEOH-1250
13229: Fix for ETHREEOH-1184: Share webscript configuration does not support international chars as values
13235: Add support to exclude admin and guest from person permission fix ups. Tidy up for ETHREEOH-1239
13239: Build Fix
13243: ETHREEOH-1308: Update AMPs to indicate unsupported status
13247: Build fix - do not delete admin :-)
13248: Fix build
13254: Fix for ETHREEOH-1351: Schemas containing an enumeration with an empty string ...
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13219
Merged /alfresco/BRANCHES/V3.1:r13218-13220,13224,13226-13229,13231-13232,13234-13237,13239,13241,13243-13248,13250,13252-13254
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13175: Basic implementation of timestamp propagation
13176: Fixed ETHREEOH-1172: NodeService.getProperties sometimes returning instance of "Collections.SingletonList"
13184: Merged V3.0 to V3.1
13179: Merged V2.2 to V3.0
13141: Fix for ETWOTWO-1109: WCM - content publisher cannot submit modified assets (2.2.3-dev regress)
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13180: Merged V2.2 to V3.0
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13185: Logging enhancements to FileFolderService to aid debugging of ETHREEOH-1247
13187: Changed NPE to IllegalArgumentException
13191: Fix for ETHREEOH-1267 malformed JSON.
13203: Fix ETHREEOH-1309 regress
13205: Fixed typo of UNKNOWN
13206: DM index check - allow index transaction tracker to be reset, etc
13213: Fixed ETHREEOH-1313: System Property Overrides not working when using the installer
13214: WCM services - add/update unit tests - CRUD using different roles
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13179-13180
Merged /alfresco/BRANCHES/V2.2:r13141,13144
Merged /alfresco/BRANCHES/V3.1:r13172,13175-13176,13179-13181,13184-13189,13191,13203,13205-13206,13210-13215
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13418: ETHREEOH-1478 - Mimetype is incorrectly determined
13419: Favourites list in Sites menu and My Sites dashlets could mismatch
13421: ETHREEOH-1487 - Fix some UI text inconsistencies
13434: ETHREEOH-1495 - Name / URL shortname etc needs to be space trimmed at beginning and end of input
13478: ETHREEOH-1531 - "Adhoc Task" Workflow doesn't work (Oracle DB)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13395: ETHREEOH-1468 - Date picker in 'Assign Workflow' (doclib) missing i18n strings
13407: ETHREEOH-1439, ETHREEOH-1451 - Script errors in MSIE for empty DataTables
13408: ETHREEOH-1337 - Error occurs when trying to perform search with wildcards
13411: Increased page list height for better usability
13414: ETHREEOH-1323 - It is possible to create empty topic
13415: Build/test fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13599 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13409: Fix for ETHREEOH-1337 - to escape query characters in Site/People service filter methods.
13410: Fix for ETHREEOH-1272 - another missing pager control.
13425: Italian lang pack for TinyMCE editors. Fixes ETHREEOH-1491.
13430: Fix for ETHREEOH-1488.
Also IDs added to a couple of pagers - not causing a bug, but completes the pager fixes.
13464: Fix for ETHREEOH-1474 - now possible to use NTLM auth with Alfresco and SURF apps hosted in same app-server with same user browser session in different tabs.
Added additional NTLM filter debugging info for Session ID.
13483: Fix for ETHREEOH-1547 - System error happens when trying to create any Web Project.
Also fixes issue where webproject FormImpl objects did not deserialize correctly due to unsafe service call usage in constructor.
13501: Fix for ETHREEOH-965 - disallow guest login until explicit Guest support is added to Share.
13507: Fix for ETHREEOH-1586 - language selectable at login working again.
13512: Fix for ETHREEOH-1522 - wiki RSS feed template variable named incorrectly.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13323: *RECORD-ONLY* Enterprise branding (ETHREEOH-1352 - Community logo in Enterprise version) - DO NOT MERGE
13325: ETHREEOH-102/ETHREEOH-981 - Thumbnail service doesn't support animated GIFs and no placeholder returned
13329: ETHREEOH-1417 - Clicking "Create Link" button in Site Links dashlet opens user's dashboard in IE7
13340: Fix for TinyMCE image-library button image not appearing in all browsers
13379: Wiki dashlet - added link to configured wiki page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13317: ETHREEOH-1300/ETHREEOH-551 - Impossible to "Insert file into Curently document" in Alfresco Add-in for Microsoft Office (Part 1 of 2)
13318: ETHREEOH-1300/ETHREEOH-551 - Impossible to "Insert file into Curently document" in Alfresco Add-in for Microsoft Office (Part 2 of 2)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13296: ETHREEOH-1330 - Incorrect work of duplicate wiki page rewriting
13301: ETHREEOH-1366 - Flash preview Zoom/size/fullscreen/navigation buttons need to be I18Ned
13302: Revert separators from turning blue
13303: Remove unused function from wiki toolbar
13306: Remove test value from i18n properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13258: ETHREEOH-1347 - Incorrect displaying of "Copy to..." dialog at DocLib page using IE6
13259: ETHREEOH-1327 - Incorrect display of Invite Users on Site members page in IE
13260: ETHREEOH-271, ETHREEOH-509, ETHREEOH-1267, ETHREEOH-272. Prevented (confusing and unnecessary) ability to type into File Browse controls
13272: ETHREEOH-1360 - Links don't show up in the Search Results page
13273: More TinyMCE features added to wiki editor. Safe-tags functions updated accordingly.
13380: Additions fix for ETHREEOH-1360 - Links don't show up in the Search Results page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13208: ETHREEOH-1263 - 'Add content to your home space' from Getting Started dashlet incorrect behavior in IE6 and IE7
13209: Calendar webscript descriptors cleaned up
13216: Fix for ETHREEOH-1280
13217: ETHREEOH-1160 - Favourite Sites - Favourite is spelled incorrectly
13221: Share Footer style update to be compatible with Enterprise footer
13222: *RECORD-ONLY* Share Enterprise Footer
13223: *RECORD-ONLY* Remove Community Logo ping
13225: Share Help URLs into config. Added Links page to missing config.
13233: *RECORD-ONLY* JAWS-461 - Update the UI doc URLs for 3.1. - DO NOT MERGE
13238: Link dashlet: Removed old reference to deleted files and unused code
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13249: Fix for ETHREEOH-1064 and ETHREEOH-1286 and fix for issue where New Page action not activated in Share Wiki page list.
13251: Final part of fix for ETHREEOH-1270 - Group pickers in JSF client now use new findAuthorities() API to find groups for user searches - over 10x quicker for installations with many groups.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13200: ETHREEOH-1268 - Pages and Components show varying degrees of success handling "site not found" errors
13201: ETHREEOH-1133 - Incorrect Blog page title
13202: ETHREEOH-1294 - Edit comment function does not work on Links page
ETHREEOH-1256 - Add Comment boxes not being cleared once comment is added
ETHREEOH-1096 - Possible to add empty comment to a post at blog page
ALFCOM-2463 - User able to create blank comment to link
13204: Web preview popup typo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13207: Rhino JAR update (System.out warning removal patch applied)
13240: Part of fix for ETHREEOH-1270
- Authority service has an API to search for groups by name patterns (not other authority types)
- it uses lucene so relies on the index
13242: Fix for ETHREEOH-1303 - Calendar events now only retrieved for the current site when rendering a site specific calendar component.
Some code tidy up and related fixes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13108: ETHREEOH-1253 - Title link in Web View dashlet always open www.alfresco.com
13118: Renamed use of "url" variable in webscript JavaScript code to avoid clash with root API variable. Possibly cause of several reported "url.full is undefined" errors.
13119: Stop dashboard page continually refreshing if a user accidentally drops onto a private site
13120: Fix inability to create first wiki page on new sites since permissions UI updates
13121: Site Members CSS tweak (dashed borders)
13143: more robust logic to render overlapping events
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13054: Quick fix to stop debugging exception for DocLib preferences
13055: Fix mouse hover color typo. Fix links double class attribute possibility. CSS code style clean-up.
13074: ETHREEOH-1235 - Share wiki: Modification controls (Delete, Rename, Edit Page, etc.) should be disabled or hidden if user doesn't have write permission for the page
ETHREEOH-741 - User with consumer role able to delete wiki page created by other users
ETHREEOH-671 - Incorrect Create Wiki Page layout
SLNG-1241 - Wiki - All views - Align with latest visuals
13082: Updated Enter key handling in Forms Runtime folowing fix for ALFCOM-2371
13083: Missing images from r13074 (Wiki UI)
13085: DocLib "Hide Breadcrumb" state remembered in Preferences
13087: Linefeeds rendered and http links activated in description fields (DocLib and Links)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13077: Abstracted ContentStore MBean operations
13099: Merge V3.0 to V3.1
13096 Merged V2.2 to V3.0
13071: Fix ETWOTWO-1058: Hibernate exception while concurrently submitting from and updating same user sandbox.
13079: Fix ETWOTWO-1117: Misleading exceptions reported during AVM flatten and update
13102: [no comment]
13112: Merged V3.0 to V3.1
13111: Merged V2.2 to V3.0
13110: Fix 2.1 -> 2.2 upgrade on Postgres
13114: Build/test fix (Enterprise Remote API project does not yet have any Java files to generate Javadoc)
13117: DM Index Check - unit test improvements
13123: *RECORD ONLY* Removed svn:mergeinfo fluff
13124: Used newer, more efficient NodeService.addProperties method instead of many NodeService.setProperty calls
13125: Added M2Binding for 'child-association': propagateTimestamps'
13126: WCM unit tests - reduce build/test time to check (async) submits
13127: Minor test fix - to allow it to run locally (on Mac OS X)
13130: Support for 'maxRetries' of zero or less
13131: Merged V3.0 to V3.1
13025 *RECORD-ONLY*: Removed unnecessary svn:mergeinfo
13026: Merged V2.2 to V3.0
12964: Fixed ETWOTWO-968: Space rules are not run when saving from MS Word
12993 *RECORD-ONLY*: added openoffice bootstrap context to sample-extensions
13009 *RECORD-ONLY*: Avoid default OOo config from causing problems on zip/gz installs
13132: Updated svn:mergeinfo
13134: ETHREEOH-1202 - initial fix and unit tests
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13005,13025-13026,13030,13039,13042,13050,13053,13096,13098,13111
Merged /alfresco/BRANCHES/V2.2:r12964,12993,13009,13071,13079,13110
Merged /alfresco/BRANCHES/V3.1:r13077,13099,13102,13112,13114,13117,13123-13127,13130-13132,13134
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13068: JAWS-456: Site REST API to retrieve collection of site details for specific site list
- Implementation for new web script added
- Unit test added
- Documentation updated http://wiki.alfresco.com/wiki/3.0_REST_API#Site_Service
13122: Fix for Site scaling issue - a user who is a member of a large number of sites and at least one favoriate site would see slow response when viewing any page in Share.
Added "Loading search results..." delayed Ajax wait pop-up when searching in Share Site Finder page.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13048: Fix for ETHREEOH-1179 - in Share customize dashboard will time out when 1000+ sites in the system
Changed AVMRemoteStore "listpattern" REST method to use Andy's new "direct to DB" file pattern matching API for AVM stores.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13555 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13033: Back end support for ETHREEOH-1179
13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
13046: Merged V3.0 to V3.1
13043: Merged V2.2 to V3.0
13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
13049: Build/test fix (WCM AssetTest)
13057: Merged V2.1-A to V3.1
8770: Added Flex SDK module
8771: Added Flex SDK binary (swc)
DH: I'm not sure about the svn:eol-style property appearing here. SVN Clients?
13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
13060: [no comments]
13061: [no comments]
13063: [no comments]
13064: [no comments]
13066: [no comments]
13067: Add NodeService.getChildrenByName
13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13043
Merged /alfresco/BRANCHES/V2.2:r13016
Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
13000: Added log4j to Eclipse classpath (unexported)
13001: Merged V2.1-A to V3.1
9127: Performance improvement to folder copy
9151: *RECORD-ONLY* Fix index back up failing with missing files
13002: Merged V2.1-A to V3.1
9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
9279: Fix ADB-84. PHP module is not restricted by the upper version
10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
13006: Merged V2.1-A to V3.1
10893: Fixes for ADB-78 & ADB-98
- Fixed service getter/setter pattern as well
10903: Fix for ADB-115 ACT-4355
13010: Made AVMLockingBootstrap resilient to read-only mode
13011: Better message for InvalidStoreRefException
13013: Merged V2.1-A to V3.1
9189: Composite Conditions Support Part 1 of 2 (repo)
9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
13015: Port of Adobe CIFS/FTP configuration changes
13017: Convert avoids folders given by '--svn-status' option
13018: Merge V2.1A to V3.1
7746: (record-only) Added ability to specify a custom CIFS authenticator class
8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
8700: (record-only) Update to prevent any native calls via configuration code
8705: (record-only) Filer out the '0.0.0.0' bind address
8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
12144: (record-only) CIFS virtual circuit fixes
13020: Merged V2.1-A to V3.1 (Composite Actions)
9191: Composite Conditions Support Part 2 of 2 (client)
9243: Composite Conditions Support Part 1 of 2 (client)
9245: Composite Conditions Support Part 2 of 2 (repo)
13021: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12898: Cleaned up svn:mergeinfo
12905: Added 'js' to svn:ignore
12916: Divorced repositories [sic] Log4J extension point from Log4J imports
12939: Build/test fix (follow on from r12899)
12945: Merged V2.1-A to V3.1
7720: (record-only) Customer-specific request to allow domains to be case-sensitive
12946: fix for ETHREEOH-1227 (bunch of FTL and JS files by Lawrence)
12949: Merged V2.1-A to V3.1
8123: (record-only) Allow authorities that are identical ignoring case (as we do in 2.2)
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r7720,8123
Merged /alfresco/BRANCHES/V3.1:r12898,12905,12916,12939,12945-12946,12949
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12951: ETHREEOH-1010 - IE window was not closed when we click "Save Changes" button on "Manage Task" page(Office Add-in)
13029: ALFCOM-2475 - DocList RSS feed migrated to web tier
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12958: ETHREEOH-1049 - Notification about Blog post deleting doesn't appear on Site Activities dashlet
12961: ALFCOM-2462 - It's unable to open site using link if user start it with http://
12962: Links Templates brought up to current standards (e.g. resizer)
12996: JAWS-31 - Integrate Share WebView Dashlet contribution
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13534 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
12911: Fix for Share calendar toolbar after regression from site membership refactoring
12940: Refactoring of the Repository ScriptService to support compilation of Rhino JavaScript (from iDay work).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
