2 Commits

Author	SHA1	Message	Date
Kevin Roast	65f1931ee8	Merged BRANCHES/DEV/HEAD-QA to HEAD: ... 48730: Record only merge from 4-1.BUG-FIX (4.1.5) to HEAD-BUG-FIX (4.2) 48447: Performance problem with Eclipse can be fixed by excluding the web-client build directory from the searchable resources. Done for 58 other projects (generally include in the 4.1 code line) 48726: Reverse Merge (did not work after an Eclipse Clean) - already done on HEAD 48447: Performance problem with Eclipse can be fixed by excluding the web-client build directory from the searchable resources. Done for 58 other projects (generally include in the 4.1 code line) 48929: Synced up with HEAD r48903 48957: Merged PATCHES/V4.1.4 to HEAD-BUG-FIX 47847: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47625: Fixed ALF-18063 - AlfrescoUtil's getPages method now parses json using jsonUtils.toObject to force strict json - CSRFFilter got new throwError action meaning the filter now can stop certain resources form being reached directly from the browser - /remoteadm/* webscripts can no longer be accessed directly from the browser - Modified regexps to be easier to read - Added config samples 47879: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47878: Final part of fix for ALF-14086 - Sort order of folders including hyphens ( - ) are different in folder-tree and view on folders (in Share) - People Finder 47912: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4: 47909: ALF-18257: partial fix - adds back in missing TinyMCE files. 47928: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47913: Final part of fix for ALF-18257 - AWE panel is not displayed 47932: ALF-14587: Created article or publication cant be viewed on WQS site - Fix by Dmitry Vaserin - Same fix was done to style1.get.html.ftl in ALF-17117 47956: ALF-10243: workflow shows wrong date - Missing WQS date field configuration 47983: ALF-15803: CH, NL, RU: There are no Chinese, Russian, Dutch templates for IMAP messages and Chinese, Russian templates for Email messages - Email templates from Gloria 48026: ALF-15803: CH, NL, RU: There are no Chinese, Russian, Dutch templates for IMAP messages and Chinese, Russian templates for Email messages - Email templates from Gloria 48027: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 48020: Fix for ALF-18220 - Cancel checkout in 'View Original Document' view fails and causes document stuck in checkedout state. 48048: Merged BRANCHES/DEV/DWEBSTER/HEAD_AWE to PATCHES/V4.1.4: 48047: Fixes: ALF-14758. Adds z-index as a work around to an overlapping menu bug that occurs if they are created in a particular order and viewed on a large enough resolution monitor. 48086: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4: 48083: Fixes ALF-14931 48121: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4: 48116: Fixes build failure caused by 'fix' for ALF-14931 48153: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 48102: Fix for ALF-18354 - SPP-Meeting workspace event can be edited and deleted on Agenda tab 48124: Fixes ALF-18349: Slideshare and YouTube channels can now be created. 48151: Fix for ALF-15475 - Liferay Portal: IE9: Layout of portlets is broken when document details page is opened 48156: Improved fix (removed useless media queries) for ALF-18196 - Document Preview - Flash Movie Sized to a Thin Horizontal Bar at 1024x768 Resolution 48185: Another go at a solution for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO). 48189: ALF-17818 - Strikethrough formatting is not preserved in Wiki 48208: ALF-18385: Alfresco Explorer: Localization is not applied after login. - Fixes regression caused by ALF-17189 48261: Fix for ALF-18352 - Manager can not update permissions more than once for the folder/content created by other user 48264: Merged DEV to PATCHES/V4.1.4 48258: ALF-18325 : Can't delete wcmqs if it was published to live We should also check for site is not being deleted before creating site container. 48283: Correction to fix for ALF-18196 48284: Fix for ALF-18328 - Share dependencies containing dependencies breaks Hazelcast clustering 48352: Fix for MNT-6390 - Incorrect type for Group and Review workflow after task approved by all users 48354: Fix for MNT-3196 - No information is displayed in My Activities and Site Activities dashlets for content creation 48390: MNT-6292: Created article or publication cant be viewed on WQS site - Fix researched by Dmity Vaserin - More handling of empty lists - It seems that WCMQS requires renditions to be indexed (in order for them to be returned by CMIS queries) so we must remove the ASPECT_INDEX_CONTROL aspect from them in RenditionHelper 48424: Fixed MNT-7521 "Document Library" instead "File Plan" displayed in the site navigation bar 48430: MNT-7522: Users with "read only" or "read and file" permissions don't have access to RM folders - In ScriptNode.childByNamePath() check for PermissionService.READ permission rather than PermissionService.READ_PROPERTIES permission, which apparently isn't compatible with RM! 48434: MNT-7522: Users with "read only" or "read and file" permissions don't have access to RM folders - Corrected fix with help from Andy Hind 48500: Fixed MNT-6311 "Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets" 48548: MNT-7528 My Tasks to Do and My Pooled Tasks dashlets do not show the correct description of a workflow 48635: MNT-8482 Enterprise 4.1.4: Backwards compatibility breaking change in public Java API class org.alfresco.service.cmr.dictionary.ClassDefinition - Added back in missing methods and using StaticMessageLookup so will still have the issue identified by MNT-413. The new methods still exist and don't have this issue. 48645: MNT-8484: Oracle: An unexpected difference is present after comparison of database schema with reference schema (post-upgrade) 48729: MNT-8498 Could not transform .psd file 48745: MNT-8527: Activity Feed Cleaner broken on Oracle - Due to ibatis weirdnesses, the select_activity_user_feeds_greater_than_max query has to exclude results with null user_ids (non user feeds) as this maps to a null row on Oracle and results in an NPE! - Also fixed all comparisons with feed_user_id to be NULL safe 48751: Fixed MNT-8504 "Script error occurs when clicking Edit Tags action from document/folder details page" - Removed js_string encoding of nodeRef and made sure nodeRef is taken from the repo instead of the page url 48752: MNT-8467: Cannot authorize to Share Kerberos automatically - Reversed r44754 performance fix causing this (Sorry Kev) 48755: MNT-8514: Incorrect workflow status is displayed on My Tasks dashlet - Fix by Viachaslau reviewed by Frederik 48756: MNT-8531: Merged PATCHES/V4.1.3 to PATCHES/V4.1.4 48683: MNT-8494: Lucene index recovery fails to reindex an orphaned node whose parent is deleted - Added unit test for this and fixed regression over MNT-6545 fix 48717: MNT-8494: Lucene index recovery fails to reindex an orphaned node whose parent is deleted - Strengthened unit test to check for deleted nodes with parents and strengthened handling of these as a result - Hopefully fixes unit test failures 48798: Fixed MNT-7646 "CLONE - [Pentest] Internet Explorer <= v8 XSS" - Share now inspects text/xml content from the webscript content, if it finds a <!DOCTYPE svg> it will change the mimetype to text/plain. 48810: Upgrade Surf version in POM files to 1.2.0-M4 (r1217) 48819: Fixed MNT-8504 "Script error occurs when clicking Edit Tags action from document/folder details page" part 2 - Fix on folders page 48820: Make SchemaReferenceFileTest actually output its reason for failing - I can't track down the temp files! 48822: MNT-8508: Fixing description-property in LazyActivitiWorkflowTask which is not the same as WorklfowTask.description 48823: BDE-130: fail the build when yuicompressor minimization fails 48890: Fixed MNT-8554 "FF: Download button on Document Details page is not working" - Note also fixes the "Comment" widget in the header not working (in any browser) 48933: MNT-8560: It's impossible to find the user by any property except the username Modify People.getSortedPeopleObjects() method to create ArrayList based on provided List<NodeRef> and use it for sort, because provided List<NodeRef> can be unmodifiable list. 48964: MNT-6494: Fixed merge issue (already fixed in HEAD-BUG-FIX) 49033: Merged PATCHES/V4.1.4 to HEAD-BUG-FIX-QA 48996: MNT-8564 : CLONE - Incorrect saving process when editing event Fix event.put.json.ftl to produce valid json 49006: MNT-8555: Reverse Merge MNT-6419 (ALF-17089) 45245: ALF-17089 (Displaying Url Name instead of site Name in Select form) 47089: ALF-17089 (Displaying Url Name instead of site Name in Select form) 49039: Merged HEAD to HEAD-BUG-FIX-QA 48931: Fixed CLOUD-1511 "My Documents dashlet is crashing when inspecting the syncmode value" 48955: Fix name of wdr-deployment jar in mvninstall task 48979: ALF-18573: fix sharepoint module context name. This is a change that was appropriate for cloud but had crept in to HEAD during the megamerge. 48988: Fix integration with CLOUD2 + compile and package remote-api test classes separately 48995: CLOUD-1460 "CloudConv: Re-implement header customizations" - #1. Re-add link so network admin can access admin console Added in widget ids that could be referenced to add and remove widgets in the user & app items menu 49008: Fix public api tests 49014: Fix public api tests 49136: Fix public api tests 49141: Merged HEAD-BUG-FIX to HEAD-QA (thus completing 4.1.4 -> HEAD-QA merge) 49139: Merged PATCHES/V4.1.4 to BRANCHES/DEV/HEAD-BUG-FIX (mergeinfo committed earlier) 48735: Fixed MNT-8506 & MNT-8507 * MNT-8506 "A server error has occurred when press Follow/Unfollow button from User Profile" * MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" * Instead of using Alfresco.util.Ajax.request and creating XHR requests forms were being submitted meaning the Alfresco-CSRFToken never got added. * Now refactored to use Alfresco.util.Ajax.request and post directly to the proxy, meaning the Share "services" now can be removed. 48812: MNT-8506 / MNT-8507: Fix up by Vasily to avoid YUI compression error 48813: Fixed MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" part 2 - variable used keyword "private", now refactored to "isPrivate" 49154: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 48470: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3 to BRANCHES/DEV/CLOUD1: 48041: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAP2 to BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3: 47129: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI1 to BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAP2: 45439: PUBLICAPI-39: "Favourites API" wip 45681: PUBLICAPI-39: "Favourites API" wip 45897: Test a fix for issue found during bm testing - CMIS: null entries in property list values 45965: Public api performance investigation: test node bulk loading change 45978: PUBLICAPI-39/40: wip, changes from review. 46019: PUBLICAPI-39: "Favourites API" wip 46056: Re-instate opencmis config that was mistakenly changed 46156: Public api performance investigation: test node bulk loading change 46193: PUBLICAPI-39: "Favourites API" wip 46200: PUBLICAPI-39: "Favourites API" wip 46247: Upgrade to OpenCMIS 0.8 46248: PUBLICAPI-72: "Add users role to Site entity" 46249: PUBLICAPI-72: "Add users role to Site entity" 46250: PUBLICAPI-40: "Site membership API" - modifiedAt timestamp + some tidy up 46251: PUBLICAPI-40: "Site membership API" - bug fixes 46253: public api tests refactoring (split tests into separate classes by functional area), site membership api tests 46273: public api tests refactoring (split tests into separate classes by functional area), site membership api tests 46298: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46299: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46300: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46311: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46337: PUBLICAPI-79: "GET a Favorite" 46338: PUBLICAPI-79: "GET a Favorite" 46339: public api tests: some refactoring 46340: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46345: Added name parameter to the @uniqueId annotation. e.g. @UniqueId(name="targetGuid") 46346: PUBLICAPI-39: "Favourites API" - tests 46359: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes 46380: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes 46381: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes 46397: PUBLICAPI-40: "Site membership API" - add missing file 46411: public api tests: re-instate tests (accidentally commented out) 46427: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46442: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46467: PUBLICAPI-80: "GET on a deleted Favorite answers a 500" 46476: Upgrade to OpenCMIS 0.8 46514: Initial implementation of WHERE clause functionality. (Likely to change a lot). 46518: PUBLICAPI-75: "Use a 'where' parameter to specify criteria for favorite result set content " 49157: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 48552: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1 48551: Fix for DEVOPS-2976 P1 - Solr nodes crash with tracking enabled + configuration fixes 48796: Merged BRANCHES/DEV/FEATURES/ACCOUNT_TYPES to BRANCHES/DEV/CLOUD1: 48092: Resolve CLOUD-1303: Add 2 new Account Types to Cloud 48325: Translations from Gloria 48445: Japanese: translation update from Gloria 48698: JA: Translation update from Gloria. 49130: Merged BRANCHES/DEV/CLOUD1-HOTFIX to BRANCHES/DEV/CLOUD1: 49120: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3 to BRANCHES/DEV/CLOUD1-HOTFIX: 49093: CLOUD-1518: "Favourite sites are not displayed correctly" 49110: CLOUD-1518: "Favourite sites are not displayed correctly": fix up PreferencesService to return correct site preference keys 49116: CLOUD-1518: "Favourite sites are not displayed correctly": favourite sites uses the favourites service rather thanpreferences service directly, making it and favourites consistent 49159: fixup pesky solrcore.properties 49197: Fix for Cloud AccountUsageQuotaTest - make action-executor node service mt aware (fallout from previous commit that now does a node existence check in action executor that needs to be mt aware) 49199: Fix tests 49241: CLOUD-1527 "Logo in Share footer is broken" - Added /res to make logo getting displayed when running in multi tenancy mode 49250: CLOUD-1527 "Logo in Share footer is broken" - Removed image dimensions to make image replaceable 49267: Fix tests: remove incorrect OpenCMIS jars 49272: Use newer patched version of chemistry-opencmis-server-bindings 49273: Removed extraneous chemistry library dependency 49293: CLOUD-1512 "SAML integration needs to override "CSRFPolicy" config" - Adding new (overridable) getPath() method in CSRFFilter 49315: Merged PATCHES/V4.1.4 to HEAD-QA 49236: Fixed MNT-8615 "Browser page is not reloaded after deleting folder/file or after creation content in Repository" 49301: Fixed MNT-8615 "Browser page is not reloaded after deleting folder/file or after creation content in Repository" part 2 49316: Merged PATCHES/V4.1.4 to HEAD-QA (RECORD ONLY) 48735: Fixed MNT-8506 & MNT-8507 * MNT-8506 "A server error has occurred when press Follow/Unfollow button from User Profile" * MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" * Instead of using Alfresco.util.Ajax.request and creating XHR requests forms were being submitted meaning the Alfresco-CSRFToken never got added. * Now refactored to use Alfresco.util.Ajax.request and post directly to the proxy, meaning the Share "services" now can be removed. 48812: MNT-8506 / MNT-8507: Fix up by Vasily to avoid YUI compression error 48813: Fixed MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" part 2 - variable used keyword "private", now refactored to "isPrivate" 49328: Fix up People script class so that it deals with access denied exceptions (this will hopefully fix failing PeopleRestApiTest in Cloud2) 49346: Fixed CLOUD-1532 "Test email signup page is brokebn due to new header" 49364: Fixed CLOUD-1524 "Unable to retrieve Google Docs subsystem status from Alfresco (re: googleEditable not defined ?)" 49373: CONV: Fix CLOUD-1524 / CLOUD-446 - disable GoogleDocsV1 subsystem and prevent deferred start (and associated error) when Share later calls explicit "status" webscript (to see that it is disabled) - revert 49364 and replace with alternative fix - see also similar IMAP status issue (CLOUD-1507) 49375: CONV: Fix CLOUD-1507 -fix IMAP subsystem to prevent deferred start (and associated error) when Share later calls explicit "status" webscript (to see that it is disabled) - see also similar GDocsV1 status issue (CLOUD-1524 / CLOUD-446) 49416: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 49303: CLOUD-1518: "Favourite sites are not displayed correctly": fix fallout 49418: CONV: Fix ALF-18698 - Core MT: "create tenant" ignores the tenant-specific root contentstore dir path (if specified) 49433: Fix for failing Cloud2 test https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD2HEADQA-JOB1-38/test/case/12496544 49491: CLOUD-1552 "The invite link icon in the new header's site title "area" points to the "on premise" invite page (which has been admin secured) instead of the invite dialog" - Improving extensibility by adding further widgets ids for header menu 49590: CLOUD-1556 "CloudConv: CLOUD2 does not start on DP: "Possible CSRF attack"" part 1 - Not a bug in the CSRFFIlter but an improvement that introduces a <properties> elements which may hold variables used by the CSRFPolicy config to avoid repetition and the possibility to only override the <properties> section in different environemnts, i.e. set different referer proxies in test & prod. 49758: Fix for CLOUD-1542, Google Docs action was missing from the action list in the document library. An action is still listed in the document-browse action group that has no definition, this was causing the web tier webscript to abort processing of any actions defined after it i.e. any custom actions. 49789: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49788: L10N update from Gloria, based on EN r48822 49801: Move CLOUD2 to HEAD-QA, as part of Alfresco One project 49806: Bring POM file back from CLOUD2 49807: Fix order of from/set/to lines in rules, to match schema validation. 49829: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49808: CLOUD-1615: CloudConv - Regression: CLONE: the info panel isn't wide enough to display the share link without a line break - Increased panel and image widths 49830: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49823: CLOUD-1609: CloudConv - Regression: DAM: Item header was moved (also incorrect color is using) for folders and files. - Added overrides and changes to gallery view to accomodate changed CSS in detail and simple view 49831: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49827: CLOUD-1610: CloudConv - Regression: DAM: More menu does not disappear after first opening more link - Fixed el passed in for onEventUnhighlightRow in fnHideDetailPanel - Also added hiding of more actions on mouseleave of more actions 49834: SVN ignore patterns - "test" folder. 49835: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA 49800: Fix to build.properties that got munged in rev 49209. Fix to share-header that was horribly merged to pull in code with dependencies that aren't present yet. Fix to login dialog width that hasn't made it over to this branch for some reason. 49872: Added name to logging of transformer registration 49885: CLOUD-1626: CloudConv - Regression: Networks are not displayed via WebDav. Reinstated code that was originally part of THOR1_SPRINTS (r34168) but was lost as part of convergence work. 49889: CLOUD-1669: upgrade jibx from 1.2.3 to 1.2.5 to allow full JDK7 support 49906: Merged BRANCHES/DEV/BELARUS/HEAD-QA-2013_04_22 to BRANCHES/DEV/HEAD-QA: 49794: ALF-18797 : SPP: Check out action doesn't work for Document Workspace Merged but with minor bug fix. 49908: CLOUD-1649: Added the missing network menu for the public users. 49916: Fix to User Factory bean setter to avoid: WARN [springframework.beans.GenericTypeAwarePropertyDescriptor] [main] Invalid JavaBean property 'userFactory' being accessed! Ambiguous write methods found next to actually used 49917: Merged SHOULDERS to HEAD-QA 48984: Minor UI fixes: - fix height of user status text-area to be consistent across browsers - fix hover style and font size of user status text-area - fix login dialog width since Cloud merge 49918: Fix for CLOUD-1571 - CloudConv - Regression: My Sites dashet isn't loaded 49919: Fix for CLOUD-1648 - CloudConv - regression: cloud2headqa is not localized in any language - code for the login language drop-down refactored to fit within login component rather than global function javascript - fixed to work since code convergence also 49920: Fix for CLOUD-1584 - CloudConv - Regression: Some dashlets should be absent on User/Site Dashboard - Disabled new dashlets (Site Search, Saved Search, My Discussions) because they are too exciting for the Cloud. 49921: CLOUD-1669 Switch -source and -target compilation parameters to 1.7 49923: Fix to 404 error on login page (visible in firebug etc.) Correct list of image dependencies. 49924: Fix for CLOUD-1629 - CloudConv - Regression: It's impossible to remove the Welcome Widget on Site Dashboard - encoding of preference values must handle "." dot character or it ends up as nested preference! 49927: Fix for CLOUD-1577 - CloudConv - regression:Incorrect display of status message 49928: Fix for CLOUD-1586 - CloudConv - regression:The user is redirected to login page after clicking 'Invite' button from Site members page - Button should be disabled on Cloud (redirect is because on-premise Invite page is admin only!) - but pattern to do so has changed since merge with 4.2. 49931: WebDAV: exclusive lock could be obtained when shared lock already in place. In addition, the invalid lock state that was produced then led to a stack overflow due to infinite loop. 49933: Added svn:ignore entires for build/pom.xml and root/privatemodules/thor/config/log4j.properties 49936: CLOUD-1600: CloudConv - regression: Cannot add a tag through inline edit option - Removed mandatory validator 49938: Merge V4.1-BUG-FIX to HEAD-QA 48904: BDE-109: generate coverage statistics from JaCoCo when running tests 48925: 3rd party classpath refers to available mysql-connector-java-5.1.13-bin.jar 49065: Limit coverage to org.alfresco classes, otherwise overhead is too big and tests too slow 49474: MNT-8668 Remove Maven declared dependency on addressing-1.0.mar 49655: BDE-109 new Ant task to generate JaCoCo report for test coverage 49941: CLOUD-1668: CloudConv - Regression: Incorrect displaying of default avatar on task section on document's details page - Fixed avatar link 49943: CLOUD-1661: CloudConv - Regression: progress bar is absent in Storage section on Account Summary page - Brought theme-bg-3, theme-bg-4, and theme-border-5 CSS over from greyTheme to lightTheme 49958: SpringSurf libs upgrade to r1257 Updated Cloud share config overrides to remove values that are now the default in Surf (e.g. reconnect-timeout etc.) 49965: Fix for CLOUD-1588 - CloudConv - Regression: "Download as Zip" option should be absent - remove the lovely new Download as Zip feature from Cloud as it is Officially Too Exciting. 49975: Fix for CLOUD-1663 - CloudConv - Regression: Search query containing wildcards is partially cut off on the results page (encoding is not being applied) 49977: CLOUD-1640: Fixed external user site member visibility issue. 50007: Fix to disallow change of own user role or removal in Site Member for the current user. 50011: Activiti schema reference files ignore table column ordering (testing CLOUD-1675) 50012: Reorganize repository database bootstrap beans to register scripts and patches with SchemaBootstrap (CLOUD-1675) - New Spring config file: alfresco/dbscripts/db-schema-context.xml - Split Repo, JPBM, AVM and Activiti scripts 50013: Update module properties to reflect latest Alfresco stack requirement and set version to 2.0 50014: Fixed CLOUD-1675: Upgrade failed from CLOUD1-BUG-FIX3 to HEAD-QA - Use module-friendly registration of create scripts - Note: Schema validation will report errors due to 2 Cloud-specific tables in the 'alf' schema namespace 50018: CLOUD-1568: CloudConv - regression:created/modified time is not displayed in Properties section - Added unit test for combining default controls where a new data type is added, which was failing - Fixed DefaultControlsConfigElement.combine method 50023: Fix for CLOUD-1578 - CloudConv - regression: Unable to join a site Fix for CLOUD-1579 - CloudConv - Regression: It's impossible to perform "Leave Site" action by Site Member from Site Dashboard 50027: BDE-150 Create RPMs for Cloud deployment 50028: ALF-18908: WebDAV litmus tests failing on HEAD-QA/CLOUD2 50032: CLOUD-1624: CloudConv - regression: Login button is missing on Quick Share page - Moved CSS loading to quickshare/header.get.html.ftl 50039: CLOUD-1626: networks not displayed via WebDAV (fix for PROPFIND) 50040: CLOUD-1637 / MNT-8462 "Post" button works incorrectly - Added check for response type of string to userStatusUpdateSuccess and userStatusUpdateFailure since it's already coming back as a JSON object 50047: Add missing dependency on java-property-utils-1.6 50048: BDE-150: fix RPMs 50051: Fix for CLOUD-1664 - CloudConv - Regression: New logo is not applied Fix for CLOUD-1580 - CloudConv - Regression: It's impossible to change the application theme - Fix to correctly handle "network admin" concept - manually allow the network admin to perform admin actions where appropriate - AFAIK this can never have worked correctly... remove nonsense runas=admin webscripts overrides that don't work anyway. - Clean up of related scripts. 50055: CLOUD-1607: filter sent-invites-min.js coming from Enterprise build, so that it gets overridden by the non-minimised cloud one 50070: Temporarily adding exploded Ant build for cloud2 environment. This now means the same steps for building a cloud1 environment can be used to build a cloud2 environment. NOTE: There is one outstanding licence issue to resolve that will be fixed in a subsequent commit. 50088: Remove unused or duplicate MyBatis config (CLOUD-1672) 50090: CLOUD-1672: CloudConv: MyBatis error when downloadCleanerJob is run - Cloud was duplicating the MyBatis configuration - Created Cloud-specific SQL templates - Tested using sign ups and general use but full account and tenant usage needs to be tested 50092: CLOUD-1591: CloudConv - Regression: Incorrect layout of "Link to Rule Set" page - Made the more specific rules-picker treeview width override lightTheme's overriding treeview width 50094: Fixes for exploded Ant build. 50097: Added ignore of projects/web-client/source/web/images/logo/alfresco_enterprise.gif which is apparently moved from elsewhere during some build step 50099: CLOUD-1614: CloudConv - Regression: Incorrect label "Start workflow" displays instead of "Create Task" - Added page.startWorkflow.title to cloud localization files 50101: BDE-154: upgrade urlrewritefilter to 4.0.4, avoiding compilation warning 50102: CLOUD-1602: CloudConv - Regression - Chrome specific: Close (X) button doesn't work on "Alfresco Cloud information" window - Removed committed minified about-share-min.js and ant touch command which kept it in place 50107: Merged HEAD-BUG-FIX to HEAD-QA (4.2) for CLOUD-1466: stop relying on a patched version of wss4j 49973: Merged DEV to HEAD-BUG-FIX (4.2) 49648: MNT-8652 Treat PasswordText as default for CMIS Web Service authentication (using patched version of wss4j) Execute PasswordTypeInterceptor before WSS4JInInterceptor to add PasswordText type as default if Password element misses it. Add system test for case. 50076: Follow-up on MNT-8652: rename CXFAuthenticationTest into CXFAuthenticationSystemTest, so that it is not executed in web-service-client tests, but only in system-build-test 50109: Fix to issue where application logo was resized and broke aspect ratio of uploaded image. Also changed size to valid for new header. 50113: Fix for CLOUD-1576 - CloudConv - Regression: Incorrect notification is displayed when Site Admin performs "Leave Site" action 50114: Fix for CLOUD-1662 - CloudConv - Regression: Incorrect behavior when searching with empty field - trim searchbox text before event publication 50116: Cleanup of copy/pasted files... 50117: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-QA 47811: ALF-18245 - BM-0013: Soak: Run 06: Search population of ScriptNode is expensive: Refactor Share search UI and REST API to provide server-side paging. 50122: MNT-8480 - cloud sync and revert 50126: BDE-150 Add build number as RPM release property 50150: Merged V4.1-BUG-FIX (4.1.5) to HEAD-QA (4.2) << MNT-8721 Security fix from 4.1.4.2 >> << Merge direct from V4.1-BUG-FIX rather than HEAD-BUG-FIX as r49633 was merged with a block of other changes >> 49633: Merged DEV to V4.1-BUG-FIX (4.1.5) 49574: MNT-8473: Share's workflow-details page exposes all workflow instances to everyone Introduce WorkflowPermissionInterceptor that check if current user allowed to perform operation. 49752: MNT-8473: Share's workflow-details page exposes all workflow instances to everyone Fix errors that were found during unit testing. 50153: ALF-18708: Merged V4.1-BUG-FIX to HEAD-QA << Security fix from 4.1.4.4 >> 50151: MNT-8866: Merge V4.1.4 (4.1.4.4) to V4.1-BUG-FIX (4.1.5) 49802: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request JSF phase listener, which cleans up security context for Alfresco Explorer requests. It is necessary for avoiding sharing of security context between Alfresco Explorer and CMIS services, based on OpenCMIS libraries 49803: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request Configuration part of the fix has been reversed 49804: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request JSF phase listener, which cleans up security context for Alfresco Explorer requests. It is necessary for avoiding sharing of security context between Alfresco Explorer and CMIS services, based on OpenCMIS libraries 50164: Merged V4.1-BUG-FIX to HEAD-QA << Priority for transformer.remote.alfresco. Includes JMX controls for the Transformers subsystem >> 49038: MNT-7158 Merge DEV to HEAD-BUF-FIX (4.2) - Addition of TransformerConfigMBeam (JMX bean) to control transformers dynamically - Transformer level config limits are now a default for mimetype specific values. Possible now that we don't have these in the Spring config. previously had been 'combined' which was not too clear. Also added system wide mimetype defaults. - All transformers are now 'known' to the content transformer registry - not just the ones that may be selected. i.e it knows about the component transformers. - TransformerSelector now round robins all equal priority transformers until they reach their thresholds, rather than doing so for each one in turn. 49135: MNT-7158 Investigating adding priorities to transformers - Changes to make it possible to check debugTransformer.txt output in 4.1.5 against 4.2 49190: MNT-7158 fix build failure testGetMaxSourceSizeKBytesPageSupports 49207: MNT-7158 Investigating adding priorities to transformers - Modified priorities so that it is now deterministic Try as sourceMimetype of 00 in JMX op getTransformationsByExtension to double check - Changed default priorities 5 and 10 to 50 and 100 for EXPLICIT and DEFAULT to give more room in the future - Combined transformer.complex.AdobeIllustrator.Image with transformer.complex.PDF.Image as they were the same except for the transformer settings - TransformerDebug now uses [---] as the priority for compound transformers - TransformerDebug now includes Component in the type of compound transformers e.g. fred<<ComplexCompound>> 49947: MNT-7158 Investigating adding priorities to transformers - Added limits based on use. So a limit may be set for "index", "doclib", "webpreview", "syncRule", "asyncRule" ... 49985: MNT-7158 Investigating adding priorities to transformers - Allow <tomcat>/shared/classes/alfresco-global.properties to be used in transformers. 50002: MNT-7158 Investigating adding priorities to transformers - Missing file 50061: MNT-7158 Investigating adding priorities to transformers - Set up remote transformations BinaryPassThrough.priority=20 remote.alfresco.priority=30 remoteServer.priority=40 50143: MNT-7158 Investigating adding priorities to transformers - Show default values in getProperties, comment out values set to defaults and add under line transformer name 50166: Merged V4.1-BUG-FIX to HEAD-QA << Two 4.1.4.4 hot fixes >> 50165: Merged V4.1-BUG-FIX (4.1.5) to HEAD-BUG-FIX (4.2) 50110: MNT-8844 - CSRFFilter disables https login 50158: MNT-8870: Merge V4.1.4 (4.1.4.4) to V4.1-BUG-FIX (4.1.5) 50120: MNT-8858: AJAX Servlet does not clean up security context after processing a request Modification for cleaning up security context after processing an AJAX request to 'org.alfresco.web.app.servlet.ajax.AjaxServlet' 50169: CLOUD-1641: Made people-finder to use CannedQuery rather than Solr. 50173: Fix for CLOUD-1587 - CloudConv - Regression: Advanced Search link should be unavailable. 50174: Fix for CLOUD-1608 - CloudConv - Regression: Changing roles of site members is displayed only after page refresh Fix for ALF-18534 - Changing roles of site members is displayed only after page refresh 50176: Fix for CLOUD-1592 - CloudConv - Regression: Content I'm Editing dashlet contains redundant info (about blogs, wiki, forum) 50177: CLOUD-1689: CloudConv - Regression:Networks are not displayed via SPP 50182: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before. Fix for clearing tenant user domain and authentication context after the Repository webscript is executed. Copied the TenantLeakLogger from CLOUD to HEAD into org.alfresco.web.app.servlet package. 50183: CLOUD-1606, CLOUD-1459: Fixed the permissions issue for the get preferences in the MailActionExecuter. 50184: Changed default Cloud Share Hazelcast config to empty IP list rather than promiscuous multicast - which was much too saucy! 50185: XSS attack hardening - incorrect use of ?js_string for safe HTML element IDs - should be ?html 50197: Code tidy 50200: ALF-18957: SchemaReferenceFileTest failing on Oracle Updated ACT schema-reference file for Oracle. 50203: Fix for CLOUD-1613 - CloudConv - Regression: CLONE: Under selected Item menu the manage permission should be hidden 50208: Fix CLOUD-1660 - CloudConv - Regression: Incorrect layout of tag icon on Search result page 50211: Fix to (unreported?) issue where Colleagues dashlet would not show the user status relative time - showed empty value in brackets () 50215: DEVOPS-3172, CLOUD-1701: cloud2/HEAD-QA unable to startup in DP environment. 50227: CLOUD-1612: CloudConv - Regression: Incorrect location of help icon for "Message" field on "Create Task" page - Moved rendering of help element - Added CSS for desired positioning 50245: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 50240: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-BUG-FIX: 50221: Merged DEV to V4.1-BUG-FIX (4.1.5) 50030: Attempt a workaround for MNT-8704: WebDAV:Content does not disappear after being deleted - Deprecate various methods related to the existing WebDAV use of sys:hidden - Put in a timer task on use of the sys:hidden aspect in WebDAV DeleteMethod 50093: MNT-8704: WebDAV:Content does not disappear after being deleted - "if (!fileFolderService.isHidden(nodeRef))" block was moved to deleteHackRunAs.doWork(). 50187: MNT-8704: added node existence check; unhiding node prior to deletion. As per Derek's comment: https://issues.alfresco.com/jira/browse/MNT-8704?focusedCommentId=227689&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-227689 50251: CLOUD-1702: Fixed NPE in WorkflowPermissionInterceptor, also fixed the issue that when the invitee tries to click on the link in the invitation email, 'org.alfresco.service.cmr.security.NoSuchPersonException' is thrown. 50298: Fixed the failing unit tests as a result of the newly added WorkflowPermissionInterceptor. 50306: Fix to merge causing ALF-18979 - Activiti servlet references on by default in web.xml Removed duplicated class now that the LoggerFilter is part of code webclient code 50311: MNT-8890: Commented the newly added method in TenantRepositoryContainer in order to fix the failing unit tests. 50318: Generate a jar of tests for alfresco-cloud, for consumption by QA tests later 50322: Fix for CLOUD-1657 - CloudConv - Regression: Admin section in the Header should be located in the user's menu having name "Account settings" 50335: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before. Fixed failing JUnit tests. Reverted 50311 revision. 50337: CLOUD-1699: Cloud example content thumbnails - some have the wrong width and look rubbish in doclib/search results - Added new versions of doclib for Data Sheets to sampleContent.acp - Added doclib and imgpreview for all content in sampleContent.acp except 'Alfresco Cloud Intro.mp4' 50345: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before. Fixed failing JUnit tests. 50352: Fix for CLOUD-1691 - Incorrect notification when leaving name field empty through inline edit - fixes the issues where; length validator not fired, order of validators wrong for cm:name inline editor, fixes issue where previously validation would still be shown on reedit of field after Cancel << hat tip to Mr Draper for validation solution 50353: Fix for CLOUD-1604 - CloudConv - regression: Links on "Oops page" should be highlited. - also removed duplicate messages and cleaned up message text from the late 90's. 50356: Fixed CLOUD-1697: URL rewrite filter upgrade causes additional logging 50357: Fixed the failing unit tests which were failing as a result of rev: 50335 commit. 50374: Revert r50182 and the subsequent changes made to fix the fallout: r50311, r50335, r50345, and r50357 50379: CLOUD-1669: update Eclipse JibX launchers with the upgraded JibX 1.2.5 jars 50390: Revert the part of r50306 that updated enterprise-web-scripts-application-context.xml and deleted TenantLeakLogger.java. This was necessary following the reverts that took place at r50374. 50396: Corrected name of content transform test class file. 50397: Added new "transform" folder (which should have been there before) 50398: Move content transform test class file into the new "transform" folder. 50401: - Added two Eclipse projects: one for the thor private module ("Alfresco Cloud") and one for its dependencies ("Cloud Dependencies"). - Turned the JiBX builder on by default in the data-model project. 50410: MNT-8890: split classpath when executing JUnit tests in Ant, so that repository tests do not get classes of upstream projects 50411: MNT-8890 follow-up - make enterprise repository tests run with a reduced classpath too, otherwise EntRepoCacheStopTest fails - add wdrdeployment classes to reduced classpath, otherwise enterprise tests cannot find alfresco/bootstrap/deployedSpace.xml 50416: Removed unused component (no longer required in 4.2 so the override isn't required) 50417: Dialog styling tweaks 50422: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/HEAD-QA 50409: Fix for CLOUD-1721 50473: CLOUD-1726 CLOUD-1732: move tests CMISChangeLogServiceTest and SubsystemsTest from repository to remote-api, because they depend on resources in remote-api (follow-up of MNT-8890) 50474: CLOUD-1736 Shouldn't have tweaked the classpath of system-build-test, since it already has its own (follow-up of MNT-8890) 50479: ALF-18927: SPP: Incorrect information is displayed on Event Information window for yearly recurrect event BYMONTHDAY shouldn't be deleted for YEARLY recurrence. Also setting interval was not accurate. 50480: ALF-18927: SPP: Incorrect information is displayed on Event Information window for yearly recurrect event Additional check in. 50485: Fixes ALF-18702: Corrected the logic for how tenant switching is achieved so that both Enterprise and Cloud scenarios are catered for. 50495: Fix for ALF-18981 - Non-ASCII characters are not displayed in Share interface correctly - Fix to deal with issue where a valid JSON result string is not always valid JavaScript text e.g. some unicode characters etc. 50498: svn ignore patterns 50499: files should not be in svn 50500: remove eclipse folder settings from svn 50505: Fix to (unreported?) search results paging issue - merge error meant that only the first page of results would ever be returned no matter what page was selected, but who goes past the first page anyway eh? 50516: CLOUD-1718: "CloudConv - Regression:"Imap Attachments" and "IMAP Home" folders are displayed via CMIS Workbench client" 50517: CLOUD-1727: CloudConv - Regression - WebDav: The mapped network drive could not be created on Windows This was broken by MNT-2823. 50524: CLOUD-1665: New accounts are not available for CLOUD2 Manually merged revision 48796 as it was mistakenly marked as merged. 50525: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50033: (RECORD ONLY) Merge HEAD-QA to CLOUD1 (for BDE-109: generate coverage on unit tests) Merge V4.1-BUG-FIX to HEAD-QA 48904: BDE-109: generate coverage statistics from JaCoCo when running tests 48925: 3rd party classpath refers to available mysql-connector-java-5.1.13-bin.jar 49065: Limit coverage to org.alfresco classes, otherwise overhead is too big and tests too slow 49474: MNT-8668 Remove Maven declared dependency on addressing-1.0.mar 49655: BDE-109 new Ant task to generate JaCoCo report for test coverage 50582: Removed and ignored .classpath and .project 50614: CLOUD-1713 append the Cloud build number after the Enterprise build number, as in: r50345-b65-c129 Upgrade a few Maven plugins 50649: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50083: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3 to BRANCHES/DEV/CLOUD1: 49357: New Cloud Bug Fix Branch 49363: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 46487: Fixes CLOUD-1293: "Other" included in total activities count. Refactor activity groupings. 46488: Fixes: CLOUD-1310: Adds "no-wrap" to last element to that the second link all appears on the same line. 46493: Fixes: CLOUD-1229: Removes max-width CSS constraint so that table cells can expand to find room for long transltions. 46535: PUBLICAPI-63: "Unable to list comments associated to a document : Malformated comment object ?": fix + tests 46555: PUBLICAPI-90: "You can not remove yourself from a site using the -me- identifier" 46826: Fix for CLOUD-1368 - Tomcat thread blocking during concurrent user testing causing service to become unresponsive. 47249: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower stores 47681: Merged HEAD to CLOUD1-BUG-FIX2 47448,47484,47504,47518,47552 47865: GERMAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47866: FRENCH: Latest translation updates, based on EN r46485 & including fixes from check report. 47867: SPANISH: Latest translation updates, based on EN r46485 & including fixes from check report. 47868: ITALIAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47869: JAPANESE: Latest translation updates, based on EN r46485 & including fixes from check report. 47885: ALL LANG: Minor update to translations to bring them in line with EN r47485 48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite. 48402: CLOUD-1458: Remove inadvertently added test class 48561: CLOUD-1458, CLOUD-1459, CLOUD-1479, CLOUD-1485 - Fix MailActionExecuter to correctly resolve primary domain for sender and recipients. 47249: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower stores 47681: Merged HEAD to CLOUD1-BUG-FIX2 47448,47484,47504,47518,47552 47865: GERMAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47866: FRENCH: Latest translation updates, based on EN r46485 & including fixes from check report. 47867: SPANISH: Latest translation updates, based on EN r46485 & including fixes from check report. 47868: ITALIAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47869: JAPANESE: Latest translation updates, based on EN r46485 & including fixes from check report. 47885: ALL LANG: Minor update to translations to bring them in line with EN r47485 48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite. 48402: CLOUD-1458: Remove inadvertently added test class 48561: CLOUD-1458, CLOUD-1459, CLOUD-1479, CLOUD-1485 - Fix MailActionExecuter to correctly resolve primary domain for sender and recipients. 49371: PUBLICAPI-166: "Unable to upload large file on Cloud (> 5MB)" 49389: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 49295: CLOUD-1529: Made SessionIndex optional in the SSO response. Also commented out 'autoProvisionEnabled' and 'alfrescoLoginCredentialEnabled' from the SAMLConfigSettings as they are not implemented yet. 49406: CLOUD-1488: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3 (Also added the missing elements from the merge): ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 43252: MNT-166: Document lock not removed after the lock expiry date has been reached - Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator. 43253: MNT-165: "Cancel Editing" does not completely remove lock from document - Added documentLibrary cancel editing action for locked documents. 43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified) 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document. 43311: MNT-165: "Cancel Editing" does not completely remove lock from document - Fix for page refresh problem when cancel editing on details page 43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files - Change evaluator.doclib.metadata.isLocked to break circular dependency 43755: MNT-202: Upload New Version not available for a document that has been edited offline - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc). 49463: CLOUD-1510 - Cache remote transformation calls to isTransformable - Make TransformationOptions serializable - Expose ehcache statistics and configuration, via JMX 49492: CLOUD-1510 - Fix broken unit test 49631: CLOUD-1455: "Hide activity in a site from the activity feed" 49662: CLOUD-1455: "Hide activity in a site from the activity feed": fix broken unit test 49759: Merged BRANCHES/DEV/HEAD-QA to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 49758: Fix for CLOUD-1542, Google Docs action was missing from the action list in the document library. 49814: CLOUD-1455: "Hide activity in a site from the activity feed" 49866: CLOUD-1597: Added the missing evaluators. 49948: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 49880: Update Google Docs integration from 2.0.2 to 2.0.3. 50045: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 50043: Update 2.0.3 AMPs 50686: GERMAN: Latest translations and updates based on EN rev49789. Jira fixes: MNT-7526, ALF-18650, ALF-18523, ALF-18521, ALF-18255, ALF-18069 50689: SPANISH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50691: FRENCH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50693: ITALIAN: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50694: JAPANESE: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50695: DUTCH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50696: RUSSIAN: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255, ALF-18504, ALF-18503, ALF-18502, ALF-17793 50699: CHINESE: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255, MNT-8874, MNT-8874, MNT-8874 50709: CLOUD-1699: Cloud example content thumbnails - some have the wrong width and look rubbish in doclib/search results - Fixed imgpreview for Alfresco Mobile.pdf 50711: Merged DEV to HEAD-QA (4.2.0) 50482: ALF-18996 : Upgrade from 3.4.12 to 4.2.0 fails: ERROR [domain.schema.SchemaBootstrap] [localhost-startStop-1] Statement execution failed: SQL: ALTER TABLE ACT_RU_TASK MODIFY ASSIGNEE_ VARCHAR(255) Error: Table 'alfupg.ACT_RU_TASK' doesn't exist - Correctly handle activiti tables creation/upgrade when performing upgrade from 3.4.x. 50728: CLOUD-1754 do not fail the build as soon as tests fail: we are now quarantining tests in Bamboo, so installers need to be built regardless 50755: Merged HEAD-BUG-FIX to HEAD-QA 50754: Merged V4.1-BUG-FIX (4.1.6) to HEAD-BUG-FIX 50753: Merged DEV to V4.1-BUG-FIX (4.1.6) 50727: MNT-3368: BM-0013: Soak: Run 08: OnPremiseSyncPullJob runs without a transaction - Add transactions. 50750: MNT-3368: BM-0013: Soak: Run 08: OnPremiseSyncPullJob runs without a transaction - Correction for 'readOnly' parameter. 50759: Merged BRANCHES/DEV/JAMAL/Fast_Test into HEAD-QA (CLOUD-1680: Make thor tests run blazingly fast) 50635: CLOUD-1680: Make thor tests run blazingly fast. 50684: CLOUD-1680: Regouped a few of the public api tests. 50688: CLOUD-1680: Regouped a few of the public api tests. 50706: CLOUD-1680: Moved the excludedGroups from the parent pom to thor. Also grouped the webdav tests. 50710: CLOUD-1680: Deleted the un-necessary junit category. 50773: Fixing up the tests to separate out the cloud tests. MailActionExecuter should now get the locale correctly. 50779: Redundant file 50780: Redundant File 50782: Redundant File 50783: Fixed missing double quote 50784: Missed strings included 50785: Missed key included 50795: ALF-19035 - MT Cloud Policies run with inconsistent "short" base and "full" node refs. 50823: ALF-17548: Disable Google Docs v1 integration * MBean controlling the subsystem has been removed (commented out) from bootstrap-context.xml * Admin console web script org/alfresco/components/console/repository/google-docs.get has been removed * Admin console form config has been deleted from share-form-config.xml * No changes have been made to the installer, as I could find no evidence that the configuration of the v1 subsystem was being changed by it * Note: The subsystem property 'googledocs.googleeditable.enabled' was already set to false. 50825: ALF-17548: Fix status web script which assumed the presence of the Google Docs v1 MBean removed in r50823. Now the web script returns enabled: false if the bean is not present. 50827: CLOUD-1600: CloudConv - regression: Cannot add a tag through inline edit option - Added ignoreEmpty argument to accommodate changes in r50352 50831: CLOUD-1770: Redundant Perform Action ("Embed properties as metadata in content") is displayed for Content Rules - Moved embedder action to sample file since we don't supply any embedders out-of-the-box 50833: CLOUD-1770: Redundant Perform Action ("Embed properties as metadata in content") is displayed for Content Rules - Programmatically created executer rather than loading from context 50838: Cloud: Patch overrides - Moved live patches to 'module-schema-context.xml' ('patch.redeployProcessesWithReminders2' and 'patch.redeployProcessesWithReminders3') - No Sample Web Site in Cloud: (CLOUD-1480) Created no-op patch for 'patch.siteLoadPatch.swsdp' - IMAP is disabled in Cloud: (CLOUD-1743): Created no-op patch for 'patch.imapFolders' 50839: ALF-18702: Tenant isn't able to log in Share once another tenant has logged in before Following review, added logic in AuthenticationServiceImpl.authenticate that is similar to AuthenticationServiceImpl.validate in order to handle case where the tenant is determined by the requested URI 50851: First part of fix for ALF-19052. 50853: ALF-18096: Integrate document security AMP files from the Alfresco Mobile iOS 1.5 project * New aspect dp:restrictable * Form configuration for properties provided by this aspect * Note: As detailed on the ticket the source files have been copied into the repository and slingshot project and mofified there. 50864: Fix for CLOUD-1769 CloudConv - Admin section in header menu instead of Account Settings are available for free account user 50879: ALF-18914 : SPP: It's possible to create meeting with empty subject field linking to an existing workspace Added a check for an empty subject when creating a meeting from iCal. 50922: Revert r50853 mistakenly adding Mobile project dp:restricted aspect to HEAD-QA 50925: CLOUD-1759: Fixed most of the Sonar ‘Critical’ violations. 50937: CloudConv - Regression - CLONE - No notification is displayed when performing "Leave Site" action 50938: Added Cloud override to remove MyFiles and Shared links from toolbar 50941: Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username and CLOUD-1778 CloudConv:in people search first name and last name people search always return zero results 50942: Fix for CLOUD-1741 - CloudConv: User should be redirected to Alfresco Cloud Documentation instead of Alfresco Community 4.2 Documentation. Comical spelling error in config. 50945: GERMAN: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 50946: FRENCH: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50947: SPANISH: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50948: ITALIAN: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50949: JAPANESE: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50957: Fix for CLOUD-1623 Unfriendly warning appears when user try to create private site with the same URL 50960: CLOUD-1772: Configuration files have been localized - Removed all pointlessly translated configuration files 50961: MNT-8480 : New web script for delete audit entry. 50968: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50624: (RECORD ONLY) Delete generation of installers in continuous, to allow 'amber' builds 50973: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50568: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1 50423: Merged PATCHES/V4.1.1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44130: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap Merged PATCHES/V4.1.4 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes 50622: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50664: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50976: CLOUD-1634: CloudConv - regression: Upload form is not closed automatically after upload limit error occurs - Added Javascript to hide upload status and show upload control again 50992: Changing the modifiers for the "addAuthorityNameIfMatches" methods from "private" to "protected" to allow the RM module do RM specific changes without copying a lot of the existing code. 50993: Fix for ALF-18850 - Incorrect label "page.ruleEdit.title" on New Rule page from Repository Browser 51031: CLOUD-1761: Activity is not generated when deleting document via SPP/WebDAV - fix part 1 This is the first part of a fix: activities were not being raised due to MNT-181 fix. This is now fixed. However, the posts are not being processed properly, which also needs fixing. 51083: Fixed the failing test (testHasSite) 51085: First part of fix for CLOUD-1787 51091: CLOUD-446: Remove 'overridden' googledocs subsystem bean from Cloud override context, which was causing the subsystem to start up still 51092: Fix to URLRewrite config rule to correct escape UTF-8 characters either side of the detected '@' character when rewriting URLs where browsers have not correctly dealt with the @ character. 51097: Updated BG for ludicrous screen resolution CLOUD-1795 51098: Fix for CLOUD-1795 - Login dialog centre on window resize 51103: Fix for CLOUD-1796 CloudConv:-Search pagination to other pages no results are shown 51105: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 51104: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-BUG-FIX: 51101: MNT-8704: node was not being unhidden (thread local client marker needed setting) 51107: Improvements to search result list handling - only populate node result structures for the items that are going to be returned. 51140: Minor tweaks to search processing hand merged from 4.1.N 51163: JAPANESE: Fix for CLOUD-1799 51170: ALF-18074 add a new flag to enable clustering. 51184: Make cloud tests depend on repository test resources, to be able to reuse them 51234: CLOUD-1800: Made the Rules to be executed asynchronously in the cloud by overriding “rule-edit.js”. 51245: Merged BRANCHES/DEV/HEAD42-MERGE to BRANCHES/DEV/HEAD-QA 51230: Addition of a modified YUI Compressor ANT task to speed up the minimize-slingshot-deployed-javascript build step - from around 3 mins on most machines down to 3 secs. w00t AND THIS IS THE RESULT: ant clean incremental-webclient-tomcat-exploded incremental-slingshot-tomcat-exploded ... BUILD SUCCESSFUL Total time: 1 minute 18 seconds 51248: Merged HEAD-BUG-FIX to HEAD-QA 51247: Merged V4.1-BUG-FIX to HEAD-BUG-FIX (RECORD ONLY) 51246 (RECORD ONLY): Merged PATCHES/V4.1.5 to V4.1-BUG-FIX 51233: MNT-8129: NPE - Servlet.service() - getGlobalConfig for "webClientConfigService" Missing JGroups messages receiver has been added to handle cluster messages correctly. Port range default value has been increased to add some slack around required ports 50999 (PARTIAL RECORD ONLY): Better logging for AsynchronouslyRefreshedCache (MNT-8129) 51273: Partial fix for CLOUD-1806. This checkin fixes serialisation of TransformationSourceOptions objects. A subsequent check-in will fix deserialisation. 51275: Fixed CLOUD-1804 51279: Allow calls to NodeDAO.getParentAssocs to succeed for deleted nodes - The error message reported is incorrect. Previously, no calls were made to the DAO to retrieve details for deleted nodes. There was therefore an assumption that the node had been internally referenced and that this represented an error. This is no longer the case (nor has it been for a some time). - In this case, the SOLR tracking attempts to get the parent associations for all nodes, regardless of their state of deletion. - CLOUD-1807: CloudConv: I get the following error in the solr nodes "Detected stale node entry: NodeVersionKey" - MNT-9072: SOLR tracking can be delayed by node deletion 51291: JobLockService.releaseLock is not optimistic - AcquireLockException is no longer thrown if the lock token is invalid - releaseLock returns a boolean to indicate whether the lock was removed or whether it was already gone - Prevents unnecessary retrying withing JobLockService implementation (ALF-19098) 51292: Fix thread safety in PostLookup w.r.t. job lock state; general logging improvements (ALF-19098) 51293: Fix build after rev 51291 (ALF-19098): JobLockService.releaseLock is now optimistic 51305: Remainder of fix for CLOUD-1806. RemoteAlfrescoTransformer is unable to serialize transformation options as JSON. This check-in just changes Jackson configuration to handle the new TransformationSourceOptions which are now part of TransformationOptions. As this field needs to be JSON serialised along with its containing TransformationOptions instance - and particularly because TransformationSourceOptions is not a concrete type - we need extra Jackson config in order to correctly marshall and unmarshall the actual concrete types of any instances of TransformationSourceOptions. 51307: Slight tidy-up of fix for CLOUD-1806. I had specified some Jackson config in 3 subclasses and didn't need it as it was already configured on a base type. 51315: Fix on HEAD-QA only for ALF-19101, which I believe may affect CLOUD-1806. A typo in a TransformationSourceOptions method breaks the JavaBeans contract and imperils the JSON serialisation needed for CLOUD-1806. I think the method with the typo has been published (in 4.1?) so rather than rename it, I've deprecated it and added a new one with the correct spelling. 51350: Preparatory work for fixing CLOUD-1754. MailActionExecuterTest failing. It has been very difficult to get reliable test feedback on dealing with the MailActionExecuter. This is largely because of the difference in the way mail actions are handled in cloud and on enterprise. Therefore I have refactored and extended our test code to support fixing the MailActionExecuter. Part 1: Refactor the JUnit Rules AlfrescoPeople, AlfrescoPerson, AlfrescoTenant so that when a test is run in Community, Enterprise or Cloud the test 'does the right thing' when creating/tearing down test users. i.e. On Community/Enterprise, create the user/auth and the person on the single tenant. In Cloud create the user in system tenant, create the person in their home tenant, precreating the tenant if necessary and tear the whole thing down again. I achieved this by having the cm:person-related rules delegate to a spring bean responsible for dealing with test users. Then I've got a mechanism to let Enterprise override Community and Cloud override Enterprise. So the Community 'TestUserComponent' just creates/deletes users. Enterprise 'inherits' this behaviour. The Cloud TestUserComponent deals with the tenant sideshow. It's all started in the global-integration-test-context.xml. 51351: Adding the JIRA number for BDE-173 into this file. 51353: Fixing some test fallout from pervious commit (51350) which was part of preparatory work for fixing CLOUD-1754. Looks like the SyncAudit tests were using ApplicationContextHelper's getApplicationContext method having already started a custom app context? 51371: Merged BRANCHES/DEV/HEAD42-MERGE to BRANCHES/DEV/HEAD-QA 51277: Fix for ALF-18948 - Share Hazelcast cluster configuration change required in 4.2 51313: Minor css improvements to search box 51367: Fixed order of button styles for lightTheme overrides 51368: Fix to broken css file - erroneous end comment marker 51370: Fix for CLOUD-1795 - Login screen isn't resizing to display window 51406: CLOUD-1573: CloudConv - regression:Preview is not displayed for locked document - Added check for presence of container element before attempting setup of document versions data table 51407: Fix for CLOUD-1754. MailActionExecuterTest test failing. The code in MailActionExecuter needs some refactoring. As it was, validation of the mail recipients (are they usernames? email addresses? do the users exist? etc) are not the same for the to-many parameter as they are for the 'to' parameter. There are various other inconsistencies in the code also. I have tried to fix the cases where the inconsistencies are obvious and I've tried to imporove the test coverage too. This code has now become a little too complex and a future JIRA will lead to simplification. Currently the priority is to complete code convergence. 51410: Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found - cloud queries for people use all a users domains (OK until we partition by tenant) Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username 51422: Partial revert of r51410 where accountService was apparently added to the wrong bean definition 51424: Correct wire up for R 51410 related to Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found - cloud queries for people use all a users domains (OK until we partition by tenant) Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username 51429: CLOUD-1641: User from other domain cannot be found Removing previous fix for CLOUD-1641, the back-end should decide the best route to go depending on the parameters provided. Forcing the query to use a canned query has caused CLOUD-1768. 51444: Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property - ignore tenant filter for cloud people query and rely on post query visibility filtering (to see people from other tenants invited in) 51466: Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property - exclude permission evaluation when searching for people in the cloud (covered by the visibility stuff) 51553: CLOUD-1780: CloudConv :- follow button is visible for external user as well - Refactored customizations for new dependency loading to fix order of loading - Refactored widget userHomeTenant option addition for new instantiation pattern - Refactored override of widget's _renderFollowingActions method with new CloudPeopleFinder object that extends PeopleFinder 51571: Merged HEAD-BUG-FIX to HEAD-QA 51473: Moved CacheTest back into Repository Note for Cluster features: This change no longer relies on any distributed caches and therefore the new files should just stay as they are and the old ones removed. 51583: Merged HEAD-BUG-FIX to HEAD-QA 51477 Merged V4.1-BUG-FIX to HEAD-BUG-FIX 50995: Support for locking and unlocking of values in the TransactionalCache - Infrastructure for MNT-8997: Support definitive writes for TransactionalCache - Allows a definitive write (put or remove) call to be made to the TransactionalCache 51584: Merged HEAD-BUG-FIX to HEAD-QA 51478: Merged V4.1-BUG-FIX to HEAD-BUG-FIX 50997: Make use of TransactionalCache's locking ability - MNT-8997: Support definitive writes for TransactionalCache - PersonServiceImpl and AuthorityDaoImpl both do cache modificiations in 'beforeXYZ' callbacks, which leaves room for further attempted cache updates by other callbacks. Reapplied the fixes using TransactionalCache locks 51327: Fix CLOUD-1698 Intermittent invite test failures - Uses MNT-8997: Support transactional locking for Authentication Cache removal 51635: CLOUD-1812 Fix invalid license issue: modify version.properties to have version.label=Cloud and version.edition=Enterprise 51739: Merged HEAD-BUG-FIX (4.2) to HEAD-QA << Low risk change to avoid NPE found testing remote alfresco transformation nodes in DP env >> 51738: Merged V4.1-BUG-FIX (4.1.6) to HEAD-BUG-FIX (4.2) 51731: Avoid NPE in ContentServiceImpl.debugActiveTransformers(). Relates to MNT-7158 Investigating adding priorities to transformers 51752: CLOUD-1812 Fix version.label to simply add a '-Cloud' suffix. 51753: CLOUD-1822 Change RPM installation folder from tomcat6 to tomcat7 51760: CLOUD-1385: "Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream" - CMIS was not correctly parsing the mime type header 51779: Depend on Spring Surf 1.2.0-M6 (r1265) rather than a SNAPSHOT version 51780: Depend on Spring Surf 1.2.0-M6 (r1265) rather than a SNAPSHOT version 51783: Merged HEAD to BRANCHES/DEV/HEAD-QA (RECORD ONLY) 49055: ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files Modify HiddenAspect to hide node with explicit='false' by default. 49062: ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files Revert changes that were mistakenly committed. Rolled back to r49054 49075: Merged BRANCHES/DEV/HEAD-QA to HEAD: 49074: ALF-18573: exclude module-context.xml from alfresco-spp-config.jar 49245: Merged HEAD-QA to HEAD (RECORD ONLY) 49244: Switch version of mvninstall to 4.2.0-QA-SNAPSHOT 49442: CLOUD-1541: "CloudConv: REGRESS - can't connect to cmisatom on HEAD (works on HEAD-QA)": spurious chemistry library appeared 49599: CLOUD-1541: "CloudConv: REGRESS - can't connect to cmisatom on HEAD (works on HEAD-QA)": spurious chemistry library appeared 49980: Merged BRANCHES/DEV/HEAD-QA to HEAD: 49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX: 49111: - Revert of r47645 - Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD - Relates to ALF-5051 and MNT-8599 / ALF-18726 49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984 49979: ALF-18726: Alfresco could not start with WCMQS applied - Updated RenditionServiceIntegrationTest with new imgpreview values 51793: Increase size of in-transaction "nodeOwnerCache" to 40K items. 51819: CLOUD-1385: "Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream" - add further tests not covered by original fix 51836: TenantUtil now gives a bit more information when exceptions pass through (CLOUD-1685) 51837: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 51502: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1: 50389: Created branch for Cloud1 Security Release 50395: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIXSF to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 49713: Branch for SalesForce bug fix merges 49718: Fix for CLOUD-1590 - Session fixation on Cloud specific login page 49721: CLOUD-1589 Protect Login-page against XSS Cross-Site Scripting attacks 50320: CLOUD-1653: Improve password strength * Password length constraint previously contained in client-side files has now been removed and is now loaded from the 'Users' scoped config * Minimum password length is increased to 8 characters from 6 previously * The length requirement has been augmented with restrictions on the content, contained in a <password-content> element - A minimum number of uppercase, lowercase, numeric and special characters can be specified - The system-wide default is zero for these new restrictions (i.e. no restrictions) * Alongside the existing <users> element, <network-users> allows the password length or content policies to be tightened for specific networks - Example config is provided in cloud-config.xml showing showing how to do this * Cleaned up existing validation messages and added a custom message based on the content restrictions, where this is configured - Due to ALF-18975 the message appears with raw HTML visible for now * IMPORTANT NOTE: No checking of submitted password values takes place (as before). Users can by-pass the length and content checks by mimiking the web browser themselves. - It is not feasible to add this as part of this work unit, since there are multiple form targets in use, some of which are in the repository. There are no password policies defined in the repository, so these would need adding. 50358: CLOUD-1707: Regress: Copyright logo is incorrectly encoded on Login and My Dashboard pages for French locale 50408: CLOUD-1468: Red bar in Tasks "error loading items". 50409: Fix for CLOUD-1721 50413: Merge of rev 50185 - XSS attack hardening - incorrect use of ?js_string for safe HTML element IDs - should be ?html 50576: Merged alfresco/BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIXSF to alfresco/BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 50518: ALF-19012: Form validation messages shown in Bubble widgets are not consistent with the input title attribute value 50574: ALF-18975: HTML in forms validation messages appears as raw HTML in the UI * HTML messages added via Alfresco.forms.Form.addValidation() method no longer escape HTML entities in validation messages presented to the user * The 'message' parameter in addValidation() can now be an object with separate 'html' and 'text' properties. Not all methods of displaying messages to the user support HTML. - If no separate HTML and text values are supplied, the message is assumed to be HTML and is converted to text by removing HTML elements via a regexp 50575: CLOUD-1653: Supply separate HTML and text validation messages for password content validation failures, since HTML cannot always be displayed 50577: CLOUD-1653: Use separate HTML and text validation messages for Reset Password and Account Completion pages 50731: CLOUD-1722: Apply config for Aetna specific password policy. 50745: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 50622: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50664: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50748: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 50568: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1 50423: Merged PATCHES/V4.1.1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44130: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap Merged PATCHES/V4.1.4 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes 50624: (RECORD ONLY) Delete generation of installers in continuous, to allow 'amber' builds 50869: CLOUD-1773: Cloud1Security branch build8. User cannot create site 50872: CLOUD-1653: Ensure password policy is always loaded based on home network, rather than the current context, which could be different. 51156: CLOUD-1653: Add global flag to regexps to ensure that the number of digits and symbols is correctly counted 51175: CLOUD-1682: "Hidden File Rename is Broken": fix and make sure the hidden aspect tests run as part of the build 51183: CLOUD-1682: "Hidden File Rename is Broken": fix up test suite 51187: CLOUD-1682: "Hidden File Rename is Broken": try again 51349: CLOUD-1682: "Hidden File Rename is Broken": further tests, deal with hidden aspect manipulation by clients during rename 51383: CLOUD-1682: "Hidden File Rename is Broken": deal properly with all client controlled hidden aspect cases 51843: CLOUD-1815: OPTIONS request for force.com not returning 200 Removed comment around publicapi URL pattern for CORS filter. 51845: Fixed ALF-19128: Artifact alfresco-repository-*-config.jar contains test files and configuration - Move test files into test-resources 51853: ALF-9096 - CLOUD-1825: Fixed issue with ordering of TransactionSynchronizationAdapter when Activiti job fails 51859: Merged PATCHES/V4.1.4 to HEAD-QA (REMERGE) 47738: ALF-18301 (now MNT-6342): ... NPE ... when debug logging for '...AbstractAsynchronouslyRefreshedCache' Merge note: The fix was not present even though it went to HEAD on 8 March (rev 47807) 51889: Upgrade Spring Surf to 1.2.0-M7 (r1274) 51893: Removed old Activiti libraries that were conflicting with new ones and causing compilation failure. 51895: Merge HEAD-BUG-FIX to HEAD-QA (4.2) 50984: BDE-103: Switch joda-time dependency to core 51896: Upgrade activiti to 5.11-alf-20130627 in POM for Cloud git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@51909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-07-01 09:35:59 +00:00
Jan Vonka	8f365b6a74	Merged BRANCHES/DEV/CONV_HEAD to HEAD: ... 48194: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47179: (RECORD ONLY) Rename Spring Surf libs back to 1.2.0-SNAPSHOT (reverting commit 47176) 47182: (RECORD ONLY) Fix misnamed Surf lib 48195: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - alreasdy on HEAD and superceded later) 47210: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 36760: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36758: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file 36768: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36766: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36712: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS 36692: Fix ALF-12966 - Comments doesn't work on iOS Safari. Anywhere TinyMCE is present does not work correctly e.g. comments, blogs, wiki, HTML content creation. 48197: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47214: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 36791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36790: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36776: Merged HEAD to THOR1_SPRINTS 36771: Fixed ALF-14239 "Share rules config misread by rules rule conditions ("When")" 36862: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36860: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36857: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 36187: Merged DEV to V3.4-BUG-FIX 36121: ALF-234: There is no field restriction at the New Rule form in Share 'maxlength="1024"' parameter has been added to title and description fields in 'rule-edit.get.html.ftl' 36858: Resolve THOR-1431: Create Rule: Fields Name and Description can contain more than 1024 and can contain wildcards 36939: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36656: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36655: THOR-1427: failures while uploading documents 36927: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36925: Resolve THOR-1433: Updated rule works just after upload (no update needed) 36933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36932: Resolve THOR-1442: Check in rule prevents working copy editing 36934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36882: THOR-1424: WebDAV via HTML/browser view: "Up a level" link does not work if at the network level 36936: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36935: Resolve THOR-1445: Preview generation for pdf and office files with size larger than ~1.2Mb fails 36938: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36701: Merged from V4.0-BUG-FIX to THOR1_SPRINTS 36698 Fixed bug where WebPreviewer sometimes isn't aligned with the rest of the document details page 36789: Resolve THOR-1438: Incorrect list of mimetypes in the rules 37003: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 37002: Resolve THOR-1436: Remove Beta Logo / Label 48199: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47274: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 37681: Fix build issue - merge error 47275: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 38401: Fix activities feed mail notifications. 47276: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test patches run against tenants no longer concatenate the patch report from each tenant 38754: Fix test 48200: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47303: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully 48203: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47358: Fix merge/test error (PatchTest.testSimplePatchSuccess) 48244: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY) 47172: Merged DEV/CLOUD2 to DEV/CONV_V413 36067: Fix merge issue 36068: Fix document actions page when no repository view 36084: Fix date rendering merge issues 36086: Fix client resources merge issue 48245: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47225: Merged DEV/CLOUD2 to DEV/CONV_V413 36117: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35994: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34517: Prevent 304 revalidations for unchanged thumbnails in document library, web preview and search 34607: Ensure folders created containing "#" don't send document library into infinite loop. 34615: Performance improvement: prevent unecessary 304 revalidation for user avatar thumbnails in header WebScript 34638: Performance improvement: prevent unnecessary 304 revalidation for avatars in activity feeds 34639: Performance improvement: prevent unnecessary 304 revalidation for avatars on following/follwers pages 34658: Performance improvement: prevent unnecessary 304 revalidation for avatars on site colleagues dashlet 34661: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS 34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly - respect short property names on sort requests @cm:created and not require the full @{uri...}created 34662: Refactored revalidation code to remove previously added WebScripts that are now surplus to requirements 34668: Fix build break 34680: Fixed bean config problem (caused by r34662) 34684: Performance improvement: prevent unnecessary 304 revalidation requests for thumbnails in detailed view of My-Documents and Recently Modified Documents dashlets 34701: Further refactoring of 304 revalidation code to ensure backwards compatibility 34723: Fix build break 36003: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34895: Resolve THOR-1251: Text for Site URL field on Create Site Form Wrong 34897: Resolve THOR-1250: Text on Accept Invite Page Wrong 35036: Changed Upload REST API to no longer immediately request thumbnail for an uploaded document. Performance improvement as requested. (re ALF-1015) 35142: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS: 35013: ALF-13561: Not found error after uploading new version (THOR-1304) 35320: Fix to issue where 'Avatar' alt text was shown rather than user avatar in the Site Members (colleagues) dashlet. 35546: Improve upload.post.js to use the "filename" argument if it is passed to set the name of the file on upload. 36019: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36020: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36021: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36022: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36023: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36024: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36025: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34819: THOR-1255 - Define a GhostScript powered transformer for generating PNGs from PDF files, then override the regular PDF to Image transformer definitions from content-services-context.xml with ones that call GhostScript instead of the com.sun in-JVM one 36026: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36027: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36028: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36029: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36030: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34921: THOR-1176: GoSquared analytics script 34922: THOR-1176: Removed accidentally committed file 34923: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS 34914: Merged DEV to V4.0 34889: ALF-12678: Errors in log on startup (ts.alfresco.com 4.0) BasicHttpAuthenticatorFactory.BasicHttpAuthenticator.authenticate(RequiredAuthentication, boolean) handles AuthenticationExceptions from authenticateAsGuest() calls. The result is a 401 Unauthorized response. 34920: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0 34892: Fix for ALF-12930 34917: Fix for ALF-12930 - pushed down to 3.4.X Also related tweak for ALF-10823 to EditionInterceptor now that the repository returns 401 for guest auth unsupported. 36032: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36033: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36034: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 35071: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 31745: ALF-11268 adding logging.properties and suppressing activiti-logging (which is not log4j but plain JUL) 32336: ALF-11607: "DB2/LINUXX8664" now recognized as DB2 database-type in activiti 32944: ALF-12066 issue with the db2 create-script for activiti (note: pre-reqs for cleaner merge of r34747) 36035: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 35072: THOR-1245: initial fix for doclib test case 36036: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36037: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36038: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 35211: THOR-1182 "MOBREG-07: A page exists confirming the users registration and invites them to enter the password they registered with" 35294: THOR-1309 - F405: Account Types aligned to sales and marketing requirements 35311: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS: 34958: Fix for THOR-1185 and change password hashing to use SHA-2 35026: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded" - hook into documentLibrary node creation to do the sample acp import 35302: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded" - use SHA for password hashing - ensure that sample content is added only to home sites 35309: THOR-1185 "MOBREG-16: New sample ACP for users home site is loaded" - minor update to sample content acp 35310: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded" - removed un-needed properties from repository.properties 35326: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS: 35324: Fix build 35327: Fix build 35337: THOR-1309 - F405: Account Types aligned to sales and marketing requirements 35533: THOR-1309: F405: Account Types aligned to sales and marketing requirements: 35672: THOR-1313 - F410: List accounts filtered by account type 35673: Minor: Update account type ids (as used by tests) to be consistent with the latest config (as per THOR-1309) 35695: THOR-1313 - F410: List accounts filtered by account type 35704: Fix Get Account Types REST API (to also include network admin quota) - related to THOR-1309 / THOR-335 35770: Minor: add additional logging only (THOR-1323) 48247: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY) 47263: Merged DEV/CLOUD2 to DEV/CONV_V413 36119: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35989: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed 34183: Part one of THOR-1129. 34185: Part two of THOR-1129. The Thor-specific parts. 34199: Fix for THOR-106 a failing test case that was switched off. 34202: THOR-106 addendum. Editing build.xml to put the test class back in to the build. 34211: BM: sync ThorTest (additional coverage) 34308: Merged HEAD to THOR1_SPRINTS 34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default" 34540: Share UI - copyright should be 2012 (related to THOR-1015) 35286: Resolve THOR-1242: Update Beta Logo 36617: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36564: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 35780: THOR-1312 - F409: List accounts optionally sorted by (numeric) account type id (ascending or descending) 35807: THOR-1335 - support bulk email address domain validation 35903: THOR-1312 / THOR-1313 -List accounts optionally filtered or sorted 35904: THOR-1310 / THOR-1311 - List accounts optionally sorted by total user account or total file size (or account type, as previously) 35945: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS: 35819: Added transformation server changes. 35820: Fixed compilation error, though a size of -1 for getActiveTransformers(...) is not likely to be valid. 35823: Transformations: changed default transformation server URL to be blank. 35897: Remote transformations server: fixed webscript bean id so that it responds to requests correctly. 35898: Remote transformations server: fixed JSON generation/parsing. 35910: Remote transforms server: fixed broken RemoteAlfrescoTransformerTest 35920: Remote transformation server: fixed broken test. 35937: Remote transformation server: integrated HTTPS support via HttpClientFactory. 35939: Remote transformations: added a boolean client-enabling property. 35941: Remote transformations: changed ProxyContentTransformer to delegate isExplicit() calls to worker. 36011: Merged BRANCHES/DEV/THOR1_QUICK_SHARE to BRANCHES/DEV/THOR1_SPRINTS: 34685: Creating Quick Share branch 34826: First cut of THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" 34868: More on THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" 34901: QuickShare REST API - WIP ... note: API will change :-) 34933: QuickShare REST API - WIP 34934: QuickShare REST API - WIP 34941: QuickShare REST API - WIP ... note: API will change :-) 34989: QuickShare REST API - WIP 34995: QuickShare REST API - WIP 34996: QuickShare REST API - WIP 35011: QuickShare/PublicView REST API 35025: F387: As the link receiver, I can view the Document Preview in the browser without having to login 35035: QuickShare/PublicView REST API 35052: QuickShare/PublicView REST API 35069: More on THOR-1270 "F387 As the link receiver, I can view the Document Preview in the browser without having to login" 35094: Removed cpnfig property that was commited by mistake 35111: First cut of THOR-1268 "F378: As a user I can choose to share a document" 35252: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit 35254: First cut of THOR-1268 "F378: As a user I can choose to share a document" part 2 35255: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" 35264: QuickShare/PublicView REST API 35317: THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 1) 35319: QuickShare REST API - fix tenant ref when share'ing 35330: QuickShare REST API - fix THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 2) 35368: QuickShare REST API - THOR-1336: (F418) Get context (nodeRef, siteId, tenantDomain) for a shared_id 35376: QuickShare REST API - fix THOR-1273 (unshare document) 35424: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit 35425: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit 35566: Fixed THOR-1268 "F378: As a user I can choose to share a document" 35617: THOR-1350: Update Slingshot API (doclib2) - make the "qshare:sharedBy" return full details (instead of just userName) 35624: THOR-1339: QuickShare REST API 35682: Fixed THOR-1268, THOR-1339 & THOR-1269 35935: QuickShare REST API - add "system.quickshare.enabled" prop (if set to false then disables QuickShare service/API) 35996: Fixed THOR-1369 & THOR-1270 35997: Fixed THOR-1369 & THOR-1270 part 2 36000: Fixed THOR-1369 & THOR-1270 part 3 36082: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" - Re-added "Document Details" link public share page 36128: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS THOR-809 "Site Invites Usability - Finish as per original design" - First cut of: #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated. THOR-809 "Site Invites Usability - Finish as per original design" - Second cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated. * Tooltip is now a common one for all emails rather than individual since that caused issues when being scrolled inside div element. This approach is also less intrusive THOR-809 "Site Invites Usability - Finish as per original design" - Third cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated. * Scroll bar is only visible when needed * Now works in IE7 36153: THOR-694: File size upload limit is not adhered to by Alfresco repository 36186: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS: 32842: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied 32850: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied (THOR-1208, THOR-1210) 36188: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34193: ALF-12205 - Contributor can't comment document/folder if versinable aspect is applied (THOR-1209, THOR-1302, THOR-1387) 36237: THOR-28: Account Service - Get Account Method API 36252: THOR-28: Account Service - Get Account Method API 36624: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36565: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36289: THOR-1314: Changed e-mail action in upgrade button to link 36290: MT fix for SiteService 36291: THOR-538 / THOR-1168 - auto remove external user from a secondary network when they no longer belong to any sites ... 36292: THOR-900: Modified URL rewrite filters to enforce encoding of "@" symbols sin URL so that the invalid session timeout error doesn't occur 36631: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36570: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36308: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 36109: ALF-7874 MimeType definitions for Adobe AfterEffects files 36110: ALF-7874 Upgrade Tika for improved detection of Adobe Premier and AfterEffects 36112: ALF-7874 MimeType definition addition for Adobe Premier files 36313: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 33730: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX: 33726: ALF-7264 Upgrade Commons Validator to 1.4.0 Final, fixing VALIDATOR-292. Then, update the EmailValidator flags to allow local addresses during validation, so that Alfresco can send emails to @localhost addresses without error 33779: Upgrade Tika for ALF-12714 33782: ALF-12714 Add 3GPP/3GPP2 video, and MP4 Audio mimetypes 33783: Update Tika for more MP4/QuickTime support, and enable MP4 audio metadata extraction + "quick" testing 34884: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 34883: Tika and POI upgrade for ALF-13106 36340: AttributeService improvement: update puc value + cache (based on keys rather than id) 36341: Tenant usage quotas improvement 36412: THOR-1403: added connection timeout property to HttpClientFactory. 36413: THOR-1403: added 3s connection timeout to transformer client configuration. 36425: Tenant usage quotas improvement 36428: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS THOR-809 "Site Invites Usability - Finish as per original design" - Added semicolon as email separator - Fixed seecltion bug for SF, text now selected on first click and deselected on 2nd click (tested IE, SF & Chrome) 36431: Resolve THOR-1406: Emails with apostrophes aren't accepted 36455: Resolve THOR-1146: qamy.alfresco.com: incorrect URL for the RSS items 36456: Resolve THOR-1061 Incorrect text for the 'Task History' link 36457: Resolve THOR-1345: Missing apostrophe on mobile / cloud sign-up web page 36459: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS: 36458: THOR-1411: New Alfresco remote transformation subsystem is DEBUG logging by default 36460: Resolve THOR-1294: Terms and Conditions Link in Sign up screen does not work 36464: Resolve THOR-1238: Missing message string: error.header.wrong-reset-user 36472: Merged DEV/THOR1_QUICK_SHARE to DEV/THOR1_SPRINTS Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" - Added new component evaluator for bringing in different components based on page id - The title of the quickshare page now contains the document's name (to improve the social "Share with:" experience) - Added new icon for page not found screen 36477: AttributeService improvement: fix test/build (PropertyValueDAOTest.testPropertyUniqueContextValue) 36482: Resolve THOR-1416: Remove Polymorph Client 36484: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations << Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be okay with OpenOffice 3.2 which was used in the previous release. >> - Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer than 3.0 beta-4 - Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env for LibreOffice 3.5 - Modified code to use partial GNU style options (not used for -env!) when using LibreOffice - Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect - Tested to work with OpenOffice 3.4 and 3.2 on Windows 7 36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - remove old jodconverter-core-3.0-beta-3.diff 36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path. 36485: Resolve THOR-1418: Switch off S3 encryption by default 36508: THOR-1200 (CORE CHANGE): Modification to forms-runtime to prevent field undefined errors 36509: THOR-1200 (MODULE CHANGE): Re-introduce folder rules 36517: THOR-1353: Ensure IE8 users can create tasks 36521: Resolve THOR-1348: Account Settings screen should display Account Type 36530: Fix solrcore.properties 36540: THOR-1200: Force folder rules to run asynchronously 36634: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36633: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36601: Merge from THOR1_QUICK_SHARE to THOR1_SPRINTS 36599: Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login" - Made the "Preparing previewer... text get rendered using javascript so Google+ won't include it in its description when sharing quickshare links 36673: Fix issue where thumbnail failed to render when lastModified list provided but not for thumbnail type requested 36760: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36758: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file 48248: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47266: Merged DEV/CLOUD2 to DEV/CONV_V413 37343: Fixed renamed directive issue in resources.get.html.ftl and updated spring-surf-api lib to ensure checksum appended MessagesWebScript URLs are matched 37402: THOR-1479: Alfresco.DocumentList.generateThumbnailUrl Ignores renditionName Parameter - Changed call to Alfresco.util.generateThumbnailUrl to use renditionName parameter instead of hard-coded "doclib" - Added check for null renditionName parameter, if true use default of "doclib" 37413: Fix issue from "V4.0-BUG-FIX to CLOUD1 merge" r37178 part 4 - Missing </script> tag in colleagues dashlet 37414: Added login box shadow for IE8 37415: Minor Share fixes from Sprint - THOR-383 "When multiple invitations are sent to a single user, the pending invitations UI is not laid out right." - THOR-431 ""Site Dashboard" not highlighted in banner when that page is displayed" 37454: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 37453: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 37451: Resolve THOR-1477: Video not previewing correctly 48249: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY) 47273: Merged DEV/CLOUD2 to DEV/CONV_V413 37652: THOR-1489: Alfresco.util.generateThumbnailUrl Ignores thumbnailName During Last Modified Check - Changed hard-coded "doclib" to thumbnailName 48250: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY) 47280: Merged DEV/CLOUD2 to DEV/CONV_V413 39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare" 48254: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY) 47282: Merged DEV/CLOUD2 to DEV/CONV_V413 37516: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 37509: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 37167: Merged HEAD to BRANCHES/DEV/THOR1_SPRINTS: 37157: THOR-1459: WebDAV: site names cannot start with 'webdav' 37302: THOR-1403: ensure indexing happens asynchronously on upload. 37303: THOR-1403: removed thumbnail creation during file upload. 37459: THOR-1429: Webdav returns 500 when you don't have access to moderated site 37469: THOR-1475: Fixed avatar thumbnails for users joining/leaving/role change on sites. 37506: Resolve THOR-1481: Cannot preview PDFs over 3.5MB in size 48256: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47283: Merged DEV/CLOUD2 to DEV/CONV_V413 39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production. 39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet 39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly 48259: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47302: Merged DEV/CLOUD2 to DEV/CONV_V413 39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1 36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex - Optimized favorite document query to remove need for a PATH - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//* - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited - Added some addition doclist.get.js query scriptlogger debugging output 36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter. 37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites - Additional query improvement by Pavel 37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23 Merged PATCHES/V3.4.6 to CLOUD1 39491: ALF-13404: Another attempt. Still not performing. Giving up on the cm:* idea altogether. Merged V3.4-BUG-FIX to CLOUD1 39672: Merged PATCHES/V3.4.6 to BRANCHES/DEV/V3.4-BUG-FIX 39534: ALF-13404: Now we understand it! Content I'm Editing dashlet is non-site specific so should use cm:* in its queries. However, site filters and dashlets should NOT. Merged V4.0-BUG-FIX to CLOUD1 36635: ALF-13404 for documentlibrary-v2 APIs 37121: ALF-12796: Ensure that only visible nodes are shown via Category search in Repository view when libraryRoot is changed from company home. Merged PATCHES/V3.4.6 to CLOUD1 37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites - Additional query improvement by Pavel Merged V4.0-BUG-FIX to CLOUD1 37443: Hand merge of second round of PATH query improvements for ALF-13404 to doclib2 API scripts Merged V4.1-BUG-FIX to CLOUD1 38209: Tweaks to code merged over recently from 3.4 relating to doclib filters query simplification. 38298: Fix for ALF-13737 - Error when 'favoriting' Company Home 39678: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 39672: Merged PATCHES/V3.4.6 to BRANCHES/DEV/V3.4-BUG-FIX 39534: ALF-13404: Now we understand it! Content I'm Editing dashlet is non-site specific so should use cm:* in its queries. However, site filters and dashlets should NOT. Hand merged above changes to documentlibrary-v2 filter scripts. 48260: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47305: Merged DEV/CLOUD2 to DEV/CONV_V413 40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set. 40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield). 48262: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY) 47374: Merged DEV/CLOUD2 to DEV/CONV_V413 40553: Remove on-premise style MT store Id extraction code from syncmode config lookup. 48263: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47375: Merged DEV/CLOUD2 to DEV/CONV_V413 42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1: 37644: Resolve CLOUD-34: Incorporate Gallery View 39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property 39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons - Implemented in DAM 1.0.2.0 39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes: - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7 - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7 - DAM-37: Gallery View: No Border Around Selected Items in IE7 - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions - DAM-39: Gallery View: Slider Behavior is Erratic in IE7 - DAM-40: Gallery View: Upload Instructions Throws Error in IE7 40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view - Deployed DAM 1.0.4.0 40507: Changed name of DAM module to Media Management 40534: Version 1.0.5.1 of MM module which includes: - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5 40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for: - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width 41174: Deployed Media Management module 1.0.5.4 which includes: - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views - DAM-68: Gallery VIew Should Hide Its Container on destroyView - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter 41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM: 40870: m.share fixes 41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM: 40919: m.share fixes 41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM: 41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices" 41614: Changed version of gallery view only MM module to 0.1 42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74 48266: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY) 47403: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1: 41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1 41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor] 41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX 36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document" 41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property 48267: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47411: Merged DEV/CLOUD2 to DEV/CONV_V413 42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1: 39663: CLOUD-153 - Invite box doesn't parse email addresses properly 48269: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47422: Merged DEV/CLOUD2 to DEV/CONV_V413 42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 47430: Merged DEV/CLOUD2 to DEV/CONV_V413 42049: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: 41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants 41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more 42050: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: 41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants 41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more 48270: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY) 47438: Merged DEV/CLOUD2 to DEV/CONV_V413 42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1: 38864: CLOUD-41 - Resize logo banner on upload 38878: CLLOUD-42 - Image previews should be larger 48271: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47345: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2: 35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1: 34235: Upgraded Jackson to 1.9.4 34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans. 34463: Exported=true 34464: Removed unused parent workflow 34465: Added a createComment method (Just cut and pasted Neils testcase code). 34466: Initial check-in of Rest Api code. Still quite a bit to do. 34619: Added sources 34620: Going to start another Sprint so I need to check in everything up to date. WIP 34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests 34727: Reworked the Resource execution, added PUT webscript, improved the tests. 34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases 34856: Initial cut of rest api implementations. Work in progress. 34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests. 34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods. 34986: 2nd cut of rest api implementations: still wip. 34987: Added a readById method for Resource GET using the relationship id 35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ): - explicitly set default timezone for date serialization/deserialization to UTC - more rest api implementation tests - rest api implementation re-factoring resulting from changes to the framework 35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources. 35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220 35059: Separated the GET executor so the embedded objects are called correctly. 35102: Added Paging, fixed up the Tests. 35117: wip, rest api implementations 35312: Made final 35313: Better exception handling with messages 35314: Improved paging/params and messages, started on embedded relations 35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param 35329: Handles null relationship keys 35377: Checks for simple property types which don't allow embedding 35496: WIP: rest implementations, test framework and tests 35529: Initial commit of scope and versioning support. 35539: Fixed the versioning for relationship resources 35560: Quick cleanup 35562: Embedded relationships is now working much better 35586: Safer serialization of Maps/Collections 35603: Added better version and filtering tests. 35611: Added Entity and Relationship not found exceptions 35612: Added Entity and Relationship not found exceptions 35674: Rest api implementations: - node refs are represented solely by their uuid (workspace://SpacesStore is assumed) - updates to model classes (hashcodes, equals, etc) - more paging support - tests 35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1: 35773: Added api versioning with @WebApiDeleted annotation. Better inheritance handling and improved tests. 35774: Deleted, it wasn't supposed to be there. 35988: WIP: - sample requests - more tests - general fixes, including security fixes - tag entity 35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1: 35938: Reworked filtering in a big way. Hopefully now it works. 35982: Clean up and bug fix the request 35983: Clean up and bug fix the request 36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1: 35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 36056: Clean up, not used 36057: Changed the way responses are rendered, more consistent "entry" entries. 36087: Changed the json structure for tests as well 36134: Added paging parameter, cleaned up imports, more tests 36146: WIP: - fixed up create tag return type - fixed up Person model entity so that it doesn't extend Node 36151: Fix for Serialization of recursive related Collection of results 36168: Better empty collection handling, initial sorting tests. 36189: Fixes embedded resources by correct id. 36210: WIP: - updates to rest api request files - changed Comment so that it doesn't extend Node. removed title - more tests 36211: WIP: - service paging and other fixes and updates 36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not) 36299: Update classpath as a result of jetty jars move 36301: Fix to stop null values in hashmaps from being returned in results. 36302: Added copyright notices 36303: WIP: - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following - moved site membership functionality into canned queries for person sites and site members relations - changed totalItems to an Integer so that it can be null if total items is not known - added siteId filtering for activities - copyright notices - creating a comment through the comment service raises a share-like activity 36304: WIP: - changed totalItems to an Integer so that it can be null if total items is not known - copyright notices 36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this. 36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef. 36312: Fix tests 36325: Add jetty jars to ant test classpath 36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok) 36335: Add missing file 36367: Fixes to tests 36368: CommentService fix - permissions. 36438: WIP: - Person filtering (for cloud) - Disabled some tests that are preventing the test from running (will revisit) - Person-avatar relation 36522: WIP: - fix sort ordering for site members - fix site id filter for activity feed list (add tenant id) 36523: WIP: - more tests - improved robustness of tests - added status mappings for EntityNotFound and RelationResourceEntityNotFound - for avatar, return base 64 encoded avatar data and avatar node id - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions. 36646: Changes resulting from review - make sure empty strings and null values are not output - person entity tidy-up - person visibility rules applied to person retrieval - more tests - return noderef of avatar node 36668: Fix build, add missing file 36694: Fix failing test 36764: WIP: - site containers canned query - node ratings: return null average (rather than -1) if there are no ratings - site membership canned query sorting - use an enum for sort fields 36767: Add missing files 36769: WIP: - node ratings: remove user rating summary, added rating date and fixed up tests 36770: WIP: - some changes to property names for activity feed entries 36823: WIP: - re-instate -1 for average rating when there are no ratings 36824: Changes resulting from review: - merge activities into one relation - quota model object to model network quotas - Change HomeAccount -> HomeNetwork - Changes to comment property names - If average rating is -1 (from the rating service) convert to null - remove readById from node entity resource - Favourite sites url renaming 36825: Removed debug logging for rest api 36826: Commented out tag related tests until I figure out how to get the lucene search working 36833: Added discoverablity for the documentation. New @WebApiDescription, @WebApiParam annotations 36871: Added tests for @WebApiDecrition, @WebApiParam 37026: WIP: - added discoverability annotations - changes resulting from review: o node ratings output restructure o network quotas restructure (need to revisit this again) - activity summary post processing framework - added non-caching to rest api webscript (need to revisit) - don't output empty strings (need to revisit) - more tests 37058: WIP: - change tag service support 37141: WIP: - tag sorting - fix JSON issue in PreferencesService 37142: WIP: - refactoring: split functional areas into separate REST API implementation classes - added copyright notices - network quotas represented as a list - ensure empty (zero length) JSON strings coming into the REST api are treated as null 37300: WIP: - support for update comment - activity summary processing - web script set no caching and response content type 37301: WIP: - support for update comment 37354: Build fix: try rebuilding indexes 37369: Fix build: try again 37498: More logging to determine build failure using lucene for search 37608: Build fix? 37609: Fix build 37637: Fix build: try again 37672: Build fix (try again) 37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code 37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code 37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID" 37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" 37866: Unit test fix 37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene) 38051: Build/test fix (another try) 38072: Removed file no longer required 38114: Better representation of the Resource metadata. Try calling: /alfresco/service/public/alfresco/versions/1 38230: Fix PublicApiTest on the build machine 38309: Public api test fixes 38319: Public api webscript transaction configuration. Make get webscript r/o transaction. 38320: Public rest api: make sure http response headers are written before the response content. 38340: More build test fixes 38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID" - fix up CMIS query fallout 38530: Fix tests 38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID" - fix up cmis queries 38552: Further test fixes 38574: Added some comments 38730: Added OPTIONS webscript to get metadata on the current url 38879: Refactored a little to make the code easier to extend / customise 38880: Fixed incorrect config, I should try not to delete things. 38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1: 38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url" 39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1: 39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url" 39090: Fixed broken webscript OPTIONS call 39159: Fix broken INFO url mapping 39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats 39331: The tests need their own context 39609: Update to latest Chemistry libraries 39657: Fix for CLOUD-417, part 1: "Delete a Comment" 39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging" 39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging" 39750: Fix for CLOUD-417, part 2: "Delete a Comment" - added delete comment method to comment service 39754: Fix for CLOUD-417, part 3: "Delete a Comment" - fixed up activity generation for update and delete comment 39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files. 39780: Shifted public api opencmis webscript definitions to Thor 39781: Shifted public api opencmis webscript definitions to Thor 39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging" 39783: Minor fixes, comments 39785: Public api tests - move jetty libraries to 3rd party - remove JettyComponent as a Spring bean and change how it's constructed 39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID" - for unversioned documents, the revision number should not be appended 39794: Added missing files for public api tests 39795: Update to latest Chemistry libraries 39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID" - for unversioned documents (or documents with version "1.0"), the revision number should not be appended 39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants" 39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID" 39844: Public api tests - move jetty libraries to 3rd party - remove JettyComponent as a Spring bean and change how it's constructed 39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants" 39856: Re-instate tests. 39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom) 39926: Fix for CLOUD-442: "Public API : Tagging + Paging" 39927: Fix for CLOUD-442: "Public API : Tagging + Paging" - updates to public api tests 40185: Make sure LockService is injected into CommentService 40186: Make sure LockService is injected into CommentService 40187: Changes resulting from sprint demo: - changes to network and network membership representation - embed modifiedBy person object in comment 40211: Changes resulting from sprint demo: - changes to network and network membership representation 40212: Fix intermittently failing test 40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom) - removed browser binding for now 40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes) - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom) - removed browser binding for now 40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom) - removed browser binding for now 40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom) 40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom) 40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom) 40270: Turned stacktrace into a String 40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments" 40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2: 40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor 40644: Public api: 40645: Public Api: 40646: Public Api: 40649: Public api: 40650: Public api: 40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2: 40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation 40550: Public api: - updates to datetime property names 40552: Public api: - sort sites by site title (by default) 40596: Removed "system" from exclusions for CLOUD-495 40610: CLOUD-495: F414: Add multiple tags to a folder or document 40674: Public api: 40675: THOR-1324: "F414: Add multiple tags to a folder or document" 40676: Public api: 40678: Public api: 40715: Public api: 40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724 Better meta-data handling for PUT requests 40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation. 40732: Fixed failing test 40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged 40742: Public api 40801: Public api: 40802: Public api 40803: Public api 40804: Public api 40807: Public api 40811: Public api 40815: Public api: 40826: Public api 47357: Fix merge/compile error (solr /cmis query) 47370: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41146: Fix trusted authentication against OpenCMIS 47372: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before 48272: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes) 47368: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41128: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1: 41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: 40364: Testcase for ALF-15178, which is not reproduced. 40419: Fix for the MLText parts of ALF-15502. 40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud 41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: 41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1: 41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1: 41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs 48274: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47356: (RECORD ONLY) Add temp logging - to investigate unit test failures on build only 48277: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47376: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41302: CLOUD-622: "Mobile App connection to testmy build 227 issue" 41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 40859: public api: 40862: CLOUD-555: "Updating comment fails because node not found" 40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property" 40979: Added tests for non-numeric params and non-european characters 41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2: 41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId" 41097: Added quickshare and cloudsync to cmis filter list 41098: Renamed serializer/deserializer lists for RestJsonModule 41099: Cleaned up consistent Rest responses - CLOUD-574 41100: Meta info webscript is disabled because its not been reviewed / in the correct format 41104: Meta info webscript is really disabled because its not been reviewed / in the correct format 41105: Added key for trusted layer7 relationship 41137: Public api: 41168: Public apI; 41169: CLOUD-565: "API / URL returns a "tenant required" error" 41170: public api: 41171: public api: 41172: public api: 41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting" 41186: Fix solrcore properties 41282: CLOUD-616: "CMIS API: Repository names should be more descriptive" 41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400" 41325: Public api: 41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204" 41369: Public api: 41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41422: Sample OAuth call for the Resource Owner Password flow 41427: Sample OAuth call for the Client Credentials flow 41433: Public api: (1) parameterize site members/people sorting in service api 41434: Public api: minor comment service fix 41438: CLOUD-629: "REST API: It is possible to add a comment to comment" 41439: Public api: fix for default tenant id in CMIS requests 41449: CLOUD-629: "REST API: It is possible to add a comment to comment" 41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library" 41457: Fix build 41461: Public api: more tests 41560: CLOUD-657: "cmis root service document returning incorrect urls" 41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items" 41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException 41607: CLOUD-668 : changed ordering so errors fire in correct order. 41628: Public api: more tests 41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41672: CLOUD-672: "404 Error when browsing child files/folder " 41673: Public api: more tests 41675: CLOUD-674: "Root network calls need to return application/json content type" 47378: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items" 41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException 41607: CLOUD-668 : changed ordering so errors fire in correct order. 41628: Public api: more tests 41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41672: CLOUD-672: "404 Error when browsing child files/folder " 41673: Public api: more tests 41675: CLOUD-674: "Root network calls need to return application/json content type" 48289: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 47447: Merged DEV/CLOUD2 to DEV/CONV_V413 43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1: 42257: CLOUD-649: Updates UI action for Granular Permissions 42295: CLOUD-33: Updates labels 42303: CLOUD-651: Limit user search to site members only. 42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed. 42427: Removes multi-select manage-permissions dialogue. 42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug. 42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority. 42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off" 42807: CLOUD-863: Reordered code to avoid AccessDeniedException 43259: CLOUD-901: Revert showComments check so it handles undefined permission 43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel 43307: CLOUD-900: Follow-up fix 48291: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY) 47453: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1: 43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798 V4.0-BUG_FIX 36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene 36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene 36608: First part of ALF-14209 SOLR - does not support query for all stores 36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size. 36954: ALF-14209 SOLR - does not support query for all stores 37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState 37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes) 37628: Build Fix 37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made 37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File 37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made 38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker) 38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache V4.1 38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user V4.1-BUG-FIX 40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting 41201: Fix for ALF-15767 Group query using cm:authorityName 41202: Additional unit tests related to ALF-15731 TYPE:"..." queries no longer work for Lucene on 4.X 41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently 41210: Part 2: ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE 41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking 41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc 41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151 41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error 41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer 41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. 41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name) 42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 42183: Build fix - unit test runs in 64M - for all the washing machines out there .... 42547: Fix the model used for embedded tests. 42659: Add missing test model 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR 42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 42657: Fix for ALF-16359 Fix SOLR logging in production and other environments 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR working copy sync r42514 through r42659 43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 42363: ALF-16213: renaming versioned file results in file being deleted. 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX: 42389: CLOUD-796: handle unknown custom content/folder type 42396: CLOUD-796: handle unknown custom content/folder type 42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: 41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly 42406: CLOUD-796: handle unknown custom content/folder type 42409: CloudSync: CLOUD-796 / ALF-16226 - hide sync props in forms (eg. edit props) for sync'ed custom content type 42428: ALF-16217: Remove unnecessary restriction on content type 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity 43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX: 42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170) 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock 43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled"" 43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef) 43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31 43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect" 43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button. 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" 42868: Fix failing build tests + further/revised public api tests 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary" 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete 42899: Fix build 43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174) 43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8" 43234: CLOUD-313: Implment Transport pooling in email sender. 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV) 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX: 43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931) 43819: Fix merge error 43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX: 39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0. 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats) - Patched POI to: - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second! - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part. - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format - handle -ve fractions (just did not work) - limitations: - custom text gets stripped (still better than before) - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before) 43564: CLOUD-939: <Record Only> 43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats - Original jar did not get removed in previous commit << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >> 43823: Fix merge error 43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43579: Public api test, fix intermittent test failures (hopefully) 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS" 43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX: 38211: CLOUD-115 - Remove Network Admins on downgrade to free/public 43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS" 43762: Fix the build 43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that much slower even for western encodings - It still does csv and xml to pdf - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf) The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used. - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason. - transformer.complex.Text.Image now has a wild card first transformer for the same reason. - Allow transformer config element supportedTransformations to wild card source or target mimetype 39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Fix build failures (not sure about RecordsManagementAuditServiceImplTest) - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox 40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses. 40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper, including fixes that existed on only one or the other. - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as an input. They do support it in other file types but not text. JOD now works, but OOo still has problems. 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43762: Fix the build 43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX: 40859: public api: 40862: CLOUD-555: "Updating comment fails because node not found" 40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property" 40979: Added tests for non-numeric params and non-european characters 41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2: 41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId" 41097: Added quickshare and cloudsync to cmis filter list 41098: Renamed serializer/deserializer lists for RestJsonModule 41099: Cleaned up consistent Rest responses - CLOUD-574 41100: Meta info webscript is disabled because its not been reviewed / in the correct format 41104: Meta info webscript is really disabled because its not been reviewed / in the correct format 41105: Added key for trusted layer7 relationship 41137: Public api: 41146: Fix trusted authentication against OpenCMIS 41168: Public apI; 41169: CLOUD-565: "API / URL returns a "tenant required" error" 41170: public api: 41171: public api: 41172: public api: 41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting" 41186: Fix solrcore properties 41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before 41282: CLOUD-616: "CMIS API: Repository names should be more descriptive" 41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400" 41325: Public api: 41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204" 41369: Public api: 41422: Sample OAuth call for the Resource Owner Password flow 41427: Sample OAuth call for the Client Credentials flow 41433: Public api: (1) parameterize site members/people sorting in service api 41434: Public api: minor comment service fix 41438: CLOUD-629: "REST API: It is possible to add a comment to comment" 41439: Public api: fix for default tenant id in CMIS requests 41449: CLOUD-629: "REST API: It is possible to add a comment to comment" 41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library" 41457: Fix build 41461: Public api: more tests 41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items" 41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException 41607: CLOUD-668 : changed ordering so errors fire in correct order. 41628: Public api: more tests 41672: CLOUD-672: "404 Error when browsing child files/folder " 41673: Public api: more tests 41675: CLOUD-674: "Root network calls need to return application/json content type" 41790: CLOUD-629: "REST API: It is possible to add a comment to comment" 41791: CLOUD-629: "REST API: It is possible to add a comment to comment" 41793: CLOUD-629: "REST API: It is possible to add a comment to comment" 41823: Public api: more tests 41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging 41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier" 41867: CLOUD-711: "It should be possible to remove a favourite site" 41957: Public api: - error handling improvements - more tests 41970: Public api: - fix build (add missing files) 41972: Public api: - more tests (including OpenCMIS TCK) 42046: Added some debug timings. Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug 42058: Public api: changed logging package name 42124: Public api: - more tests - minor fixes 42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing" 42126: Public api: fix up OpenCMIS tests 42171: Consistency fix for CLOUD-695. 42180: Fix build 42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests 42214: Public api tests (cmis) 42251: Changed the serializer for embedded entities, (related to CLOUD-746) 42253: Fix build 42735: (RECORD ONLY) Fix build (fix merge error) 43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls. 43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query. 43881: Revert CLOUD-942: Reverse merge r43830 43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests. 43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files) 43924: Disable intermittent OpenCMIS tests 43925: Disable intermittent test 43952: CLOUD-993: Insure login button is shown when user isn't logged in. 43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login 48293: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY) 47530: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 45853: Merged BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH to BRANCHES/DEV/CLOUD1: 44041: Merged BRANCHES/DEV/CLOUD1_SPRINT1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH: 40496: Merged from BRANCHES/DEV/AMILLER/CLOUD1_SPRINT_1 to BRANCHED/DEV/CLOUD1_SPRINT1 CLOUD-189: Created e-mail template macros and css lib files CLOUD-189: E-mail template image assets CLOUD-189: Updated macros and CSS lib plus finished site invitation template CLOUD-189: Reset password e-mails CLOUD-189: More e-mail templates CLOUD-189: Workflow template CLOUD-144: Refactor AbstractUserNotifier to allow custom models to be passed to template. CLOUD-144: Custom activity feed model builder, for cloud. CLOUD-144: Activities e-mail template 40958: CLOUD-580: Added alt text for images 40960: CLOUD-585: Added missing quotes to invitation e-mail 40967: CLOUD-144: Add joins aggregation to activites feed model and fix missed merge. 40970: CLOUD-144: Added joins to activities e-mail 40982: CLOUD-582: Fix subject 41028: CLOUD-582: Fix unit test assertion on email subject 41231: CLOUD-612: Add generation time to model. 41276: CLOUD-612: Added date to activity e-mail template 41279: CLOUD-614: Added missing footer text to activities e-mail 41502: CLOUD-611: Remove corner images 41728: CLOUD-681: Add others category to activities e-mail 42138: CLOUD-613: Remove exclusions from site activities, sort grouping by site name and improve logic for determining network. 42196: CLOUD-613: Group activities by site 42914: Translated e-mail templates 44174: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH: 43983: GERMAN: Translation updates based on EN r43703 43984: SPANISH: Translation updates based on EN r43703 43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit. 43986: ITALIAN: Translation updates based on EN r43703. 43987: JAPANESE: Translation updates based on EN r43703. 43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily 44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit. 44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit. 44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break. 44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1: 43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798 V4.0-BUG_FIX 36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene 36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene 36608: First part of ALF-14209 SOLR - does not support query for all stores 36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size. 36954: ALF-14209 SOLR - does not support query for all stores 37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState 37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes) 37628: Build Fix 37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made 37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File 37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made 38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker) 38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache V4.1 38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user V4.1-BUG-FIX 40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting 41201: Fix for ALF-15767 Group query using cm:authorityName 41202: Additional unit tests related to ALF-15731 TYPE:"..." queries no longer work for Lucene on 4.X 41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently 41210: Part 2: ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE 41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking 41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc 41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151 41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error 41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer 41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. 41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name) 42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 42183: Build fix - unit test runs in 64M - for all the washing machines out there .... 42547: Fix the model used for embedded tests. 42659: Add missing test model 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR 42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 42657: Fix for ALF-16359 Fix SOLR logging in production and other environments 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR working copy sync r42514 through r42659 43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 42363: ALF-16213: renaming versioned file results in file being deleted. 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX: 42389: CLOUD-796: handle unknown custom content/folder type 42396: CLOUD-796: handle unknown custom content/folder type 42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: 41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly 42406: CLOUD-796: handle unknown custom content/folder type 42409: CloudSync: CLOUD-796 / ALF-16226 - hide sync props in forms (eg. edit props) for sync'ed custom content type 42428: ALF-16217: Remove unnecessary restriction on content type 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity 43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX: 42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170) 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock 43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled"" 43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef) 43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31 43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect" 43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button. 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" 42868: Fix failing build tests + further/revised public api tests 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary" 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete 42899: Fix build 43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174) 43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8" 43234: CLOUD-313: Implment Transport pooling in email sender. 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV) 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX: 43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931) 43819: Fix merge error 43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX: 39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0. 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats) - Patched POI to: - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second! - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part. - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format - handle -ve fractions (just did not work) - limitations: - custom text gets stripped (still better than before) - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before) 43564: CLOUD-939: <Record Only> 43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats - Original jar did not get removed in previous commit << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >> 43823: Fix merge error 43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43579: Public api test, fix intermittent test failures (hopefully) 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS" 43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX: 38211: CLOUD-115 - Remove Network Admins on downgrade to free/public 43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS" 43762: Fix the build 43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that much slower even for western encodings - It still does csv and xml to pdf - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf) The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used. - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason. - transformer.complex.Text.Image now has a wild card first transformer for the same reason. - Allow transformer config element supportedTransformations to wild card source or target mimetype 39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Fix build failures (not sure about RecordsManagementAuditServiceImplTest) - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox 40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses. 40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper, including fixes that existed on only one or the other. - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as an input. They do support it in other file types but not text. JOD now works, but OOo still has problems. 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43762: Fix the build 43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX: 40859: public api: 40862: CLOUD-555: "Updating comment fails because node not found" 40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property" 40979: Added tests for non-numeric params and non-european characters 41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2: 41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId" 41097: Added quickshare and cloudsync to cmis filter list 41098: Renamed serializer/deserializer lists for RestJsonModule 41099: Cleaned up consistent Rest responses - CLOUD-574 41100: Meta info webscript is disabled because its not been reviewed / in the correct format 41104: Meta info webscript is really disabled because its not been reviewed / in the correct format 41105: Added key for trusted layer7 relationship 41137: Public api: 41146: Fix trusted authentication against OpenCMIS 41168: Public apI; 41169: CLOUD-565: "API / URL returns a "tenant required" error" 41170: public api: 41171: public api: 41172: public api: 41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting" 41186: Fix solrcore properties 41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before 41282: CLOUD-616: "CMIS API: Repository names should be more descriptive" 41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400" 41325: Public api: 41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204" 41369: Public api: 41422: Sample OAuth call for the Resource Owner Password flow 41427: Sample OAuth call for the Client Credentials flow 41433: Public api: (1) parameterize site members/people sorting in service api 41434: Public api: minor comment service fix 41438: CLOUD-629: "REST API: It is possible to add a comment to comment" 41439: Public api: fix for default tenant id in CMIS requests 41449: CLOUD-629: "REST API: It is possible to add a comment to comment" 41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library" 41457: Fix build 41461: Public api: more tests 41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items" 41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException 41607: CLOUD-668 : changed ordering so errors fire in correct order. 41628: Public api: more tests 41672: CLOUD-672: "404 Error when browsing child files/folder " 41673: Public api: more tests 41675: CLOUD-674: "Root network calls need to return application/json content type" 41790: CLOUD-629: "REST API: It is possible to add a comment to comment" 41791: CLOUD-629: "REST API: It is possible to add a comment to comment" 41793: CLOUD-629: "REST API: It is possible to add a comment to comment" 41823: Public api: more tests 41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging 41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier" 41867: CLOUD-711: "It should be possible to remove a favourite site" 41957: Public api: - error handling improvements - more tests 41970: Public api: - fix build (add missing files) 41972: Public api: - more tests (including OpenCMIS TCK) 42046: Added some debug timings. Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug 42058: Public api: changed logging package name 42124: Public api: - more tests - minor fixes 42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing" 42126: Public api: fix up OpenCMIS tests 42171: Consistency fix for CLOUD-695. 42180: Fix build 42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests 42214: Public api tests (cmis) 42251: Changed the serializer for embedded entities, (related to CLOUD-746) 42253: Fix build 42735: (RECORD ONLY) Fix build (fix merge error) 43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls. 43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query. 43881: Revert CLOUD-942: Reverse merge r43830 43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests. 43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files) 43924: Disable intermittent OpenCMIS tests 43925: Disable intermittent test 43952: CLOUD-993: Insure login button is shown when user isn't logged in. 43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login 44185: Merged BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH: 43021: CLOUD-803, CLOUD-487: Send localised e-mails 43024: CLOUD-486 - Choose UI language. 43085: CLOUD-803, CLOUD-487: Revert changes to pre-existing process(String, Object, Writer) method. 43086: CLOUD-803, CLOUD-487: Fix broken unit tests 43106: CLOUD-486 - Choose UI language. 43159: CLOUD-486 - Choose UI language. 43160: CLOUD-803, CLOUD-487: Fix broken unit tests 43182: CLOUD-803, CLOUD-487: Fix broken unit tests. 43230: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174) 43246: Bug fix for CLOUD-899. Added if to catch null values. 43267: CLOUD-486 - Choose UI language. 43329: CLOUD-911 - Localization change is not working in the preference page from CLOUD-486 - Fixed by setting cookie path to / 43626: CLOUD-909 - Keep Email address when language changes 43631: CLOUD-909 - Keep Email address when language changes - Updated Spring Surf version 43704: Enables all currently cloud supported languages in Cloud specific config file 43723: CLOUD-486 - Fix right border of select options and add extra languages 43880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 43879: FRENCH: Translation updates based on EN r43703 43965: CLOUD-486 - Add French, German, Spanish, Italian and Japanese for new fields and pages. 43988: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 43983: GERMAN: Translation updates based on EN r43703 43984: SPANISH: Translation updates based on EN r43703 43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit. 43986: ITALIAN: Translation updates based on EN r43703. 43987: JAPANESE: Translation updates based on EN r43703. 44021: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 42871: GERMAN: Cloud Translation, based on r 42416 42879: SPANISH: Cloud Translation, based on r 42416 42890: ITALIAN: Cloud Translation, based on r 42416 44026: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit. 44033: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit. 44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break. 44077: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml 44093: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE: 42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch 42871: (RECORD ONLY) GERMAN: Cloud Translation, based on r 42416 42879: (RECORD ONLY) SPANISH: Cloud Translation, based on r 42416 42890: (RECORD ONLY) ITALIAN: Cloud Translation, based on r 42416 43120: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1: 43100: Update the salesforce amp to include the CORS Filter 43101: Update web.xml to enable to the CORS Filter with filter-mapping 43117: Add updated amp with removed CORS Filter. CORS Filter is now available in 3rd-party libs 43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs 43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs 43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers 43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1: 42257: CLOUD-649: Updates UI action for Granular Permissions 42295: CLOUD-33: Updates labels 42303: CLOUD-651: Limit user search to site members only. 42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed. 42427: Removes multi-select manage-permissions dialogue. 42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug. 42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority. 42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off" 42807: CLOUD-863: Reordered code to avoid AccessDeniedException 43259: CLOUD-901: Revert showComments check so it handles undefined permission 43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel 43307: CLOUD-900: Follow-up fix 43353: Fix for remote transform server with new cloud environment 43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1: 39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS: Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1 36307 Fixed THOR-1402 "Need a callback option for Create Content menu" - Will be revisited to add better comments 36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2 - Changed callback obj to match action object better: { nodeRef, node, jsNode } - Better code documentation - Removed dev/test code - Improved error config handling 36358 THOR-1402 "Need a callback option for Create Content menu" part 3 - Changed "link" parameter to "href" (instead of "page") to match actions. 39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402 39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402 39875: Configurtion changes to enable Google Docs V2 within the web tier. 39881: It's extension ... not extention 39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files 39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js 40468: Alfresco GoogleDocs AMPS. Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76] 40624: Update Google Docs AMPs 40635: Merge Google Docs Cloud AMPS to Feature Branchs 40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79] 40897: Google Docs AMP update 41165: Merge Updated AMPs for [GOOGLEDOCS-83] 41179: Update AMPs for [GOOGLEDOCS-87] 41262: Update AMPs for GOOGLEDOCS-89 41493: Update AMPs for [GOOGLEDOCS-93] 41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100] 41805: Update AMPs for [GOOGLEDOCS-101] 41840: Add AMPs with i18n strings 43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1 43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build 43320: Add googledocs repo declaration 43538: Fix pesky solrcore.properties ... remove hardcoded amiller ;-) 43605: Merged BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK to BRANCHES/DEV/CLOUD1: 43033: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK: 39313: CLOUD-194: Add new trial network account type. 39332: CLOUD-194: Add translation for new network account type. 43218: CLOUD-194: Change Trail Network subscription level to Enterprise 43658: Merged HEAD to BRANCHES/DEV/CLOUD1: 43655: BDE-73: exclude more failing tests which are never run 43653: BDE-73: tune surefire config to make it pass with Sonar 3.3 43752: Merged HEAD to CLOUD1 BDE-73: Repair coverage report, broken since Sonar upgrade 43879: (RECORD ONLY) FRENCH: Translation updates based on EN r43703 43983: (RECORD ONLY) GERMAN: Translation updates based on EN r43703 43984: (RECORD ONLY) SPANISH: Translation updates based on EN r43703 43985: (RECORD ONLY) FRENCH: Translation updates based on EN r43703, includes file missing from previous commit. 43986: (RECORD ONLY) ITALIAN: Translation updates based on EN r43703. 43987: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703. 43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily 44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1: 43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798 V4.0-BUG_FIX 36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene 36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene 36608: First part of ALF-14209 SOLR - does not support query for all stores 36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size. 36954: ALF-14209 SOLR - does not support query for all stores 37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState 37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes) 37628: Build Fix 37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made 37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File 37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made 38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker) 38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache V4.1 38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user V4.1-BUG-FIX 40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting 41201: Fix for ALF-15767 Group query using cm:authorityName 41202: Additional unit tests related to ALF-15731 TYPE:"..." queries no longer work for Lucene on 4.X 41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently 41210: Part 2: ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE 41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking 41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc 41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151 41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error 41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer 41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. 41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name) 42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups 42183: Build fix - unit test runs in 64M - for all the washing machines out there .... 42547: Fix the model used for embedded tests. 42659: Add missing test model 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR 42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 42657: Fix for ALF-16359 Fix SOLR logging in production and other environments 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR working copy sync r42514 through r42659 43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 42363: ALF-16213: renaming versioned file results in file being deleted. 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX: 42389: CLOUD-796: handle unknown custom content/folder type 42396: CLOUD-796: handle unknown custom content/folder type 42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: 41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly 42406: CLOUD-796: handle unknown custom content/folder type 42409: CloudSync: CLOUD-796 / ALF-16226 - hide sync props in forms (eg. edit props) for sync'ed custom content type 42428: ALF-16217: Remove unnecessary restriction on content type 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity 43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX: 42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170) 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock 43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled"" 43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef) 43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31 43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect" 43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button. 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" 42868: Fix failing build tests + further/revised public api tests 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary" 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete 42899: Fix build 43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174) 43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8" 43234: CLOUD-313: Implment Transport pooling in email sender. 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV) 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX: 43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931) 43819: Fix merge error 43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX: 39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0. 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats) - Patched POI to: - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second! - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part. - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format - handle -ve fractions (just did not work) - limitations: - custom text gets stripped (still better than before) - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before) 43564: CLOUD-939: <Record Only> 43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats - Original jar did not get removed in previous commit << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >> 43823: Fix merge error 43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43579: Public api test, fix intermittent test failures (hopefully) 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS" 43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX: 38211: CLOUD-115 - Remove Network Admins on downgrade to free/public 43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS" 43762: Fix the build 43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX: 39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that much slower even for western encodings - It still does csv and xml to pdf - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf) The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used. - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason. - transformer.complex.Text.Image now has a wild card first transformer for the same reason. - Allow transformer config element supportedTransformations to wild card source or target mimetype 39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Fix build failures (not sure about RecordsManagementAuditServiceImplTest) - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox 40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses. 40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper, including fixes that existed on only one or the other. - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as an input. They do support it in other file types but not text. JOD now works, but OOo still has problems. 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)" 43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43762: Fix the build 43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX: 40859: public api: 40862: CLOUD-555: "Updating comment fails because node not found" 40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property" 40979: Added tests for non-numeric params and non-european characters 41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2: 41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId" 41097: Added quickshare and cloudsync to cmis filter list 41098: Renamed serializer/deserializer lists for RestJsonModule 41099: Cleaned up consistent Rest responses - CLOUD-574 41100: Meta info webscript is disabled because its not been reviewed / in the correct format 41104: Meta info webscript is really disabled because its not been reviewed / in the correct format 41105: Added key for trusted layer7 relationship 41137: Public api: 41146: Fix trusted authentication against OpenCMIS 41168: Public apI; 41169: CLOUD-565: "API / URL returns a "tenant required" error" 41170: public api: 41171: public api: 41172: public api: 41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting" 41186: Fix solrcore properties 41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before 41282: CLOUD-616: "CMIS API: Repository names should be more descriptive" 41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400" 41325: Public api: 41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204" 41369: Public api: 41422: Sample OAuth call for the Resource Owner Password flow 41427: Sample OAuth call for the Client Credentials flow 41433: Public api: (1) parameterize site members/people sorting in service api 41434: Public api: minor comment service fix 41438: CLOUD-629: "REST API: It is possible to add a comment to comment" 41439: Public api: fix for default tenant id in CMIS requests 41449: CLOUD-629: "REST API: It is possible to add a comment to comment" 41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library" 41457: Fix build 41461: Public api: more tests 41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items" 41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException 41607: CLOUD-668 : changed ordering so errors fire in correct order. 41628: Public api: more tests 41672: CLOUD-672: "404 Error when browsing child files/folder " 41673: Public api: more tests 41675: CLOUD-674: "Root network calls need to return application/json content type" 41790: CLOUD-629: "REST API: It is possible to add a comment to comment" 41791: CLOUD-629: "REST API: It is possible to add a comment to comment" 41793: CLOUD-629: "REST API: It is possible to add a comment to comment" 41823: Public api: more tests 41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging 41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier" 41867: CLOUD-711: "It should be possible to remove a favourite site" 41957: Public api: - error handling improvements - more tests 41970: Public api: - fix build (add missing files) 41972: Public api: - more tests (including OpenCMIS TCK) 42046: Added some debug timings. Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug 42058: Public api: changed logging package name 42124: Public api: - more tests - minor fixes 42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing" 42126: Public api: fix up OpenCMIS tests 42171: Consistency fix for CLOUD-695. 42180: Fix build 42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests 42214: Public api tests (cmis) 42251: Changed the serializer for embedded entities, (related to CLOUD-746) 42253: Fix build 42735: (RECORD ONLY) Fix build (fix merge error) 43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder 43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls. 43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query. 43881: Revert CLOUD-942: Reverse merge r43830 43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests. 43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files) 43924: Disable intermittent OpenCMIS tests 43925: Disable intermittent test 43952: CLOUD-993: Insure login button is shown when user isn't logged in. 43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login 44196: CLOUD-678 - Incorrect link for 'To change your notifications settings, go here.' message 44201: CLOUD-486 - Choose UI language 44202: CLOUD-487: Fix emails after merge of template refresh and localised mail features 44414: JAPANESE: Cloud email template translation 44622: Fixes: CLOUD-1037 - removes unnecessary elements from inside the a tag. 44623: Cloud-189 - Corrects text and layout for already created email templates. 44624: Fixes: CLOUD-1044: Updates Email template 44625: Fixes: CLOUD-1042: Updates Email template 44626: Fixes: CLOUD-1043: Updates Email template 44627: Fixes: CLOUD-1041: Updates Email template 44764: CLOUD-1080: Fixes encoding error. 44767: CLOUD-1086: Text update to email template 44888: Email template updates - fixes CLOUD-1099 and CLOUD-1102. 44892: Fixes error with Activities email - the template fails to process if the only activities are based on follow events. It now processes and gets sent, but with some confusion, see CLOUD-1123 44914: Fixes CLOUD-1097 - Alt text not displaying due to unspecified image dimensions and colour. Also minor code clean up. 45145: CLOUD-1123 - Filter out "Following" activities from activity feed email. 45251: Email template text updates following review. 45289: Fix issue where email was not sent for 'Invite People' 45306: Externalises strings for cloud emails 45316: Adds some defensive code to prevent unused variables being a problem for templates. 45328: Email translation updates 45334: Resolve CLOUD-1162: Ability to change sign-up, reminder and reset password timer durations via properties 45369: Fixes Following Email template 45376: Resolve CLOUD-1172: Following email does not show domain correctly 45401: Corrects layout bug in email template 45407: Removes unnecessary full stop. 45408: Adds missing email template translations 45430: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH: 45329: FRENCH: Cloud translation updates based on EN r45266 45330: GERMAN: Cloud translation updates based on EN r45266 45332: SPANISH: Cloud translation updates based on EN r45266 45333: JAPANESE: Cloud translation updates based on EN r45266 45427: SPANISH: Cloud 1 translation updates based on EN r45266 45453: Fix for CLOUD-1164 - Failed login is not handled correctly (on email refresh branch) 45474: Fixes: CLOUD-1189: Incorrect variable used in translated property files. 45484: Fixes: CLOUD-1190 incorrect quote marks in JA file 45487: CLOUD-1186: Fixes issue with reminder emails not being localised. 45501: Potential fix for: CLOUD-678 45503: Resolve CLOUD-1188: Emails are not rendered as HTML, even though they are HTML 45539: Resolve CLOUD-1195: Invite people email not rendering as HTML, even though it is HTML 45559: CLOUD-1197: Fixes issue with reset password template not recognising all the variables in all cases. 45579: Resolve CLOUD-1186: Email not localized, CLOUD-1202: Invite people / Invite site email sometimes comes in English and is not localized 45609: Resolve test failures introduced fixing CLOUD-1186 45613: Resolve CLOUD-1210: Locale is not replicated across tenants if a user has been invited to one or more secondary tenants 45616: Resolve CLOUD-1205: activities email template the feed are not localized 45642: Fixes: CLOUD-1211 and CLOUD-1212 - externalises two hard coded strings. Translations to follow. 45645: CLOUD-1205: activities email template the feed are not localized 45646: CLOUD-1203: Invite to Site and site reminder the role should be localized 45654: ALL LANG: Translation updates to email templates, following fixes made for CLOUD-1212, CLOUD-1211. 45678: Removes hidden chars at start of the file. 45680: Fixes more hidden chars that the start of UTF8 files. 45683: Fixes: CLOUD-1216: Typo in Italian properties file. 45693: Resolve CLOUD-1204: Task type in the workflow emails are not localized 45702: Minor translation updates following linguistic review. 45717: GERMAN: Translation updates based on linguistic review 45719: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1/ to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH: 45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import) 45797: Resolve CLOUD-1226: The task details are not showing in localized details in task list 45798: Fix single quote encoding in language property file (related to CLOUD-1230, but does not resolve it across the board). 48304: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 48301: CONV: Revert temp logging (added in r47356) 48303: CONV: Fix CLOUD-1449 - cannot login to Share as MT (admin) user 48306: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47379: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (note: web.xml reverted - initially will be covered by cloud overlay until public api is "merged") 41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1: 41677: No-op skeletons of Public API gateway filter and URL rewrite filter 41683: Url rewrite rules for new and old-style public api 41705: First working version of gateway filter 41732: Trim authenticator keys from config 41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling 41753: SSL support for accepting self-signed certificates 48307: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47382: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41842: CLOUD-619: "CMIS query for objectId throws exception" 47400: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41790: CLOUD-629: "REST API: It is possible to add a comment to comment" 41791: CLOUD-629: "REST API: It is possible to add a comment to comment" 41793: CLOUD-629: "REST API: It is possible to add a comment to comment" 41823: Public api: more tests 41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging 48310: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47406: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1: 41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource 41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD) 41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource 47408: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1: 41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob 41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist 48311: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47416: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1: 41867: CLOUD-711: "It should be possible to remove a favourite site" 41957: Public api: - error handling improvements - more tests 41970: Public api: - fix build (add missing files) 41972: Public api: - more tests (including OpenCMIS TCK) 42046: Added some debug timings. Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug 42058: Public api: changed logging package name 42124: Public api: - more tests - minor fixes 42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing" 42126: Public api: fix up OpenCMIS tests 42171: Consistency fix for CLOUD-695. 42180: Fix build 42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests 42214: Public api tests (cmis) 42251: Changed the serializer for embedded entities, (related to CLOUD-746) 42253: Fix build 42320: Fix build (fix dodgy merge) 48313: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47492: Fix build/tests - CMISTest.testCancelCheckout & OpenCmisLocalTest.testALF10085 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-03-19 14:16:01 +00:00