- undeleted and reinstated use of org.alfresco.util.Pair
- undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
- undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18305: Fixed merge of fix for ETHREEOH-1619 from V3.1
18366: Hide Delete button as fix for ETHREEOH-3917
- Corrected UI to use correct DELETE method call - but it has not been fully implemented on the repository side...
18401: Fix for ETHREEOH-4076
18413: Fix for ETHREEOH-3284
18511: *RECORD ONLY* Fix for ETHREEOH-4162
19120: *RECORD ONLY* ALF-1958 - AbstractWebScript improvements to allow scripts that exit due to a JavaScript exception to set the status code and message
19144: *RECORD ONLY* Added PRE tag to whitelist of safe tags for HTML stripping in Share.
19194: Fix for ALF-1950 - corrected handling of site URL names starting with an ISO9075 encoded character in Share search data webscript.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently
18731: SAIL-169: CMIS REST versioning compliance
18732: Fix failing change log test.
18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding).
18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding).
18784: Fix CMIS REST change logging
18785: SAIL-174: CMIS Relationship lookup by association ID
18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings
18823: CMIS WS Bindings were moved to 1.0 cd07 schema.
18838: Update to latest Chemistry TCK.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18306: ETHREEOH-4047 - Failure adding comment to a file or a folder in Repository
ETHREEOH-4051 - Incorrect icon is displayed near the new added tag
ETHREEOH-4053 - Inline action is not working via details page
18312: Visible year updates (Explorer and Share clients)
18313: ETHREEOH-4020 - Internet Explorer fixes for Repo DocLib & associated refactoring (first pass)
18330: ETHREEOH-4020 - Internet Explorer fixes for Repo DocLib & associated refactoring (second pass, mostly IE7)
ETHREEOH-4063 - It's impossible to upoad new version via documents details page
18347: *RECORD ONLY* ETHREEOH-4070 - Update the Help URLs for 3.2r (Part 2 of 2)
18348: *RECORD ONLY* ETHREEOH-4070 - Update the Help URLs for 3.2r (Part 1 of 2)
18349: ETHREEOH-4068 - Diffrent behaviour after clicking Category Root link
ETHREEOH-4067 - Incorrect behaviour after clicking the last category in breadcrumbs
ETHREEOH-4073 - Issues with Forms in Share pop-ups (destroy old instances)
18350: ETHREEOH-4073 - Issues with Forms in Share pop-ups (tabbing)
18351: ALFCOM-3798 - Form Validation for Picker controls like category never fires
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17701: Fix for ETHREEOH-3691 - Blocker issue deleting a group
17703: ETHREEOH-3688 - Impossibility to open Edit Metadata page for folders from Details page
17705: ETHREEOH-3707 - Script error occurs when trying to invite external user to site
17706: ETHREEOH-3678 - Blocker issue: the column 'Path' is empty for 'Move to' and 'Copy to' actions at 'View Detail' page
17724: Merged DEV/TEMPORARY to V3.2
17720: ETHREEOH-3703: Bootstrapped content refers to ALC
17733: Fixes for ETHREEOH-3726, ETHREEOH-3660 and ETHREEOH-3629.
17960: *RECORD ONLY* Fix for unclosed InputStream in PresentationContainer (already fixed in SpringSurf/3.3).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17363: Fix to DbNodeServiceImple to allow restored nodes.
17384: Minor comments
17451: Fix ETHREEOH-2751 / ETWOONE-340 - specialising a node through an action doesn't set default values from model
17459: ETHREEOH-2391 - Invite pending task now has lots of properties
17465: Repo side fix for ETHREEOH-3010: Inbound and outbound Mltext multiple property are not converted correctly
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVNSync compare -> WCM revertSnapshot)
17483: (record only) Merged V3.1 to V3.2 (record-only)
17482: (record-only) due to earlier back-merge
17493: Fix for ETHREEOH-3342: index.recovery.mode example is incorrect
17494: Fix for ETHREEOH-3027: missingFullTextReindexTrigger (from index-recovery-context.xml) job does not work.
17510: Fix for ETHREEOH-1147: Indexing large indices can lead to Java Heap space.
17511: Fix for ETHREEOH-1271: It is possible to add one category more than one time to the same content or space
17513: ETHREEOH_3366: Altered DictionaryDAOImpl so that passing a null QName into getType and getAspect does not result in an NPE
17531: ETHREEOH-1186: Corrected rssfeed.get.js so a user can configure a RSS Feed dashlet that has been placed on their own dashboard
17550: ETHREEOH-2317: Rule not fired when document has no content
17556: Fixed ETHREEOH-1229: Can't delete space that contains "translation without content"
17558: Fix for ETHREEOH-3356: Forms fail to persist if property or association name has an _ (underscore) in it
17572: Changed caching of person NodeRefs so that duplicates are detected better
17573: Fixed UTF-8 for file with encoded chars
17576: LockAcquisitionException message specific to failed release of taken-over lock
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17363,17384,17451,17459,17465,17478,17483,17493-17494,17510-17511,17513,17531,17550,17556,17558,17572-17573,17576
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17533: Fix for unreported issue for events with multiple days (secondary elements) aren't filtered correctly when view is filtered by tags
17535: ETHREEOH-3411 - Alert appears when loading My Dashboard when Documents I'm editing dashlet is aded and site name was edited with XSS text
17536: Fixes for various forms issues (ETHREEOH-3398, ETHREEOH-3273, ETHREEOH-3339 & ALFCOM-3587) and reverted accidentally checked in log4j.properties file
- Folders can now have tags applied in edit form
- Working copy nodes have their cm:name property set to protected
- Removed mandatory marker from checkbox control (if you have a boolean there is always a value so no need to mark as mandatory)
- Potential security issue
17537: ETHREEOH-1908 - .docx word documents are not displayed in 'Word Documents' category in 'Document List' component. Also fixed some i18n strings.
17538: Fix for ETHREEOH-3085 and ETHREEOH-3341.
- NTLM/Kerberos, Tomcat/JBoss5 and JSF client now play nicely on session timeout and display the correct configured page on first login.
- Tested Share NTLM works correctly with above changes.
17539: Fix for ETHREEOH-3368: UI does not show multi-valued MLText propertis as localisable
17543: Merged DEV_TEMPORARY to V3.2
17529: Fix for ETHREEOH-3186 & ETHREEOH-3187
17544: Fix for ETHREEOH-1509 - Manage action is not applied for task resources part from My Tasks tab in Office Addins if user already opens another task.
17547: Fix for ETHREEOH-1709 - AccessDeniedException - Download Servlet not re-directing user to login page.
- WebDav path now resolved to a noderef as system user - then the permission test for READ_CONTENT is performed directly on the resulting noderef.
17548: Fix for ETHREEOH-3137 - Tags created for All day event are not displayed in Tags pane.
17551: Final part of fix for ETHREEOH-2161 includes solution for ETHREEOH-3270.
- An admin user can now optionally disable the execute of Rules and the Archive of nodes during a folder delete operation.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17307: Merged DEV/BELARUS/V3.2-2009_10_19 to V3.2
17121: ETHREEOH-2999: Accessing Recent snapshots fails in a web project that is created from an already existing project
17223: ETHREEEOH-2999: (post-review changes)
17346: ETHREEOH-2824 - further perf improvement for multiple single submits (to active workflow sandboxes) from large modified list
17375: Fix ETHREEOH-1643 - WCM revert file & version history, including a few unreported WCM / UI revert file issues
17380: ETHREEOH-1643 - fix build/test fallout
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17262: Fix for ETHREEOH-2898: Share Login - using return with auto-complete clears login screen details
17264: Fix for ETHREEOH-2368 Added category is not visible in "Categories" in Side Bar even after the page is refreshed.
17266: Merged V3.1 to V3.2
17265: ETHREEOH-3213 - Error occurs if you try to Configure of Site Wiki dashlet if wiki page name contains russian letters
17279: Fix for ETHREEOH-3110 - Error page if Add broken number by create(edit) ASR or FSR.
17281: Fix to unreported error where the NodeBrowser would not display nodes that ...
17283: ETHREEOH-3037 and ETHREEOH-2158
17286: Fix for ETHREEOH-3075 Encoding field is displayed as empty on Versioned details page.
17289: Merged V3.1 to V3.2
17288: Fix for ETHREEOH-3164 Link Destination (with modify properties of a space link) does ...
17291: Fix for ETHREEOH-2403 It's possible to create a content with spaces.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17201: Fix for ETHREEOH-1786: Time fields are displayed incorrectly
17202: Fix for ETHREEOH-1886: alf:hint tag in XSDs results in error
17204: Fix for ETHREEOH-1941: gMonth element is not correctly handled on creating web content based on web form process
17206: Fixed ETHREEOH-1134 "Incorrect behavior of tab indexes for windows"
17212: Fixed ETHREEOH-3063 "It is impossible to add tags after creating duplicate wiki page"
17214: Fix for ETHREEOH-1940: Problem with creating web forms containing mandatory boolean attributes with default values
17226: Fixed ETHREEOH-3105 "Error occurs when user add tag containing disallowed symbols."
17228: ETHREEOH-3181 - Tag inconsistence between JSF and Share client
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17201-17204,17206-17207,17211-17216,17219-17228
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17804: Branch for SpringSurf integration 2 to RemoteAPI - from HEAD r17789
17808: Part 3 of SpringSurf integration - RemoteAPI, Web-Client, Mobile and DOD5015 java code refactored to use SpringSurf Webscripts libraries, removed dependancies on existing WebScriptFramework project.
17812: Removed web-framework and webscript-framework projects. Updated build scripts to use SpringSurf dependencies for remote API and client projects and also removal of wf and wsf projects from builds.
17818: Various Spring app context and config changes to integration SpringSurf at the RemoteAPI and Web-Client project level.
- Build scripts fixed up
- Temporary web.xml changes until spring mvc dispatcher is hooked into /service urls
- The server starts up! No nothing else works yet, you know how this goes...
17819: Fix to incremental-webclient-tomcat-exploded build target to work on first deploy to a clean tomcat (affects HEAD also, not SpringSurf related).
17872: Refactor Web-Client web.xml to use Spring WebScripts Dispatcher Servlet
- servlet is configured to use the existing Spring application context instance as loaded by the ContextLoaderListener
Share web.xml TODOs for JBoss app-server support (currently missing from SpringSurf extraction)
17892: Upgraded Repository Spring dependant libraries to 3.0.0 release.
Upgraded to latest SpringSurf release (also running against Spring 3.0.0)
Various related fixes.
17893: Additional Spring3.0.0 migration fixes and libraries.
17899: Integrated another SpringSurf bug fix - to correctly add ClassPathStore instances to SearchPath objects.
17901: Fixes to handling of merging of models returned from the new Script Processors.
Share now works against a Repository that is running SpringSurf WebScripts and Spring 3.0.0.
17904: Latest SpringSurf libraries after latest changes.
TODO:
- NTLM filter needs moving to Share (not present in SpringSurf)
- MessagesWebScript - community tracking image needs adding to Share specific version (not present in SpringSurf)
- feedController - for rss feed service urls - needs testing
- Clustering config overrides - no longer work in SpringSurf, needs a rethink
- Mobile project is not working
- PHP module project
- JBossEnabledWebApplicationContext required for Share - currently missing from SpringSurf
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17667: Branch for SpringSurf integration - from HEAD r17665
17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17075: Merged DEV-TEMPORARY to V3.2
16768: ETHREEOH-2359: System Error message appears while clicking "View Completed Task" icon for the task, if the user, whom the Adhoc task was assigned to, has been deleted
16792: *RECORD ONLY* ETHREEOH-1429: Unfriendly error occurs when two content managers create identical content items in appropriate user sandboxes
17078: Merged DEV-TEMPORARY to V3.2
16962: ETHREEOH-1289: It is possible to add one Web Form to Web Project twice and more times
17080: Merged DEV-TEMPORARY to V3.2
16960: ETHREEOH-1894: Unfriendly notifications appear when trying to edit unlocked content
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Id is now decoded in the action links
- Added nodeName validator to webclient for groupids (and username) since that is what is used in share (means that "<" and ">" characters now are forbidden)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16841: Fix for ETHREEOH-3046 - discussion post replies and further post content now all set to UTF-8 encoding format.
16853: Merged V3.1 to V3.2
13681: Disable CMIS Web Services.
13958: ETHREEOH-1625 - Incorrect save file process via Office Addin
14026: ETHREEOH-1805 - update GET login web script description to recommend use of POST login web script instead.
16861: Merged V3.1 to V3.2
14162: ETHREEOH-1733 - multiday events display correctly
14273: fix for ETHREEOH-2031
14274: fix for event not adjusted by height issue in week view, after adding
16867: Merged V3.1 to V3.2
15429: The solution is to remove 'label' and 'description attributes' and add appropriate 'label-id' and 'description-id' attributes in
web-client\config\alfresco\web-client-config.xml for dashlets. Appropriate ids were added into webclient.properties.
16677: ETHREEOH-1208 - Upload/recall documents with apostrophe/accent via Alfresco Office plugin
16869: Merged V3.1 to V3.2
16848: Merged V2.2 to V3.1
15217: Fix for ETWOTWO-1268. Check for existence of desired control on first step of the dialog.
15218: Fix for ETWOTWO-1269. Remove node.hasPermission(PermissionService.CREATE_CHILDREN) from CheckoutDocEvaluator#evaluate method (like 3.2 version).
16849: Merged V2.2 to V3.1
15424: ETWOTWO-1349
16851: Merged V2.2 to V3.1
15432: **RECORD ONLY** Input characters validation script was modified to disallow !@#$%^&*().
15433: This check-in fixes ETWOTWO-1351, ETWOTWO-1352, ETWOTWO-1353 because their behaviour is similar.
16874: Merged DEV/TEMPORARY to V3.2
16789: ETHREEOH-1895: Incorrect working of Link Destination Details
16790: ETHREEOH-2372: Incorrect working of Link Destination Details
16791: ETHREEOH-2342: Error message appear when "Coordinator" try to remove himself from the space
16793: ETHREEOH-1364 & ETHREEOH-1367
16794: ETHREEOH-2358: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
16837: ETHREEOH-2631: two jsp:root elements cause compilation error in Weblogic 10.3.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16798: Fix for ETHREEOH-1305. Null Path error if user clicks on Next Item icon on View Details page.
16800: Fix for ETHREEOH-2884 - Language icon near the content is displayed as "NULL". User can't change any language.
16805: Merged DEV-TEMPORARY to V3.2
16789: ETHREEOH-1895: Performing "Done Editing" action simultaneously leads to NPE
16806: ETHREEOH-1898 - Delete icon missing from Shortcut list in Shelf
16807: Fix for ETHREEOH-2356 - Error message appears when user tries to apply template to locked content.
- missed one of the actions with the evaluator wrapping first time around.
16808: Minor javadoc update
16815: XHTML compliance fixes. Dashboard pages etc. now render as fully compliant XHTML again.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16725: Merged V3.1 to V3.2
16721: Merged DEV/BELARUS/V3.1 to V3.1
16483: Fix for ETHREEOH-2728 : WCM - Forms rendering issue using IE6
16889: Merged V3.1 to V3.2
16888: Merged V2.2 to V3.1
16694: Fix for ETHREEOH-1384/ACT 11135: Poor performance when using webscript based web forms
16787: Fixed Web-Client Eclipse project after recent chiba JAR file name change
16840: Resolution to issue in ETHREEOH-2633: Change to Common.js function implemented in CHK-5134 causes problems with missing icons in Navigator panel. Implemented configuration approach so that both modes can be supported.
16870: Fix for ETWOTWO-119 & ALFCOM-332: WCM config override issues where the OOTB web-client-config-wcm.xml file needed to be changed and the ability to define custom scripts to load to avoid the need to edit xforms.js or XFormsProcessor.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16740: Fix for ETHREEOH-2563 and ETHREEOH-2899.
16741: Fix for ETHREEOH-1781 - web-client-config-custom.xml.unicode.sample has incorrect comment.
16757: Merged DEV-TEMPORARY to V3.2
16730: ETHREEOH-2749: Entering a search containing a single quote breaks the script that performs next/previous page in OpenSearch JSF component
16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
16732: ETHREEOH-1944: Navigation via shortcuts brings up incorrect dialogs
16761: Merged DEV-TEMPORARY to V3.2
16750: ETHREEOH-2405: system error if user goto Web Projects space from any web project which was deleted by another user.
16762: Displaying error title when error text is displayed
16763: Merged DEV-TEMPORARY to V3.2
16756: ETHREEOH-258: System Error message appears while clicking "Manage Task" icon in "My Completed Task" component for the task, if the user to whom the workflow was assign to is deleted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16673: Merged V3.1 to V3.2
16307: ETHREEOH-2814-2815
16393: ETHREEOH-2840: Failed to send email to group EVERYONE
16395: Just forget to add this file during previous (16393) CHECK-IN.
16430: Added license header to new Java file - applied coding standards and code comments.
16669: Merged V2.2 to V3.1
16650: ETWOTWO-1288 - Create Web project Wizard-Step3 :XSS attack can be made when configuring ASR or FSR
16668: Fix for ETWOTWO-1289 - My Web Files (Forms) dashlets XSS attack can be made when web project's details has been edited
16676: Merged V3.1 to V3.2
16675: Fix for ETHREEOH-2773 - Manage System users: system error happens when search is performed by a query that contains a space
16699: Fixes to SURF samples Login page - as per ALFCOM-3447 and ALFCOM-3448 contributions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15908: Merged V3.1 to V3.2 (record only)
15907: Merged V3.2 to V3.1
15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
15972: Merged V3.1 to V3.2
15429: **Record only** I18N message IDs for JSF dashlets
15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
15957: Merged DEV-TEMPORARY to V3.1
15865: Fix for ETHREEOH-2673
15958: Merged DEV-TEMPORARY to V3.1
15885: ETHREEOH-2615: Localization Issue - Japanese UI
15959: Merged DEV-TEMPORARY to V3.1
15882: ETHREEOH-2644: Sending Email using Template throws exception
15962: Fix for ETHREEOH-2390
15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
15965: Merged DEV/BELARUS/V3.1
15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
15966: Merged V2.2 to V3.1
15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
15969: Prep for ETHREEOH-2295 fixes and associated merges.
15970: Merged DEV-TEMPORARY to V3.1
14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
Merged /alfresco/BRANCHES/V2.2:r15948
Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
Merged /alfresco/BRANCHES/V3.2:r15908,15972
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15596: Merged V3.1 to V3.2
14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order
14112: Fix ETHREEOH-1758 - apply contributed patch
14447: Merged V2.2 to V3.1
14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found.
14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948
14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher
15604: Merged V3.1 to V3.2
14734: Merged V2.2 to V3.1
14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx")
14852: Merged V2.2 to V3.1
14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager"
15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store)
15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog
15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file
15072: Minor - fix remote AVM test
15605: Merged V3.1 to V3.2
15082: Merged V2.2 to V3.1
15081: AVM - add tests only
15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file
15118: Merged V2.2 to V3.1
15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test)
15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions
15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors
15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency)
15190: Minor: message updates for WCM submit/undo actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15506: Fix for ALFCOM-3274 - removed double-encoding of webview dashlet title when set from Configure dialog.
15543: Fixes for ETHREEOH-2596 and ETHREEOH-2392. Any Admin user now forced to enter old password when editing themselves in the Share User Admin console.
15620:Merged V3.1 to V3.2
15595: Merged DEV-TEMPORARY to V3.1
15446: Appropriate JSP page was modified to align radio buttons.
15597: Fix for ETHREEOH-2575 - all PNG files now appear in IE6, note that PNG transparency is not supported in IE6.
15598: Merged DEV-TEMPORARY to V3.1
15593: ETHREEOH-2445: Localization Issues [Email Templates and RSS Templates ACPs I18N]
15599: Merged DEV-TEMPORARY to V3.1
15491: ETHREEOH-2460: Localization Issues - Email template
15601: *RECORD ONLY* Merged V3.2 to V3.1
15504: ETHREEOH-2447: My Content page localisation failing. [backport from V3.2]
15613: *RECORD ONLY* Removed reference to portlets message bundle - as per CHK-8518
15784: Minor performance improvements to data dictionary classes relating to Permission evaluations.
15791: Merged V3.1 to V3.2
15693: Merged DEV-TEMPORARY to V3.1
15648: ETHREEOH-2549: Templates in 3.1 will need localising
15743: ETHREEOH-2586: JP:Layout error, the word "....." (cancel) should be in the same line
15745: ETHREEOH-2493 - HTML and XML encoding fixes to Alfresco OpenSearch keyword and person search HTML/ATOM/RSS feed templates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15793 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
- Actions for applying/removing templates not applicable for locked documents
IE6 fixes for footer logo in JSF client.
Fix up of broken document-details custom view panel JSP tags/verbatim - since 3.0 dialog conversions.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- changePassword(string oldpw, string newpw) - changes password for the current user only, old password must be supplied
- setPassword(string userName, string password) - set the password for the given user - only executable by an admin user
Fix up and clean up of my-sites.get.js so that IMAP favorites are only retrieved if the IMAP server is enabled
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14280 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13867: Fix for ETHREEOH-986 - long names in Explorer details view show correct width in FF browser
13869: Fixes for ETHREEOH-1387 and ETHREEOH-1390
13872: Fix for issue where custom-web-framework-application-context should be optional in the web.xml for web-framework project.
13909: Fix for ETHREEOH-1684
13910: Fix for ETHREEOH-1266
14015: Fixes for ETHREEOH-1864 and ETHREEOH-1840
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14020 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
