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
13371: Fix for ETHREEOH-1371, ETHREEOH-1373, ETHREEOH-1374.
Rule comparator now correctly deals with MLTEXT datatype fields such as name/title/description.
13372: Fix for ETHREEOH-1291.
Fixes the general issue that "decodeURI()" should not be used to decode javascript encoded strings -unless- you specifically want to ignore certain characters, "unescape()" should be used instead.
13373: Fix for ETHREEOH-1284. Clean up of generated javascript for UIDataPager component - also moved to include file for performance and ease of modification.
13384: Fix for ETHREEOH-1459.
Sweep through and clean up of the Edit Online/Offline editing and Checkin/Checkout process as per latest wireframes.
A number of minor fixes to JSF action evaluators and related JSPs also.
Icons updated as per wires.
13396: Fix for ETHREEOH-1424. Web-framework script connector now generates an Accept-Language header based on current user locale by default for remote calls.
13404: Missing paging controls added to task and workflow dialogs (part of ETHREEOH-1410).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13596 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13304: Final part of I18N fixes for Share. TinyMCE editor lang packs: fr, de, jp, es. Added Spanish (es) to web-client TinyMCE integration also which was missing it.
13316: Liferay Portal 4.3.X fixes for JSF Client portlet:
- Tested deployment instructions for Alfresco and Liferay 4.3.X - still work as per wiki page http://wiki.alfresco.com/wiki/Deploying_2.1WAR_Liferay4.3
- Upload is working (tested from Add Content, Upload New Version and Update)
- Fixed bug raised in ETHREEOH-1170
NOTE: there are still issues with the other Ajax Mootools powered portlets...
13333: Fix for ETHREEOH-1410, ETHREEOH-1402, ETHREEOH-1396, ETHREEOH-1393, ETHREEOH-1380, ETHREEOH-1274, ETHREEOH-1266, ETHREEOH-1257 - Paging control submit box now correctly handles enter key press without submitting parent form.
13348: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes.
So they are not accidently given full permissions to that folder or the ability to rename it later.
13349: Fix for ETHREEOH-980 - a user home space can no longer be set directly to User Homes [missed files]
13350: Fix for ETHREEOH-971. CIFS and WebDav online edit modes fixed to work in IE as best as possible in FF.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13590 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
13173: Merged V2.1-A to V3.1
10964: Fix for ADB-81: String 'Template' in Japanese is not good format
10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
10972: Fix for ADB-95: All templates should be parameterized using a such that they pickup the server name and port number of the current installation
10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
13174: Merged V2.1-A to V3.1
10975: Fix for ADB-118: Content attributes not localized [client templates]
13182: Merged V2.1-A to V3.1
11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
13190: Merged V2.1-A to V3.1
11070: Fix for ADB-120 ACT 4773
13192: Merged V2.1-A to V3.1
11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
13193: Merged V2.1-A to V3.1
8395: Remove user and group admin actions from Admin console [added config switch - off by default]
8584: Removed option for user to change password [added config switch - off by default]
10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
13194: Merged V2.1-A to V3.1
12095: Fix for ADB-131
13195: Merged V2.1-A to V3.1
12097: Fix for ADB-133, ADB-134
12102: Fix for ADB-139
13196: Merged V2.1-A to V3.1
12350: Fix for ADB-142
13197: Merged V2.1-A to V3.1
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
12878: Merged record-only for V2.1-A to HEAD
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
13198: Merged V2.1-A to V3.1
12977: Fix for ADB-158: Intermittent error while accessing the login page
13142: Another fix for ADB-158: Intermittent error while accessing the login page
13199: Merged V2.1-A to V3.1
11589: Fix for ADB-95: All templates should be parameterized
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13023: ISO date fix for ETHREEOH-1215
13153: Merged V2.1-A to V3.1
9026: - Added "My Content" link to error page
- Manual merge of Safari fixes
- Fixed exploded build target after recent removals
13155: Restored line removed in merge
13156: Merged V2.1-A to V3.1
9027: *RECORD-ONLY* Further Safari rendering fix
9028: Removed use of generics from JSP so it compiles in JBoss
13161: Merged V2.1-A to V3.1
9051: *RECORD-ONLY* Fix for ACT 2806 (linked content was returning 404 error)
13162: Merged V2.1-A to V3.1
8680: *RECORD-ONLY* Added back "too_many_users" message as it got removed
13164: Merged V2.1-A to V3.1
8699: Added DOCTYPE line
8994: Added Copyright for Sun due to Rhino debugger use.
9388: *RECORD-ONLY* ACT-3263 - Localization of "username" and "password" in login.jsp
13166: Merged V2.1-A to V3.1
9748: *RECORD-ONLY* Fix for ACT 3455 (ADB-90) - Editor role can not check out documents
10199: Fix for ADB-86: Clicking 'Cancel' while adding a composite condition for a Rule on a space in CS ES has no effect
13167: Merged V2.1-A to V3.1
10673: Fix for ADB-110/ACT-4247: Review/Change Records Management URLs and make it compatible to Adobe's build
10674: Fix for ADB-109: setting log4j.rootLogger to WARN thows unexpected warn when accessing My Home
13168: Merged V2.1-A to V3.1
10883: *RECORD-ONLY* Fix for ADB-124: Change Search field length to 1
10905: Fix for ADB-114 ACT 4425. Also will fix ALFCOM-1895 when merged to HEAD.
10961: Fix for ADB-44: Create menu link should not be visible if the menu is empty
10962: Fix for ADB-61: Alfresco breadcrumbs + Navigator become inconsistent....
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13129: Merged V2.1-A to V3.1
8598: Fix for ADB-41 (ACT 1657)
13139: Merged V2.1-A to V3.1
8674: First phase of using group display name in UI
13148: Merged V2.1-A to V3.1
8679: Completion of using group display name in UI
13149: Merged V2.1-A to V3.1
8690: Fixed ADB-33 again
13150: Merged V2.1-A to V3.1
8775: Fix ACT-2399
13152: Merged V2.1-A to V3.1
8941: ACT-2631: added max users message to send email action page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13084: Merged V2.1-A to V3.1
7984: *RECORD-ONLY* Final part of fix for ACT 819, by default the web-client now generates WebScript content download API based URLs to allow relative paths to be resolved in HTML content files
13086: Merged V2.1-A to V3.1
7986: *RECORD-ONLY* Additional for ACT 819, View In Browser details page links and cm:link objects to content now output Content API webscript urls
13090: Merged V2.1-A to V3.1
7986: Language locale auto-selection based on browser locale - see ACT 1053
NOTE: a web-client-config setting has been added to enable this - it is off by default.
13093: Merged V2.1-A to V3.1
8255: Filetypes and PanelGenerator enhancements
13094: Merged V2.1-A to V3.1
8547: Branding changes from Mike [just filetypes merged]
13095: Merged V2.1-A to V3.1
8555: Webdav path support for ExternalAccessServlet browse navigation
13103: Merged V2.1-A to V3.1
8592: Fix for login page issue with language locale auto-selection - see ACT 1053
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12994: Merged V3.0 to V3.1
12931: Merged V2.2 to V3.0
12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
12759: AVM - build/test fix - follow-on to r12742
12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
12932: Merged V2.2 to V3.0
12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
12809: Test fixes after r 12782
12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
12933: Merged V2.2 to V3.0
12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
12934: Merged V2.2 to V3.0
12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
12935: Merged V2.2 to V3.0
12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
12936: Merged V2.2 to V3.0
12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
12937: Merged V2.2 to V3.0
12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
12850: ETWOTWO-975 - Show Conflicts in Modified Items List
12938: Fix merge typo (follow on from r12931)
12941: Fix merge typo (follow on from r12931)
12998: Cleaned up svn:mergeinfo entries
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
Merged /alfresco/BRANCHES/V3.1:r12994,12998
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13426: Support for fix to ETHREEOH-1157: Allow dialogs to propagate exceptions
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r13426
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12786: Merged V2.2 to V3.0
12783: Merged V2.1 to V2.2
12779: ALFCOM-2277 - Copyright notice needs updating to be for 2009
12787: ALFCOM-2277 - Copyright notice needs updating to be for 2009 (continuation)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12718: Merged V2.2 to V3.0
12706: Merged V2.1 to V2.2
12693: Fixed regression where summary pages of WCM related wizards do not render correctly after XSS fixes, related to ETWOTWO-987
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12513 Implementation of Asset.getProperties
12469 Implement paths relative to web app. And unit tests. Asset Test is now clean of TODOs.
12413 Implementation of WCM Asset. Still work remaining but this is 80% of the implementation.
12404 WCM Services
- asset service - fix rename/move folder issue (folders are not locked)
- sandbox service - fix delete sandbox test
12374 WCM Services - optimise get/is web project
12347 WCM Services - "asset service" - add/remove/has aspect, get aspects
12341 WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12236: Implementation of Sandbox Revert REST API
12305: WCM Services - "asset service" initial checkpoint (more tests to be added)
12334: placeholder for WCM Asset implementation
12338: Check in to get server working ...
12341: WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12310: Merged V2.2 to V3.0
12306: Merged V2.1 to V2.2
12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
12312: Merged V2.2 to V3.0
12311: Merged V2.1 to V2.2
11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
12316: Fix for merge issue
12317: Merged 2.1 to 3.0
12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
12321: Missing file from previous checkin
12324: Merged 2.2 to 3.0
12320: Merged 2.1 to 2.2
11682: Fix for ETWOONE-87: Behavior of delete cascade
12326: Merge 2.1 to 3.0
11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12140: Merged V2.2 to V3.0
11732: Fixed ETWOTWO-804: Node and Transaction Cleanup Job
11747: Missed config for Node and Txn purging
11826: WCM - fix ETWOTWO-817
11951: Fixed ETWOTWO-901: NodeService cleanup must be pluggable
11961: Merged V2.1 to V2.2
11561: ETWOONE-224: when renaming duplicates during copy association names where not renamed
11583: (ALREADY PRESENT) Updated NTLM config example in web.xml - adding missing servlet mappings
11584: Fix for ETWOONE-209 - JavaScript People.createGroup() API now correctly checks for actual group name when testing for existence
11585: Fix for ETWOONE-214 - View In CIFS link now works even when users des not have view permissions on the parent folder
11612: Fix for ETWOONE-91: the description textarea in the modify space properties web form eats one leading newline each time it is submitted
11613: Fix 2.1 build and adjust implementation of ETWOONE-224 fix
11621: Fix for ETWOONE-343
11669: Improved debug from index tracking when exceptions occur
12141: Avoid annoying Spring WARN messages for ClientAbortException
12143: File that should have been deleted in CHK-5460 (rev 12140)
12177: Fix failing FS Deployment Tests since introduction of transaction check advice.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12123: Merged V2.2 to V3.0
11466: Fixed sql-query DELETE syntax
11614: Flush after putChild, fix for ETWOTWO-777
11641: Merged V2.1 to V2.2
11632: Improvements for AVM index FULL and AUTO rebuild.
11646: Upgrade scripts tweaks:
11650: Added unit test to confirm fix of ETWOTWO-740
11674: Added missing EHCache definitions for QName, Namespace and Locale caches
11825: Fixed Eclipse classpath addition of path for Oracle JDBC driver
12125: ETHREEOH-899: Image transformations do not follow Options
12127: Merged V2.2 to V3.0
11675: Node DAO optimizations
11680: Full Fix for ETWOTWO-777 + more protection for nested write transactions beneath read transactions.
11729: AVM creates and deletes no longer update the directory mod time - ETWOTWO-801
11738: Fix for ETWOTWO - fixed check for TX propagation mode
11748: Fixed ETWOTWO-578: RepositoryWebService fetchMore() does not fetch last node
11749: Incorporate feedback from ACT-5440: MySQL-specific tweaks to the upgrade scripts
11750: Moved t_qnames_dyn section to after t_qnames
11752: Fixed ETWOTWO-734: ImporterComponent uses Lucene queries
11785: Build Fix:Remove auto created person TX commit fro DB
11853: Fix for ETWOTWO-687 - missed a case when generating lists of actions for modified files list
11940: Stress test main method for ETWOTWO-744
11950: Fixed ETWOTWO-909 and ETWOTWO-911
11987: Dirty checking for attribute related DAOs
12008: Fixed test for transaction-requiring AttributeService
12128: Merged V2.2 to V3.0
11530: Merged V2.1 to V2.2
11499: Defensive clear of the security context to avoid any ticket sharing for a given user - ETWOTWO-326
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
12085: ETHREEOH-565: Failure to generate flash preview for PPT file
12086: ETHREEOH-903 Sites drop-down Favorites UI improvements
ETHREEOH-904 My Sites dashlet Favorites UI improvements
ETHREEOH-547 User who is not a site manager can delete sites: my sites dashlet and sites page
12093: ETHREEOH-861, ETHREEOH-928
12094: Remove __MACOSX folder that has appeared in Share webapp
12096: Removed spurious files from YUI 2.6.0 distribution
12100: ETHREEOH-929 Tightening up transport adapters field (should never be shown for ASR)
12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
12115: Added unit test to check for cm:folder-derived type support
12116: Removed unused, old patch-related query
12117: Merged V2.2 to V3.0
11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
12118: Fixed compilation error after merge
12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
12122: UserUsage does nothing if system is READ-ONLY.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11905: Merged V2.2 to V3.0
11782: Fix security in RunAs using public APIs (ETWOTWO-816).
11907: ETHREEOH-846
11908: More work on Shutdown Backstop
11909: Speculative fix for EHTREEOH-782.
11912: ETHREEOH-746 Unable to view contents of previous versions of wiki page
11915: ETHREEOH-746 Unable to view contents of previous versions of wiki page
11916: Upgrade from YUI 2.5.2 to YUI 2.6.0 - Second stage (Paginators, DocLib Tree, Resizer widget)
11917: ETHREEOH-874 and ETHREEOH-875
11918: ETHREEOH-860
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
