mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
380 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Neil McErlean
|
9e9357088b |
Refactoring 'special facet id' handling as the injection of special values has broken the build. ACE-2639.
Sadly I'm going back to hard-coded special values. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Neil McErlean
|
061793131f |
Fix for ACE-2639. Recent changes injected the SolrFacetHelper as a spring bean, but it was still being constructed within the Search constructor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Neil McErlean
|
e52aede98f |
Additional handling for "special" facet IDs (SITE, TAG etc). Part of ACE-2639.
This check-in ensures that those facet IDs are not prefixed with the '@' char like all other facet IDs. The list is currently injected from solr-facets-context.xml, which required a slight refactoring of spring beans to make SolrFacetHelper a bean. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
Kevin Roast
|
0f73edbd0a |
ACE-2620 - ensure ResultSetMeta.hasMore is always available even if a search fails due to query parser error.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
Mark Rogers
|
0f69ce51fe |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85093: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
84714: Fixed NPE when spellcheck def is not present in search.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Mark Rogers
|
5142297ac0 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85082: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
84493: ACE-2637: Initial implementation of spell-check feature.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Mark Rogers
|
1481a5481e |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84758: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
80284: ACE-2213
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Alan Davis
|
06b9014607 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84168: ACE-2773 (Amend document versions panel component for further extending possibilities) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Alan Davis
|
f422aaf88e |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83971: ALF-21100 - defensive code improvement around handing of invalid Search operator option. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Alan Davis
|
3a2bd598d0 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83858: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
82984: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer
Initial basic store list and child listings
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Will Abson
|
ac4213cd9c |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80871: Fix for ALF-20896. ScriptNode.childByPath should return null for no child. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Will Abson
|
c717551907 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
79326: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
79090: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
- Removed references to http://www.jcp.org/jcr (left in web-scripts-application-context.xml
and multiple versions of opencmis-gnamefilter-context.xml)
78990: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
- Removing references to "jcr-xpath" - Biggest changes were to: DocumentNavigator, NodeServiceXPath and NodeSearcher
- SearcherComponentTest has a lot of tests removed that appeared to be JCR specific
- There are still a lot of namespace references in XML files to http://www.jcp.org/jcr/1.0 etc.
- Left a few references to "JSR 170" and JCR in java classes as they looked like they might be common with other bits.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Erik Winlof
|
e94f8f8351 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
75801: ACE-2149: EOL AVM / WCM
- Thorough sweep of 'avm' and 'wcm' references
- Picked up on many 'deployment' and related classes and configuration
- Repo starts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Erik Winlof
|
0baa0f74f4 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
75700: ACE-2149: EOL AVM / WCM
- Remove most of the AVM and WCM beans, scripts, classes, patches, etc
- The Explorer client is very broken for compilation
- TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
I've murdered many of the classes and beans but there's more to do
- The repository compiles
TODO: Get it running again
- TODO: Check if we can wipe the 'deployment' project as well
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Will Abson
|
5d80ebd215 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78695: ACE-2309: Edit in Google Docs™ option missing
- Define a registrar bean which can be used by extensions to add custom responses to the original list defined in slingshot-context.xml
- Abstract bean is named registerSlingshotCustomResponse, developers just need to add the key and value properties to a new instance to add them
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@79004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Stefan Kopf
|
2e5687473e |
Revert r78925 to fix ACE-2393
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78933 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Stefan Kopf
|
6e745c53ec |
ACE-2379 - 'Edit online' action is not working
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Mark Rogers
|
017af1a65c |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
76635: Merged EOL2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
76545: ACE-2016: EOL Google Docs v1 in 5.0
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Mark Rogers
|
97db4de531 |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75639: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
75253: Merged DEV to V4.2-BUG-FIX (4.2.3)
75193 : MNT-11771 : Disabling thumbnail also disables Share preview
- Provide force parameter to ignore system.thumbnail.generate
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Mark Rogers
|
0b2efd4d2c |
Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75134: Merged BRANCHES/DEV/KEVINR3 to BRANCHES/DEV/HEAD-BUG-FIX
71905: Merged BRANCHES/DEV/KEVINR2 to BRANCHES/DEV/KEVINR3
71779: Activities prototype - PDF Previewer link to original PDF correction
71776: Activities prototype - Slingshot download urls for Image Preview dashlet and PDF Previewer components.
71752: Activities prototype - Added activity feed items for Preview and Download actions
71913: Activities prototype - styling and UX
72000: Activities prototype - improved CSS
73462: Activities prototype - CSS tweaks
75128: Activities prototype - CSS tweaks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
David Draper
|
cf0542eb10 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70692: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
69799: ACE-1605: Fixed Created and Modified date filters.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
David Draper
|
1b5a5dd2ec |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70683: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
69739: ACE-1615: Corrected spelling error.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
David Draper
|
13c1057ba7 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70682: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
69736: ACE-1615: Fixed the search result to return empty arrays for field facets, when no facet queries are available.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
David Draper
|
ad28258976 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70680: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
69081: ACE-1265: Fixed the selected Date/Size range filtering
- Added insertion index for the facet label, to help the Date/Size sorting labels in the UI.
- A minor optimization in SolrFacetHelper.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
David Draper
|
4d920b21e9 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70675: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
68557: ACE-1265: added Created date, Modified date, and Content size bucketing. Also, refactored the facet display label implementation.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
David Draper
|
00ef38d6e8 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70596: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
67363: ACE-1264, ACE-1270: added support for the facet value results, to include display-name for userID and mimetype.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
8199f45483 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70544: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
66789: Merged BRANCHES/DEV/KEVINR to BRANCHES/DEV/WAT1 (all faceted search prototype commits)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Kevin Roast
|
c9b4f63a3f |
Fix for MNT-11408 - change to use the only 'safe' Thor only codepath to avoid early THOR data hack from THOR-293
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@69652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Mark Rogers
|
2bae32c638 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68150: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
67768: MNT-10362 Disabling QuickShare throws exception and previewer fails to load.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68432 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Mark Rogers
|
a701724cb9 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68135: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
67592: MNT-10362: Merged DEV to V4.2-BUG-FIX (4.2.3).
66140: MNT-10362 Disabling QuickShare throws exception and previewer fails to load
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Will Abson
|
28060c9cdf |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66650: Merged WAT2 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
65775: Performance improvement to UsernamePropertyDecorator - avoid pointless person.exists() test and use getPersonOrNull instead.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Will Abson
|
1ba34f2b11 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66625: Merged WAT2 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
64718: Merge of Live Search revs 59081-60158 from BRANCHES/DEV/KEVINR - pt1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
7e996f6011 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65597: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
65480: Merged DEV to V4.2-BUG-FIX (4.2.2)
65466 : MNT-10985 : Full path is shown in WebScript error page when AlfrescoRuntimeException is launched
- Use webscript store relative path for webscript name.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
05e0f93494 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60598: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
60375: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
60154: Merged DEV to V4.1-BUG-FIX (4.1.8)
60062: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect
property being set to 'false' in the contentModel.xml
Added loading of default properties from Dictionary for versionable aspect.
60063: MNT-9369 : Addition of the cm:versionable aspect through the Share UI sets the cm:autoVersionOnUpdateProp=true regardless of the aspect
property being set to 'false' in the contentModel.xml
Added a test to simulate the issue.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
350b8883ef |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60032: Merged BRANCHES/DEV/43UIDEV to HEAD-BUG-FIX:
This branch contained the Aikau and Surf framework updates implemented during the development hiatus post-4.2 completion. This features the change of Surf from 1.2.0 to Surf 1.2.1 which is for v4.3 releases only.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
ee70662f17 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59895: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59748: Merged DEV to V4.2-BUG-FIX (4.2.2)
59567: MNT-10278: "Format" column is empty for Dublin Core View
Implemented renderer for mymetype.
Added mimetypeDisplayName property to JSON root values to be able to display human readable mimetype description without additional calls from JavaScript code.
Added localized strings for unknown types in English and Russian languages.
Edited dublin_core view sample to use mimetype instead of cm:mimetype.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
3252a7a94e |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59064: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59042: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58919 : MNT-9205 : Search by IM property with spaces doesn't work
- Using correct regexp to split search term. Added a test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
135625b740 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58408: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
58267: MNT-7514 : Merged DEV to V4.2-BUG-FIX
58142 : MNT-7514 : Uninformational error message on move when file name conflicts
Added new failure message if file exists.
58263 : MNT-7514 : Uninformational error message on move when file name conflicts
Was corrected showing failure message for copy/move a file or folder.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
0995ee2824 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57480: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
57290: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
57279: Fix for MNT-9801.
I have very slightly refactored the configuration of thumbnails. Rather than inject system.thumbnail.generate into both CreateThumbnail- and UpdateThumbnailActionExecuter, I am now injecting it into the ThumbnailService centrally. I left the old injector methods for backwards compatibility, but deprecated them.
Now all requests to create a thumbnail via the ScriptNode API pre-check that thumbnail generation is enabled.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61822 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Alan Davis
|
144cae5c38 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57092: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
56577: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
56483: MNT-9629: Merged V4.1.5 (4.1.5.9) to V4.1-BUG-FIX (4.1.7)
56479: MNT-9719 CLONE - User search does not return results with "<firstname> <lastname>" search in admin console users page.
- Addition of an Alfresco global property people.search.honor.hint.useCQ, which may be set to false to switch back to just using Solr or Lucene as it was in 4.1.1
rather than the canned query used by the Share User Console
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
Samuel Langlois
|
eab5cddc79 |
Merged HEAD-QA to HEAD (4.2) - final one
r54310-54386 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Samuel Langlois
|
ab4ca7177f |
Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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
|
||
Dave Ward
|
4676411f41 |
Disambiguate new People.getPeople overload by giving it a new name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
Jan Vonka
|
6e5b951fe5 |
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
48055: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46833: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
30799: THOR-172: Switch Tenant via public API
46836: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
30853: Initial implementation of THOR-209. Webscript to get invitation/invitee status.
30855: More on THOR-209. Added siteTenantTitle to the webscript response.
30858: Apply generated cloud license
30859: Miscellaneous tidy-ups and refactorings, additional documentation and some webscript JSON additions. All as part of THOR-209.
30860: Miscellaneous doc improvements around the MT/Activiti workarounds.
30861: Removing unnecessary TenantUtil.runas in test code.
30863: THOR-204. Dev mode option to send invite/sign-up emails to spring-injected address.
30865: Temporarily disable subscriptions (followers) - pending ALF-9957
30866: THOR-175: Set and enforce file space quota for tenant
30868: Deleted obsolete/empty dir
30869: THOR-210: disable jobs that are not used/required (eg. AVM orphan reaper)
30870: THOR-209. Have fixed up issue with getting properties from completed workflow instances.
Changed invitation to use pathInstanceId instead of taskId as the 'id' for these workflows. Now consistent with signup. Commented in the test that calls invitee-status.get
30871: THOR-209. Adding the inviteeIsActivated value to the webscript response.
30872: THOR-204. When emails are sent to the dev-only, spring-injected email address, the subject is now prefixed with the orig
30879: THOR-209. Making sure inviteeIsActivated is present for both in-flight and completed workflows.
30883: Resolve THOR-212
30895: THOR-172: Switch Tenant via public API
30896: THOR-209. Renaming some files so that they refer to invitation status rather than invitee status. Also added some documentation to make this dicstinction clearer. This is not a general purpose script to get the status of an invitee to a site. It is only for checking if a particular invitation workflow is complete and then getting some additional state data.
30897: THOR-175: Set and enforce file space quota for tenant
30900: Changing invitation-status webscript to auth=none; runas=Admin to support invitation flow of exteernal users. Part of THOR-209.
46845: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
30967: Invite & signup improvemengts
30969: Share Activities
30976: Remove unreliable hosts from isReachableDomain test
48066: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
46857: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35731: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31149: Initial Commit of Analytics Service
31150: Second draft of Analytics Service
31151: First cut of forms runtime supporting balloons on "blur" event as requested
31163: FORMS RUNTIME CHECKPOINT - before making the yellow mandatory only being displayed "on load and until focused"
31168: Refactored Analytics Service to be static
31170: Forms runtime as agreed in meeting
48067: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
46861: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35752: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31220: THOR-49. Implementation of Reset Forgotten Password workflow.
31227: (RECORD ONLY) Fix merge error
31237: Add email validation to registration and invite services:
31239: THOR-219: Merge fix (re-disable Repo<->SOLR ssl config)
48069: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
46864: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35754: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31240: MultiSelectAutoComplete now has configurable validation (& tooltips)
31241: Tenant site count usage/quota - exposed via Account API
31250: Made events enumerations
31251: Forgot to add AnalyticsEvent class to previous commit
31271: Attempt at fixing test dependencies and remove intermittent test
48070: Merged DEV/CONV_V413 to DEV/CONV_HEAD (NOTE! Added TenantXxxx classes and change in FormUIGet Will be removed in later revisions)
46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
30971: (RECORD ONLY) Creating SURF update branch for THOR1
30979: Commit initial Surf lib changes, Cloud classes and config overrides
30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
31076: Successful signup and page redirection
31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
31098: Updated Surf libs
31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
31133: Updated Surf libs and JavaDoc updates
31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
31229: Signup and invitiation completion updates
31242: Fixed up invitation, signup and tenant switching problems
31270: Fixed forms issue (can now create folders in doc lib)
31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
Added new test cases at the Java API level. (Was formerly just at REST API level).
31286: (RECORD ONLY) Reset solrcore.properties files
31297: Fixed FlashUpload problem
31298: Fixed application context only login
31302: Fixed no user profile image url issue
31306: Updates to TenantUserFactory to defensively handle missing tenant data
31326: Repo switch tenant fixes:
31356: Resolve switch tenant niggles, with assistance from Erik:
48072: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46934: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
46930: Adding extension point to forms runtime's FormUIGet for modifying submission url
46937: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35762: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31408: Latest Spring Surf Libs (including SubComponentEvaluator param tokenization fix for THOR)
31409: Tenant usage/quota -> person count
31412: RM module cleanup & almost finsihed THOR-287 & THOR-288
31434: Fix Thor Share eclipse project
48073: CONV: Fix slingshot eclipse .classpath (add freemarker dep)
48074: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46940: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31450: Additional DB query support in Repo/Core
31451: Tenant people count (internal + total) usage/quota
31453: Fix issue uploading small files which resulted in zero byte content
31456: Fix paging and total count (1000+) when listing accounts
31457: THOR-312. Addition of NETWORK_ADMINS group authority.
31461: THOR-314. I've overridden people.get with a cloud-specific template.
This adds an isExternal JSON field to each person object.
31463: THOR-316 webscript filter on people.get for isInternal, isExternal.
Overridden people.get.desc.xml and .js in the cloud module in order to add query param
and add additional filtering.
31464: Base work for THOR-178 "F5: Existing user has forgotten password and needs to reset it"
31468: THOR-321 Create cloud:networkAdmin aspect.
31469: THOR-315 Return isNetworkAdmin in overridden people.get webscript.
31470: THOR-275: Add simple caching (for PropertyUniqueContext - used via AttributeService)
31471: THOR-318 people.get has new cloud query parameter 'networkAdmin'
31477: THOR-275: temp build fix
31479: THOR-324 Demote user from admin.
New method on RegistrationService to demote a user from NetworkAdmin and tests.
31484: THOR-319. Fixing maxResults on people.get when internal/external/admin filtering is applied.
This issue is not really resolved, but I've commented the code to illuminate the issue.
31485: THOR-275: fix build/test
31486: Working forgot password for THOR-178 (problem accessing the reset-password email link though)
31488: THOR-184: Disable user usages
31495: F156: Allow super system admin to login to any tenant
31496: Fix for personExists since hiding admin
31500: THOR-178
31501: THOR-329 Add a get-reset-password status webscript.
31503: Finished forgot password flow THOR-178
31507: THOR-328: add fixed adjustment (for people usage)
31508: Back out some of the hidden admin changes
31509: Revert mistaken check
31510: THOR-326 Changes to DAO layer to allow update of account type.
31513: Cloud Console updates
31514: Switch Network now uses tenants from the user object (instead of making a remote call)
31515: THOR-326 Changes to the REST & Service layer to allow update of account type.
48075: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively record-only - no changes)
46849: Merged PATCHES/V4.1.3 to DEV/CONV_V413
46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
- Improved fix that uses the bridge table cache if it is available
- Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks
- Overall number of results can be cut off with system.workflow.maxPooledTasks
48076: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46855: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35706: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31049: THOR-175: set and enforce per-tenant quota
31053: THOR-204: Add dev email mode option
48077: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
46944: Merge fallout - fix compile error.
48078: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already fixed - no changes)
46858: Fix compile error
48079: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46953: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31516: Hidden admin - attempt 2
31517: THOR-326. Update to REST-cient rcq file following 31515, which allows for account upgrade.
31518: THOR-326. DaveC asked me to move the paid business account type out of test config and into product config.
31519: After tenant switch the client side resources are more sensitive (new requires /res) which it didn't before. This solves the webpreview bug and some other minor stuff.
31520: THOR-175: Set and enforce file space quota for tenant
31522: THOR-330. Return Account Class data in Account REST API.
31523: THOR-330. Added new rsp data into desc.xml sample response.
31524: THOR-322: refactor tenant file usage/quota
31525: Skip activity post lookups that have exceptions
31526: Root webdav to st:sites for now (as per current beta.alfresco.com)
31528: THOR-323 & THOR-324 Promotion and demotion of users to/from NetworkAdmin.
31534: Account Summary now also displays name & summary
31535: Fix for THOR-320. Alfresco logo image in the various Cloud emails is broken.
31538: Account Summary now handles -2 & MultiSelectAutoComplete doesn't bounce when selecting first item
31540: Implementation of THOR-335 webscript for account-types.get
31541: Account Summary now displays date correctly
31542: Some paths to client side resources that were missing "/res" in the path
31547: Various label changes according to Kathryns docs & some new login/forgot password links in invite/signup forms
31555: Refactored Analytics Service to send JSON Analytics properties
31557: Some changes to cloud email templates following feedback from Kathryn, Erik.
31558: THOR-322: refactor tenant file usage/quota
31559: Turned 'sign up' email URLs into links rather than text. Yes, we'll make these buttons at some point but I just want them to be clickable for now.
48080: Merged DEV/CONV_V413 to DEV/CONV_HEAD (UI ONLY)
46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31563: THOR-123: modules are no longer started for each tenant
31566: Update account class display names:
31567: THOR-123: temp' put back "applyToTenants=true" ...
31575: THOR-123: pre-req
31579: Fix issue where setting a preference meant that the person could no longer login:
31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik.
31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106.
31584: THOR-123: pre-req
31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest
31590: Account changes
31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com
31592: Added isNetworkAdmin
31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden
31594: Disabling test again pending proper fix. THOR-106
31595: Reduce log level
31600: THOR-123: mark modules with "applyToTenants=false"
31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden)
48081: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46955: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35779: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31605: (RECORD ONLY) THOR-336. Fixing /res/themes URLs in activity emails.
Fix /res/themes URL in newly located activity emails.
48088: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46874: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35709: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31054: Fix for email templates (getDirectReadableChannel -> File does not exist)
46875: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35711: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31055: Re-enable activity feed notifications and subscriptions (followers)
48094: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46894: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35759: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31386: Added some tenancy-awareness to ActionService.
31388: Addition of accountTypeId to metadata.get webscript.
31391: Fix for unreported issue that arises from the invitation workflow having moved from the system to the inviter tenant.
31392: Build fixes: Add pseudo-support for tenant switching in web script test f/w
31393: The final fix for the 'external user invites other external user' scenario.
31398: Tenant usage/quota - site count
31405: Build fix for failing ActionService tests. Compensating actions were not running on the correct tenant.
31407: Resolve THOR-248: Extensions is not deployed as part of the build
48095: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)
46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
30971: (RECORD ONLY) Creating SURF update branch for THOR1
30979: Commit initial Surf lib changes, Cloud classes and config overrides
30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
31076: Successful signup and page redirection
31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
31098: Updated Surf libs
31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
31133: Updated Surf libs and JavaDoc updates
31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
31229: Signup and invitiation completion updates
31242: Fixed up invitation, signup and tenant switching problems
31270: Fixed forms issue (can now create folders in doc lib)
31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
Added new test cases at the Java API level. (Was formerly just at REST API level).
31286: (RECORD ONLY) Reset solrcore.properties files
31297: Fixed FlashUpload problem
31298: Fixed application context only login
31302: Fixed no user profile image url issue
31306: Updates to TenantUserFactory to defensively handle missing tenant data
31326: Repo switch tenant fixes:
31356: Resolve switch tenant niggles, with assistance from Erik:
48109: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46917: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons)
35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
46918: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot)
35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
46919: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35768: Fix compile issue from merge
46921: Merge fallout - fix compile error.
46949: Test fallout
47126: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35964: Spring Surf library refresh
35995: Fix merge issue
35999: Fix merge issue
47144: Fix merge/test failures (WCMTestSuite)
47539: CLOUD-1375 - fix WCM unit test fallout: SandboxServiceImplTest.testDeleteSandbox + WebProjectServiceImplTest.testDeleteWebProject
48111: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31563: THOR-123: modules are no longer started for each tenant
31566: Update account class display names:
31567: THOR-123: temp' put back "applyToTenants=true" ...
31575: THOR-123: pre-req
31579: Fix issue where setting a preference meant that the person could no longer login:
31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik.
31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106.
31584: THOR-123: pre-req
31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest
31590: Account changes
31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com
31592: Added isNetworkAdmin
31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden
31594: Disabling test again pending proper fix. THOR-106
31595: Reduce log level
31600: THOR-123: mark modules with "applyToTenants=false"
31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden)
46956: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35782: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31607: "Hide everything but the doclib" customizations
- Dashlets adjustments
* Addons RSS feed - hidden
* Site Calendar - hidden
* Content I'm editing - added <@markup> extension points so blog, wiki & forum sections are hidden by cloud extension module
* Site Data List - hidden
* Site Links - hidden
* Wiki - hidden
* User Calendar - hidden
- URL rewrites
* Forgot & reset password urls now prettyfied, not using "-default-/"
- Duplicated slingshot presets to avoid future slingshot changes popping up in the cloud
31611: MT: fix ability to delete a disabled tenant
31612: THOR-339: Disable/enable logins for a network (account update)
31621: THOR-106. Taking a failing test class out again, pending fix. Hmmmm.
31623: THOR-357 - support shared CMIS dictionary
48112: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
46957: Test fallout
48113: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - already pre-merged)
46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
30971: (RECORD ONLY) Creating SURF update branch for THOR1
30979: Commit initial Surf lib changes, Cloud classes and config overrides
30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
31076: Successful signup and page redirection
31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
31098: Updated Surf libs
31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
31133: Updated Surf libs and JavaDoc updates
31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
31229: Signup and invitiation completion updates
31242: Fixed up invitation, signup and tenant switching problems
31270: Fixed forms issue (can now create folders in doc lib)
31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
Added new test cases at the Java API level. (Was formerly just at REST API level).
31286: (RECORD ONLY) Reset solrcore.properties files
31297: Fixed FlashUpload problem
31298: Fixed application context only login
31302: Fixed no user profile image url issue
31306: Updates to TenantUserFactory to defensively handle missing tenant data
31326: Repo switch tenant fixes:
31356: Resolve switch tenant niggles, with assistance from Erik:
48114: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46962: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
40147: (RECORD ONLY) French: Cloud Translation update from Gloria (based on EN rev38372)
42709: (RECORD ONLY) FRENCH: Translation updates based on EN r42416
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
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.
44031: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
44032: (RECORD ONLY) GERMAN: Translation updates based on EN r43703. Corrects missing line break.
45329: (RECORD ONLY) FRENCH: Cloud translation updates based on EN r45266
45330: (RECORD ONLY) GERMAN: Cloud translation updates based on EN r45266
45332: (RECORD ONLY) SPANISH: Cloud translation updates based on EN r45266
45333: (RECORD ONLY) JAPANESE: Cloud translation updates based on EN r45266
45427: (RECORD ONLY) SPANISH: Cloud 1 translation updates based on EN r45266
45718: (RECORD ONLY) ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
45838: (RECORD ONLY) FRENCH: Cloud Translation update based on EN r45266
45966: (RECORD ONLY) Translation update to fix CLOUD-1270 in FR and ES
46365: (RECORD ONLY) ALL LANG: Translation updates based on EN r46289
46366: (RECORD ONLY) ALL LANG: Updates copyright year to 2013
46377: (RECORD ONLY) ALL LANG: Adds strings missing from previous commit.
47192: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (record-only - WebDAV mostly resolved as part of 36117 merge)
36408: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
36404: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
36060: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used.
36083: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used.
47369: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
41180: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
40482: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
- ALF-15453: Incorrect manage permissions working for a file/folder
Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
40486: ALF-15453: Incorrect manage permissions working for a file/folder
47377: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
41048: (RECORD ONLY) Merged DEV/V4.1-BUG-FIX to DEV/CLOUD1
40382: Fix for ALF-15491 SOLR is generating queries for lucene style cross-language support
40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions
Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots
40662: Eclipse classpath fixes
41032: Fix for ALF-15753 Infinite loop during Solr ACL indexing when ACL Changeset batch is empty
47393: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
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
47412: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
42252: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
47429: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
47433: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
47435: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
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
47485: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
44203: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
44200: Probable fix for ALF-16895 SOLR: Cannot find files after restart and reindex solr
44276: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- fix initial cache state to cope with duplicate leaf/aux doc entries.
44314: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- fix incremental cache state to cope with duplicate leaf/aux doc entries.
47523: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
44573: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
44572: Clean up of unused files.
44576: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
44691: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
44689: [CLOUD-1072] Add public api url to CORS filter mapping. Move CORS filter mapping to live above the publicapi filter mappings. OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication.
47548: Merged DEV/CLOUD2 to DEV/CONV_V413
46931: Overriding form runtime's submissionUrl using extesnion point in FormUIGet
46984: Overriding entire sent-invites.js (instead of modifying the core slingshot code) with a copy of the core code modified to work with the cloud invite apis.
46986: Overriding help pages config in cloud-config.xml (rather than modifying the core files!)
47553: Merged DEV/CLOUD2 to DEV/CONV_V413
47421: Overriding entire sent-invites.get ftl & properties (instead of modifying the core slingshot code) with a copy of the core code modified to fit the cloud requirements.
47442: Add web overlay for share + tune embedded librairies
47455: Add dependency on jetty-webapp to compile the tests
48115: CONV: Fix cache defs (propertyUniqueContextCache & siteNodeRefCache)
48117: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46959: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35790: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31624: Resolve THOR-302: transformation-client-1.0.0-SNAPSHOT.jar not in alfresco/WEB-INF/lib:
31632: More reliable test, hopefully
31644: Fix unreported issue in aws-context.xml.sample (not well-formed XML)
31645: Customized invite links to use "cloud dialog" instead of "invite page" for the following components:
31662: New Analytics events and tests
31663: New Analytics events and tests
31678: Addition of isExternal data to site membership webscripts.
48118: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46960: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31684: THOR-367 - #1 Within Site
- Remove all page components other than site dashboard, document library and members
- Remove customize site
31685: New lightweight webscript to retrieve user/network metadata about the currently authenticated user in the current tenant.
31693: THOR-365: Private site cannot be access (since surf-config is not imported) - causes: Could not resolve view with name ...
31695: THOR-367 - #2 Document Library
- remove Create Content... menu
- remove actions: manage aspects, change type, publish, manage rules (for folders)
- document-details page: remove publishing history panel
31697: For reference only: update description of cmis/test webscript
48119: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
46972: Fix test fallout (re: THOR-293)
48120: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)§
47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373).
31809: Parameterized signup url & email
31812: THOR-373 Pending invitations.
31814: Made changes to way aid is captured ready for allowing events to override aid if needed
31820: Mapping of network admin to system admin part 1:
35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page"
31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL
31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
31784: Fix up unit test.
31833: Email validation now allows 7 character long top level domain (so we can do tests with example)
31834: New form colors for invalid & mandatory fields
31837: THOR-327 - remove bootstrapped guest / guest@<tenant>
31838: THOR-327 - remove bootstrapped guest / guest@<tenant>
31844: Added missing headers to Java files.
31845: Mapping of network admin to system admin part 2:
31846: Addition of very basic test script for the Script API of AnalyticsService.
35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31853: Forms refactor first cut - for review
31855: THOR-387. Analytics event for user activation is sent.
31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest.
31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
31841: Build Fix
31868: THOR-361: Fix /service/index
31881: THOR-387. Adding analytics event for site invitation.
31882: THOR-387. Fixing analytics event for site invitation.
31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings
31884: THOR-387. Analytic event callouts for site invitation response.
31899: Revert solrcore.properties checkin
31900: THOR-249: override edition interceptor
31901: Fix for THOR-396. Spelling mistake on signup screen.
31902: Resolve THOR-251: Update the Help URLs for Cloud
31904: Resolve THOR-403: -system- tenant not found logged from server
31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value)
31919: Logout page refactoring
31925: Create site now resets form before show using forms-runtime's new "reset" method
31926: Disable flash upload
31927: THOR-363: increase initial file quota
31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too
47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31933: THOR-387. Analytics.
Added analytic call for account registration (the initial signup, not the activation, which was added previously).
This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters.
The same parameter is now mandatory on the RegistrationService.
Impacts on test code.
Changed the rest-client .rcq file to show new required parameter.
Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null.
Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup.
31939: THOR-404: disable JBPM
31943: THOR-387. Analytics.
I've overridden upload.post.js to add analytics data for file uploads.
31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme"
31947: Fixed THOR-308 "Invite user drop-down works incorrectly"
31948: Resolve THOR-384: It is impossible to create user administrator@'domain':
31949: Follow-up fix for case sensitive user names
31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked:
31959: Removing change-password override since user shall be able to change his password
31961: Fix tests after recent username/email address changes
31966: Grey Theme
31979: Dropping Analytics logging level down to 'warn' from 'debug'.
31982: Fixed THOR-419 "UI edits required"
31983: Fixed THOR-419 "UI edits required" part 2
32003: THOR-422. Spurious error logging during signup/registration (not activation).
This was because the analytics event action code assumed the user exists, which they don't do at registration, of course.
32004: Resolve undefined undefined seen in invite signup dialog
32006: Restricted tentant component now displays dialog instead of gray page
32007: THOR-300: fix AWS config
32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page"
32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error"
32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed)
48122: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47007: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
35817: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32250: (RECORD ONLY) Merged /HEAD to BRANCHES/DEV/THOR1: (ok'ed with DC/DG)
31750: Solr: Fix owner Id cache
31751: Fix for ALF-11104: add authenticated user to authorisations list in PermissionService + fix inconsistency in AuthorityService
31760: Correct Fix for SOLR owner ID cache
32172: Fixes for:
ALF-11521 Protect SOLR running against the wrong Alfresco DB
ALF-11602 Solr Core Tracker - does not need to re-init CMIS dictionary (when there are no model changes)
ALF-11621 SOLR old versions of tracked models are not getting deleted when models are updated
32234: Fix for ALF-11568 SOLR indexing is ignoring properties that are indexed but not tokenised and not stored - was WCMQS navigation is broken
32256: THOR-488. Tidy up account types.
32258: Login analytics event.
32260: Reduce logging on startup for enabled tenants (see also THOR-475 / THOR-81)
32262: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
32139: Fix for ALF-11599 - Section ''Others are Editing'' shows documents that should not be present
48123: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)
47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32019: Merged rev 32016 from THORSURF1
32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx)
32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads"
32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck
32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin)
32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants)
32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share
47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32041: Label changes according to Kathryn's "UI Text_scenario 5.docx"
32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled)
32058: Removed unnecessary borders from profile pages
32065: Fix build issue where cloud share war was not being cleaned before build
32066: Fix those pesky solrcore properties
32071: THOR-461: fix following email notification (to contain network/tenant ctx)
32076: Fix to disable error on unit tests
32077: Added logging to NullPointerException fix
35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32103: Finally! A fix for THOR-193. :)
32119: Fix for setting theme as network admin
32120: Improved text on upgrade account page
32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded.
32130: Fix for THOR-457. Already have an account email template needs updating/fixing.
32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants"
32140: Apply Beta logos and adjust about dialog for cloud
35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI)
32147: THOR-475 - improvement(s) to trim time to create tenant
32148: THOR-475 - improvement(s) to trim time to create tenant
32154: GreyTheme updates
32157: THOR-430: Forgot password dialog: UI text not what was suggested
32159: GreyTheme updates
32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search
32176: Signup page now cloud.alfresco.com
32179: THOR-475 - improvement(s) to trim time to create tenant
32184: Remove jargon from workflow names and descriptions
32185: Pesky solrcore.properties
35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL
32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users.
Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running.
Returning this flag through the Java API & REST API
Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are.
32198: Replace workflow text with task related text
32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds
32204: Build fix
32238: THOR-290: Configurable google-analytics tracking code script insertion
32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite.
32241: THOR-471: Added GetSatisfaction feedback widget
35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32266: Addition of createSite analytics recording.
32268: THOR-505: Disable (turnoff autostart) of unused subsystems
32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again)
32272: Resolve THOR-354: (None) displayed for network administrators
32273: THOR-499: New Relic monitoring updates
32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
32280: Fixed THOR-474 "Password Strength indicator does not conform with other leading website password indicators"
48125: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (repo pre-merge)
47053: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers)
32378: CollectionUtils method for collection intersection. Should be merged to HEAD.
32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage)
32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports"
32389: Fix for THOR-567 "userprofile broken"
32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant)
32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others
32414: Theme updates from linton
32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload"
32424: THOR-81: support for signup/activate scaling tests
48126: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47058: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons/3rd-party)
35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35830: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
48129: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47067: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35844: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
47069: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD. The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml).
35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project)
33022: THOR-662: Email templates should load/resolve (initially) from classpath
47071: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33090: ALF-10826: hidden aspect
33091: THOR-416: fix surf-config folder (appears where it shouldn't)
33093: Sweep through email templates.
47072: Fix merge error (FeedCleaner)
47073: Fix merge error (WorkflowTestSuite)
47074: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33104: Tweak to invitation email template
33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS.
Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco.
Set the limit to the empty string in core Alfresco, which means 'no limit'.
Applied the limit always.
Set the limit to 25Mb in Thor/alfresco-global.properties
Fixed a minor bug in error reporting due to previous exception renaming.
47076: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript
33135: Missing WebScripts sources JAR from r33134
33153: Resolve THOR-551: Password Hashes Need Review
33154: Update to latest email blacklist
33155: Fixed THOR-534 "Login Box shows scroll bars"
33156: Build fix for tests failing due to recent password changes
33157: Build fix for updated email blacklist
33172: THOR-776: Re-implement Share override as guided by Erik
33173: THOR-831: Text in Someone
35886: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33174: Latest SpringSurf libs - improved RemoteClient reused of connections per request thread.
33176: THOR-833: Search: clicking on All Sites returns no results
48131: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47098: (RECORD ONLY) Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35895: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
34105: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
33267: (RECORD ONLY) Created branch THOR1_SPRINTS (from THOR1 r33255)
33269: Snapshot of simple redeploy shell script (for AWS mini-dev/test env)
33272: JMeter test script
34106: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
33313: THOR-928: Added caching for i18n bundles provided by extensibility modules (latest Surf libs, r980)
48133: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47097: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
47099: Fix merge/compile error.
47103: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
47111: Fix merge error
47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
36053: 1st pass at upgrading to latest Spring Surf
36059: Fix CloudInvitationService tests for cloud1
47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
48135: Merged DEV/CONV_V413 to DEV/CONV_HEAD
46977: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35792: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31724: Can't compare pages using page.url.uri anymore since that doesn't include the tentant, now skips that part of the url and uses page.id instead.
31733: Add account info to user network web script
31736: Refactored RegistrationServiceImpl.promote... so that it uses the presence of cloud:personExternal aspect to prevent promotion of external users rather than account-based data.
35794: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31744: Account relates to url & various Share features now hidden in cloud
31746: 1/5 for THOR-341 "F147: Share features are disabled for external network member"
35796:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31756: THOR-265: Currently the first user to sign up to a dmain becomes the domain admin, and can view the full admin console. Is this going to change?
31771: Added stub for SimpleDBAnalytics Service
31772: Final interfaces and integration with SimpleDB for Analytics
31774: Modified landing_time key for MixPanel
31776: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member"
31777: Resolve test classpath since introduction of new thor libs
31779: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" part 2
31781: Resolve issue getting access to account settings when network admin of paid business account
31783: Implemented #2 for THOR-341 "F147: Share features are disabled for external network member"
31794: Minor changes after review with DavidC and NeilM
31797: Collaboration title improvement: Now hiding the html elements used to build the menu until the menu is created so ui doesn't bump and look ugly.
31799: Part #6 of THOR-367 "F60: Remove Share features not required for Cloud"
- 6) Document Selectors - root is Sites folder
31801: Removed ugly "extra" borders around some of the input fields in the user profile form
31802: Fixed part #7 of THOR-367 "F60: Remove Share features not required for Cloud"
- 7) Edit Profile - remove edit email from edit profile form
31804: Fixed part #5 of THOR-367 "F60: Remove Share features not required for Cloud"
- 5) Move... / Copy... dialog - remove repository - remove my user home
48136: Merged DEV/CONV_V413 to DEV/CONV_HEAD
47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373).
31809: Parameterized signup url & email
31812: THOR-373 Pending invitations.
31814: Made changes to way aid is captured ready for allowing events to override aid if needed
31820: Mapping of network admin to system admin part 1:
35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page"
31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL
31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
31784: Fix up unit test.
31833: Email validation now allows 7 character long top level domain (so we can do tests with example)
31834: New form colors for invalid & mandatory fields
31837: THOR-327 - remove bootstrapped guest / guest@<tenant>
31838: THOR-327 - remove bootstrapped guest / guest@<tenant>
31844: Added missing headers to Java files.
31845: Mapping of network admin to system admin part 2:
31846: Addition of very basic test script for the Script API of AnalyticsService.
35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31853: Forms refactor first cut - for review
31855: THOR-387. Analytics event for user activation is sent.
31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest.
31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
31841: Build Fix
31868: THOR-361: Fix /service/index
31881: THOR-387. Adding analytics event for site invitation.
31882: THOR-387. Fixing analytics event for site invitation.
31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings
31884: THOR-387. Analytic event callouts for site invitation response.
31899: Revert solrcore.properties checkin
31900: THOR-249: override edition interceptor
31901: Fix for THOR-396. Spelling mistake on signup screen.
31902: Resolve THOR-251: Update the Help URLs for Cloud
31904: Resolve THOR-403: -system- tenant not found logged from server
31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value)
31919: Logout page refactoring
31925: Create site now resets form before show using forms-runtime's new "reset" method
31926: Disable flash upload
31927: THOR-363: increase initial file quota
31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too
48137: Merged DEV/CONV_V413 to DEV/CONV_HEAD
47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
31933: THOR-387. Analytics.
Added analytic call for account registration (the initial signup, not the activation, which was added previously).
This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters.
The same parameter is now mandatory on the RegistrationService.
Impacts on test code.
Changed the rest-client .rcq file to show new required parameter.
Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null.
Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup.
31939: THOR-404: disable JBPM
31943: THOR-387. Analytics.
I've overridden upload.post.js to add analytics data for file uploads.
31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme"
31947: Fixed THOR-308 "Invite user drop-down works incorrectly"
31948: Resolve THOR-384: It is impossible to create user administrator@'domain':
31949: Follow-up fix for case sensitive user names
31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked:
31959: Removing change-password override since user shall be able to change his password
31961: Fix tests after recent username/email address changes
31966: Grey Theme
31979: Dropping Analytics logging level down to 'warn' from 'debug'.
31982: Fixed THOR-419 "UI edits required"
31983: Fixed THOR-419 "UI edits required" part 2
32003: THOR-422. Spurious error logging during signup/registration (not activation).
This was because the analytics event action code assumed the user exists, which they don't do at registration, of course.
32004: Resolve undefined undefined seen in invite signup dialog
32006: Restricted tentant component now displays dialog instead of gray page
32007: THOR-300: fix AWS config
32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page"
32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error"
32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed)
48147: CONV: fix merge issue - remove duplicate prop def (contentLimitProvider)
48148: Merged DEV/CONV_V413 to DEV/CONV_HEAD
merge fix for r48072
48149: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47111: Fix merge error
47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
36053: 1st pass at upgrading to latest Spring Surf
36059: Fix CloudInvitationService tests for cloud1
47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
48150: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively RECORD ONLY - no changes)
47173: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
36232: MT - fix pop of tenant ctx (to match push)
48154: Merged DEV/CONV_V413 to DEV/CONV_HEAD
47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32019: Merged rev 32016 from THORSURF1
32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx)
32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads"
32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck
32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin)
32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants)
32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share
47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32041: Label changes according to Kathryn's "UI Text_scenario 5.docx"
32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled)
32058: Removed unnecessary borders from profile pages
32065: Fix build issue where cloud share war was not being cleaned before build
32066: Fix those pesky solrcore properties
32071: THOR-461: fix following email notification (to contain network/tenant ctx)
32076: Fix to disable error on unit tests
32077: Added logging to NullPointerException fix
35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32103: Finally! A fix for THOR-193. :)
32119: Fix for setting theme as network admin
32120: Improved text on upgrade account page
32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded.
32130: Fix for THOR-457. Already have an account email template needs updating/fixing.
32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants"
32140: Apply Beta logos and adjust about dialog for cloud
35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI)
32147: THOR-475 - improvement(s) to trim time to create tenant
32148: THOR-475 - improvement(s) to trim time to create tenant
32154: GreyTheme updates
32157: THOR-430: Forgot password dialog: UI text not what was suggested
32159: GreyTheme updates
32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search
32176: Signup page now cloud.alfresco.com
32179: THOR-475 - improvement(s) to trim time to create tenant
32184: Remove jargon from workflow names and descriptions
32185: Pesky solrcore.properties
35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL
32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users.
Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running.
Returning this flag through the Java API & REST API
Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are.
32198: Replace workflow text with task related text
32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds
32204: Build fix
32238: THOR-290: Configurable google-analytics tracking code script insertion
32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite.
32241: THOR-471: Added GetSatisfaction feedback widget
35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32266: Addition of createSite analytics recording.
32268: THOR-505: Disable (turnoff autostart) of unused subsystems
32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again)
32272: Resolve THOR-354: (None) displayed for network administrators
32273: THOR-499: New Relic monitoring updates
32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
32280: Fixed THOR-474 "Password Strength indicator does not conform with other leading website password indicators"
47053: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers)
32378: CollectionUtils method for collection intersection. Should be merged to HEAD.
32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage)
32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports"
32389: Fix for THOR-567 "userprofile broken"
32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant)
32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others
32414: Theme updates from linton
32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload"
32424: THOR-81: support for signup/activate scaling tests
48157: Merged DEV/CONV_V413 to DEV/CONV_HEAD
Fixing merge issue from r48135
48158: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
47046: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32281: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 (ok'd with DC):
32242: ALF-11664 Moderated sites should use site.public.group (from SysAdminParams) for setting the group with general access, as Public sites already do, rather than hard coding the EVERYONE group
32283: Added "guest" to the list of blocked usernames, thereby showing failure to register guest@tenant.com, rather than allowing it and failing to activate the account later.
32285: THOR-505: Disable (turnoff autostart) of unused subsystems
32286: Fix NPE in AnalyticsProperties when empty json provided
32287: THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
32289: Miscellaneous changes to account types & classes.
32290: Change "recent activities" email notification interval from hourly to daily
32292: Resolve THOR-516: Check all email template URLs point to cloud.alfresco.com not www.alfresco.me
32293: THOR-517. Insert Signup Analytics Event into Site Invite process.
32305: Fixed THOR-306 "Invite user autocomplete not working correctly"
32308: THOR-529: Red "No items" in doc lib when adding 1st document into a x-network site (WebDAV error in log)
32309: Fixed THOR-306 "Invite user autocomplete not working correctly"
32314: THOR-520: Change workflow in tooltip text to task
32318: THOR-532: Improve auto-generate of home site shortname (in case of clash)
32339: Updated analytics events to include parameter
32342: Additional debug logging as part of THOR-544.
32376: THOR-574: Accept invite while logged in displays 'you've declined...' message
48163: Merge CONV_V413 to CONV_HEAD
46713: Set Maven version in POM files to 4.1.3-CONV-SNAPSHOT
46741: Deploy SPP jar file (aka VTI) into Maven repository as well
47440 RECORD ONLY: Declare dependency on Surf 1.2.0-SNAPSHOT in Maven poms
47450 RECORD ONLY: Bring Chemistry OpenCMIS libs back into the wars
47579 RECORD ONLY: Switch Chemistry OpenCMIS version to a custom 0.8.0-20120706
47646: POM dependency: use 4.2-min version of netcdf rather than 4.2, which embeds an old commons-codec
47683: Create a jar holding the sharepoint config, for use with CLOUD2
47740 RECORD ONLY: Merge V4.1-BUG-FIX to CONV_V413
46360: ALF-17697: Create proper source jars, to deploy to Maven repository
47964: Filter servlet-api from dependencies
48166: Merged DEV/CONV_V413 to DEV/CONV_HEAD
47064: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32446: Fixed THOR-658 "File Upload Limits"
32455: Tweak logging (S3 exists check -> debug)
32462: Move tenant enabled check from low level services to web script entry point:
32467: THOR-666: Improve startTenants - do not need to re-update enable/disable flag on startup
32474: JMeter test script updates (#3)
32485: Fix to ensure the HTML upload POSTed response can return html content type.
32486: JMeter test script updates (#4)
47084: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32491: Fix account signup since change to tenant authentication (which is now slightly stricter:
32518: Fix for mixed cased usernames login problems
32523: Add db pool validate query
32546: Minor - remove unecessary call to getObjectDetails (to avoid calling twice for non-existent object)
32556: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins
32560: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins - part 2
35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32571: Resolve THOR-653: Uploads consume disk space in /var/cache/tomcat6/
32572: Fixed THOR-563 "UI: CSS / layout issue on profile page"
35830:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32577: THOR-682: refactor Tenant/S3 routing content store (it is now self-routing based on S3 content url)
32580: Added missing init-method attributes to key CachingContentStore components.
32583: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
32321: ALF-11700: Possible to generate feed entries with malformed NodeRefs
32593: THOR-688 Analytics to support various URLs not just "website".
Addition of optional sourceUrl paramater to account-signup analytics.
32603: Added file size limitation and hooked in html upload to the form validations w backgrounds and tooltips.
32629: THOR-199: Fix create user (activate) sometimes has to retry - due to: "Deadlock ... alfresco.permissions.insert_AclMember-Inline"
32654: THOR-692: Disable (auto) home folder creation
35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32661: Latest SpringSurf libs:
35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32666: Build: add cloud/cloud-share to ant clean-modules/clean
32672: Ensure that application context is available for TenantAlfrescoAuthenticator in TenantUserFactory
32675: THOR-536: Added TenantPageTypeViewResolver
32686: JMeter test script updates (#5)
32700: THOR-689: DevTest: 2 uploads failed (out of 10000) - missing retry ?
35844:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32702: JMeter test script update
32718: THOR-691: Feed Notifier sends emails on startup of Server
32756: Fixed THOR-556 "Can't view members in a public Site"
35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (+ resolved conflicts w/ 4.0.1)
32032: THOR-370: Add tenant-switching to /cmisatom (OpenCMIS-based v4.x impl => AlfrescoCmisService)
35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32759: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1
32757: Fix for ALF-9365
32761: Changed restricted tenant to appear as page not found
32763: THOR-792: Ensure that failed login returns to login page
32769: Updated networks icon
32770: Authentication updates: Unauthenticated requests to inaccessible tenants (either that don't exist or not authorized to access) will be prompted for authentication and if credentials are valid the "Page Not Found" page will be shown, but authentication will have completed and user can return to their home dashboard via link provided
32785: Fix for THOR-798
32789: THOR-796: reduce startup time (1000s of tenants)
35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32790: THOR-480: Spring Surf lib updates - ensure that i18n properties extensions degrade the specificity of the locale to ensure that no message keys are shown (unless the message genuinely doesn't exist)
32798: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (fix for THOR-721)
32245: Unit tests for ALF-10343, with the problematic parts commented out pending a fix
32251: ALF-11664 site.public.group (via SysAdminParams.SitePublicGroup) should be used when updating site visibilities, as it is for creating sites
35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32805: Latest SpringSurf libs:
47085: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32807: Fixed invalid network switching URLs
32808: Updated Spring Surf libs to that revert invalid changes to relativeUri determining method
32837: Set Alfresco connector reconnect timeout to zero
32856: Fix for THOR-801. Trying to access the archive as 'admin' gives error.
35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
32858: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
(pull in some pre-reqs for cleaner merge of ALF-10826)
31864: ALF-10686 - Original modification date is lost when files are copied into Alfresco via CIFS
31934: Update stale File State Cache.
32068: ALF-10941 - CIFS Open file from excel
32097: build fix.
32131: ALF-10902 - No friendly notification occurs when Editor or Collaborator tries to delete content
32132: Open read-only for attributes only.
32182: ALF-10963 Cannot overwrite files on CIFS share with Notepad++
32876: THOR-784: Fix 'Accounts API loading is very slow' (get page of accounts)
32939: THOR-480: Latest Spring Surf libs - fix i18n extensibility problems.
32948: THOR-859: Performance: Disable rules service
32953: THOR-863: Performance: loadUserByUsername -> isAdminAuthority
32959: (RECORD ONLY) Merged HEAD to DEV/THOR1
32958: (record-only) Merged Dev/THOR1 to HEAD
32945: Fix for ALF-12122 Some CMIS queries with SOLR are not returning correct results
35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33024: Fixed THOR-670 "Incorrect window title for 'Task History' page"
33027: Missing merge info for r32694
35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33033: Latest SpringSurf libs:
35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33038: Minor: do not bootstrap web script readme x2 into Data Dictionary (when creating tenant)
33039: Resolve THOR-839: Following webscripts doesn't set Content-Type response header
33040: Fixed THOR-817 "Issues with "invite user" email autocomplete field"
33041: Fixed THOR-789 "Mix of languages"
33042: Resolved THOR-849: Upload issue ? - Failed to get content ... (No such file or directory) ... x22
48169: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47176: (RECORD ONLY) Fix Eclipse .classpath to match Spring Surf libs
48170: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
48168: CONV: Fix NPE in get people CQ
48183: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47184: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
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
48187: Merged DEV/CONV_V413 to DEV/CONV_HEAD
47086: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD. The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml).
35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project)
33022: THOR-662: Email templates should load/resolve (initially) from classpath
35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33090: ALF-10826: hidden aspect
33091: THOR-416: fix surf-config folder (appears where it shouldn't)
33093: Sweep through email templates.
35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33104: Tweak to invitation email template
33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS.
Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco.
Set the limit to the empty string in core Alfresco, which means 'no limit'.
Applied the limit always.
Set the limit to 25Mb in Thor/alfresco-global.properties
Fixed a minor bug in error reporting due to previous exception renaming.
35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript
33135: Missing WebScripts sources JAR from r33134
33153: Resolve THOR-551: Password Hashes Need Review
33154: Update to latest email blacklist
33155: Fixed THOR-534 "Login Box shows scroll bars"
33156: Build fix for tests failing due to recent password changes
33157: Build fix for updated email blacklist
33172: THOR-776: Re-implement Share override as guided by Erik
33173: THOR-831: Text in Someone
47096: Fix merge compile issue
47100: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33054: THOR-796: slow startup time (on QA env with ~ 10k tenants)
33055: Implementation of THOR-694. File size upload limit within ContentStore.
35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
33213: THOR-833: wip
33214: Allow for workflows which may have a reference to a repo based email template
33228: Added extension points for links in user profile toolbar
33230: Added extension points for links in user profile toolbar part 2
33232: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships"
33233: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 2
33234: Extension points in members bar now ft the pattern of user profile toolbar.
33236: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 3
33241: THOR-908 - wip
33243: THOR-908 / THOR-64 - wip
33253: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 4
33255: Fixed THOR-907 Remove Share functionality which allows access to people profiles outside of your site memberships part 5
47169: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33410: Merged form THOR1_SHARE_PERFORMANCE to THOR1_SPRINTS
33111 Branch for testing out new Spring Surf client side resource improvements
33291 Share client side resource handling to avoid stale client side cache part 1
- New spring surf libs with <@script> & <@link> directives that adds the checksum of the file to avoid client cache beoming stale
- Refactored most old <script> to become <@script>
- Refactored most old <link> to become <@link>
- Removed old <@link> macro from alfresco-temaplte.ftl, resources.get.html.ftl & corm-console.ftl (now using the directive instead)
- i18n messages now imported by <@generateMessages> directive to avoid stale cache
- Added calendar, cookie, resize & uploader yui modues to yui common to decrease the number of .js files requested
- Added new YUI module filter that adds "-min.js?v=<YAHOO.VERSION>" to stop a yui resources being stale after a yui upgrade
33307 Share client side resource handling to avoid stale client side cache part 2
- Made TinyMCE avoid becoming stale after a new release
33334 Share client side resource handling to avoid stale client side cache part 2
- New surf libs with <@checksumResource> directive used by ie6.css, ie7.css, ipad.css & tiny_mce.js to avoid manual change of version number in script import
33368 Share client side resource handling to avoid stale client side cache part 3
- Avoiding re-load of .js, .css & images (referenced from a .css) when switching tenants (note images that have been referenced using <img src=""> will get reloaded)
33405 CSS import duplication fix
35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33417: Thor JMeter test script tweaks
33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed.
33440: Latest SpringSurf libs - performance and thread safety improvements.
33458: ThorTest-preReg (JMeter) test update
33460: Latest SpringSurf libs:
33466: THOR-1002: Updated enterprise overlay
33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33493: THOR-979: HTML5 upload support
33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page)
33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment
33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work)
33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image
33551: THOR-1007: Fixed upload hang on FireFox when uploading folders
35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS:
33386: Branch for Invitation enhancements
33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements.
33475: THOR-1006. Documentation on the desc.xml.
33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects.
Still to do: get the authentication check working and ensure no unexpected side-effects.
33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'.
Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo
dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA.
33511: Fix for THOR-1017.
33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response.
33529: Fixed THOR-980 & THOR-1024 & THOR-1025
33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account"
33571: Fixed HTML5 uploader to work with profile avatar image upload
33585: Thor JMeter test script tweaks
33596: THOR-1035: Enabled HTML5 uploader for application logo upload
33598: THOR-1031: Reduced HTML5 checks for uploader to ensure that it works for Safari on Mac
33603: THOR-1039: Updated UX for HTML5 upload when 0kb files are selected
33606: THOR-1037: Updated variable titles for HTML5/DND upload dialog to support update
35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33615: Latest SpringSurf libs - performance and concurrency improvements
33690: Resolve THOR-1003: Forgotten Password email is case sensitive
33692: Merged BRANCHES/DEV/THOR1_PRIVACY to BRANCHES/DEV/THOR1_SPRINTS:
33488: Reversed merge revisions related to THOR-907 - 33232, 33233, 33236 - hand tweaks related to 33253, 33255.
33492: Removed unused import of com.sun... class
33497: Fixes and improvements to user profile page loading - reducing remote calls required and refactoring link build code. Fixed a issue with displaying the Following link on other users profile page.
33506: THOR-1020: people visibility
33509: Reduced remote calls required to build user profile page.
33519: THOR-985, THOR-986
33542: THOR-989 - Added extensibility hooks to People Finder component
33558: THOR-1014: Profile visibility -1st cut for THOR-993 (/api/people)
33564: THOR-1014: Profile visibility - THOR-992 (/webframework/content/metadata?user=)
33569: Implemented THOR-985, THOR-986, THOR-989
33572: Performance improvement to remove the need for a share->repo call for each page or ajax request to resolve account class name.
33579: THOR-1020: cloud people API (re: visibility)
33599: Share Thor performance improvements - removed the need to call /internal/cloud/current-user inside various common components - now using cached data in user object.
33608: THOR-1014: Profile visibility - fix PeopleRestApiTest
33625: THOR-1020: people visibility
33632: THOR-984 - Hide Account Settings screen from External Users.
33636: THOR-1014: profile visibility
33670: THOR-1020/THOR-1014: people/profile visibility
33674: THOR-1047: Privacy REST - subscriptions (follower) API
33688: THOR-1047: Privacy REST - subscriptions (follower) API
33696: Fix for THOR-785 "F272: API call to get the number of accounts"
33698: THOR-1033: Fixed free accounts showing console settings (updated Spring Surf libs)
33700: Committed other Surf updates missing from r33698 (WebScript JARs) to ensure that manifest meta-data isn't misleading
33705: THOR-1052: VersionService: ensureVersioningEnabled
33706: Merged BRANCHES/DEV/THOR1_UPLOADLIMITS to BRANCHES/DEV/THOR1_SPRINTS:
33510: (RECORD ONLY) File Upload Limit enhancements
33656: Account Quotas / File Upload limit pt1
33686: Modified dnd-upload and html-upload WebScripts to retrieve maximum upload size from internal service (and refactored core WebScripts to support override)
33710: THOR-1020: Privacy (People REST API)
33713: THOR-1020: Privacy (People REST API)
33718: THOR-1020: Privacy (People REST API)
33722: Thor JMeter test script
33742: Latest SpringSurf libs - performance improvements and concurrency fixes
35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33764: THOR-1021: F287: Account Types can define file size upload limits for the Account which are set when the account is upgraded/downgraded between Account types
33767: Tweaked HTML5 upload dialog so that error messages are handled gracefully
33785: Resolve THOR-457: Already have an account email template needs updating/fixing
33786: Fix to issue spotted by DaveC where switching networks would not correctly refresh user metadata. Also fixed minor encoding issues in related Networks WebScripts.
33792: Merged BRANCHES/DEV/THOR1_PUBLIC_EMAIL to BRANCHES/DEV/THOR1_SPRINTS:
33490: Initial feature branch
33535: Fix to unreported issue whereby DirectoryService.getDefaultAccount returns the home account.
33547: THOR-176. Invite new user (public domain email address) into site. Part 1.
33592: Further work for THOR-176. user metadata REST API now does not return homeTenant if the user is from a public email domain. This conditional removal of the 'homeTenant' JSON property is needed by Share.
33593: THOR-176. Refactor of UserTenant to use AccountClass to check isPublicEmailDomain.
33620: Fix for NPE in UserTenant.isPublicDomainUser(). The admin user has no account-type.
33627: Share updates for public e-mail
33797: THOR-176: consolidate public domain check
33802: Remove temporary option to use double @ login (as per THOR-156) - no longer required
33804: Removed locale from the cachekey used for tenant page view cache.
33810: Merged BRANCHES/DEV/THOR1_BLACKLIST to BRANCHES/DEV/THOR1_SPRINTS:
33709: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 1 - DAO layer)
33711: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 2 - Foundation Service layer)
33747: THOR-974, THOR-975, THOR-976, THOR-977 and THOR-978. REST API for CRUD of blacklisted email domains.
33809: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 Adding REST-client rcq files for blacklist CRUD.
35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33814: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS:
33411: (RECORD ONLY) Thor account settings branch from Thor1_Sprints.
33607: Initial checkin for THOR-972, THOR-971, THOR-410
33621: THOR-972, THOR-971, THOR-410 - added missing files
33639: THOR-971, THOR-972, THOR-410:
- add paging properties to the list people web script
- default network admin to true and internal to null
33641: Second cut of THOR-964 "F173: Network admin can list users of network (with paging support)"
33642: THOR-972, THOR-971, THOR-410 - changed paging properties in list users
33652: Implemented THOR-964,THOR-965,THOR-965,THOR-966,THOR-967,THOR-968,THOR-969
33653: User action click event now stopped so it doesn't modify the url
33671: THOR-971: webscript implementation
33687: Making premote/demote available for network-admins and not only for admins. check for network admin role already exists in the service code.
33694: THOR-971:
- Added analytics handling
- Fixed invite share url to include tenant
33699: THOR-963 "F17: Network admin can add a one or more internal users to their network"
33702: THOR-971:
- changed the bulk create url
- changed the activate email template
33703: Make sure Java-based network admin scripts set the response status to 401 if the authenticated user is not a network admin
33737: THOR-410:
- more unit tests
- tidy up
33744: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_USER_MANAGEMENT to BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS:
33417: Thor JMeter test script tweaks
33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed.
33440: Latest SpringSurf libs - performance and thread safety improvements.
33458: ThorTest-preReg (JMeter) test update
33460: Latest SpringSurf libs:
33466: THOR-1002: Updated enterprise overlay
33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
33493: THOR-979: HTML5 upload support
33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page)
33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment
33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work)
33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image
33551: THOR-1007: Fixed upload hang on FireFox when uploading folders
33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS:
33386: Branch for Invitation enhancements
33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements.
33475: THOR-1006. Documentation on the desc.xml.
33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects.
Still to do: get the authentication check working and ensure no unexpected side-effects.
33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'.
Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo
dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA.
33511: Fix for THOR-1017.
33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response.
33529: Fixed THOR-980 & THOR-1024 & THOR-1025
33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account"
33559: Initial feature branch
33669: First cut of THOR-994 and THOR-995 - remove internal and external user from network.
33685: Making remove-external-user.delete.desc.xml accept a domainName templateArg as well as the existing accountId.
33716: THOR-994 and THOR-995. Remove user from network.
Addressing some review comments from DaveC. Refactoring mostly.
Also added protection on RegistrationService.deleteUser() to prevent deletion of last NetworkAdmin in network.
33745: Adding NetworkdAdmin protection to the remove-external-user.delete webscript.
33752: Additional fixes for THOR-966 & THOR-969
* Improved messages/dialogs: demoting yourself, demoting last admin, removing last admin
* New User Button align layout fix as requested by Imran
33754: Documentation for the remove-external-user.delete webscript.
33756: THOR-410:
- unit test tidy
33766: Fix for signup link when already logged in as another user
33769: THOR-963 "F17: Network admin can add a one or more internal users to their network"
33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant.
33774: Added padding on top of name for the Manage Users screen as requested by ux
33790: Promote/demote icons from Imran
33815: Fix issue with removal of public email user from last invited network
33817: THOR-1060: Activities Feed - perf tweak to halve the number of generated feed entries
33819: THOR-1060: fix ActivitiesFeed subsystem (re-)name
33820: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS:
33756: THOR-410:
- unit test tidy
33766: Fix for signup link when already logged in as another user
33769: THOR-963 "F17: Network admin can add a one or more internal users to their network"
33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant.
33774: Added padding on top of name for the Manage Users screen as requested by ux
33790: Promote/demote icons from Imran
33825: People REST API
35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
33850: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
33843: Fix for ALF-12775
33866: Fix for THOR-1071
33878: Fix the build
33881: THOR-1069: Ensure that invitations can be accepted when a user is already logged in
33882: Resolve THOR-1082: Possible to register email address with invalid domain (according to our tenant id rules)
33883: Resolve THOR-1070: External user's avatar not displayed on the People Finder page.
33884: Fix solrcore.properties
33899: Resolve THOR-1077: Incorrect free space displayed when uploading files which exceeds quota
33922: Resolve THOR-1079: Incorrect behavior of the button "Save and close" to "Send Document (s) For Review" tasks.
33933: Resolve THOR-1088: Hide Account Id from Account Summary Screen
33934: Resolve THOR-1089: Review Account Quota text on Account Summary Screen
33942: Fix for THOR-1094. InvalidDomains FTL couldn't handle NULL notes field.
This shouldn't arise in the field as we don't put NULL-valued notes in the DB, but it might matter in some test envs.
33949: Resolve THOR-1093: Incorrect notification title displayed when trying to invite user from another network from Manage Users page
33953: Fix for THOR issue where public users should not be able to see Following and Following Me tabs in their own profile.
35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
34140: THOR-1098: Prevent resources being requested twice (latest Surf libs)
34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti)
34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed
35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
34224: Fix for THOR-789 - Mix of languages. The original bug was not never actually completely fixed, added some additional handling in SpringSurf WebScripts View to not override the locale from the original request parameters if it has already been set elsewhere.
34301: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
34343: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix
34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix
34388: THOR-953/SYS-294: add db.pool.evict.num.tests option (=> numTestsPerEvictionRun)
34729: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
31867: Merged DEV/TEMPORARY to V3.4-BUG-FIX
31400: ALF-10764: PDF vs 1.5 cause crash jvm
- PDFRenderer library has been updated from 2009-09-27 to 0.9.1 version to support PDF documents of 1.5 version
32061: ALF-11376 Requesting PDFBox 1.6 be included in future service pack release.
Upgrading pdfbox,fontbox,jempbox from 1.5.0 to 1.6.0
34731: THOR-1261: repo cluster fix (propertyUniqueContextCache)
34734: THOR-1261: repo cluster fix (propertyUniqueContextCache)
34435: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
34558: THOR-1216: tenant context mismatch (Solr tracking)
34606: THOR-1216: tenant context mismatch
34441: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component)
34489: Fix to remove hazelcast subdir from build.xml for -exploded build - Thor specific merge issue.
34722: Added hazelcast-cloud jar to allow AWS Hazelcast config options for Share clustering on Thor
34848: THOR - specific version of ClusterAwarePathStoreObjectPersister.
34931: Thor specific lookup of Share custom app context files to include the custom-slingshot-cloud-context and custom-slingshot-application-context only and in the order we want. Also updated Hazelcast example config to include AWS by default
35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
34940: THOR-1288: Extra diagnostics for tracking leaked tenant context on thread:
34187: Updated Surf libs (down grades duplicate dependency warnings to debug info)
34410: THOR-1169: Latest Spring Surf libs to fix missing template CSS probs
34418: (RECORD ONLY) Merged BRANCHES/DEV/BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/BRANCHES/DEV/THOR1_SPRINTS
34316: Method signature change to ConfigService fixes for RepoXMLConfigService
34471: (RECORD ONLY) Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS
34468: Fix for ALF-13172
Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
34467: Fix for ALF-13237 - Change dashboard Layout is not working correctly, original layout is still used after saving changes.
34891: Added missing jug-asl-2.0.0.jar to slingshot deps for Thor
35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
35087: Minor: remove NOOP (introduced in r30776)
35123: THOR-1288: update leak logger
35124: THOR-1288: prod login failure when using cloud console for (bulk) signups
35132: THOR-1288: build/test fix
35133: THOR-1288: build/test fix
35395: Resolve THOR-1340: Alberto.Vazquez@w.illi.am cannot sign up
35964: Spring Surf library refresh
35995: Fix merge issue
35999: Fix merge issue
36053: 1st pass at upgrading to latest Spring Surf
36059: Fix CloudInvitationService tests for cloud1
48191: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
47185: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
MT - enable ability to get call context if overriding of beginCall/afterCall
- eg. for cloud use-case (x-network switching)
48192: Temporarily disable generation of installers, to speed up build
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Neil McErlean
|
7ca195f2b0 |
Fixing failing testcase SiteServiceTest.testGetMembership().
I don't understand how this test started failing, but I see why it's failing now and there's a clear bug in People.java which I've fixed. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47787 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Kevin Roast
|
80887b8462 |
Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
47670: ALF-18245 - BM-0013: Soak: Run 06: Search population of ScriptNode is expensive
- Optimizations to improve the performance of the repository when retrieving the populating data needed for Share Search results
- Additional service method to PersonService to allow retrieval of a person or null in a single operation - rather than exists() followed get()
- Improvements to generate of full name strings for a Person - only retrieve minimum needed properties rather than allprops from cm:person
- Improvements to generation of DisplayPath to avoid multiple permission checks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
||
|
Kevin Roast
|
5a13172d98 |
Performance improvements to generation of QNamePath for a script object
- the slowest part of the code is the Path.toString() - where it retrieves namespace prefixes for QName's from the DD (!) Execute Share Search REST API test: Before: ScriptNode.getQnamePath() - 74686ms (20% total CPU time) After: ScriptNode.getQnamePath() - 16345ms (5% total CPU time) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Kevin Roast
|
d9af7b3994 |
Added helper to ScriptNode to allow scripts to retrieve the short prefix qname version of the list of Aspects for a node, avoiding further processing later.
Modified treenode.get.js to use the faster helper: Test 8x threads x25 repeats - average response time: Before: 280ms After: 170ms git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
Kevin Roast
|
3373456c13 |
. Optimize ApplicationScriptUtils.toJSON() - threadlocal cache for namespace resolution to avoid DD access, smarter retrieval of cm:person properties - 40% quicker or more in some cases
. Convert short qnames to long qnames in our templates to avoid DD access to resolve full qnames . Optimize out N+1 queries from calling RatingService.getRating() unless the document has at least one Like (which is available in the rolled up property already present on the node) - up to 99% quicker when building "Likes" JSON structure...! . Added new optimized method to FileFolderService to retrieve a cm:name based path - only the String for each path element not the full FileInfo structure for each (avoid full getProperties() - 70% quicker to build webdav URL overall before/after to retrieve doclist2 script (8x concurrent threads x25 repeats etc.) Before: 1030ms After: 645ms Also improves original doclist script (used by dashlets) and single node retrievals. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |