Commit Graph

395 Commits

Author SHA1 Message Date
Alan Davis
1eda74e709 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107010: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106860: MNT-14113: User admin console: sorting users causes some to disappear
      The behavior of indexed people search has been modified to return the same results as a CQ search. The test for this behavior has been added to 'PeolpleTest'. This test is valid for SOLR1/SOLR4 and "buildonly" (Lucene)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-06-25 08:28:15 +00:00
Alan Davis
5cdfb8b2f7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104503: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104354: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104274: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            102794: MNT-8678 : call to guessMimetype() on a node that has no content creates a content property
               - add check for empty content before saving a node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-20 10:38:05 +00:00
Tatyana Valkevych
79e65e0023 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104367: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104293: Merged DEV to 5.0.N (5.0.2)
         104276: MNT-14012 : Setting <display-facets>false</display-facets> throws InvalidQNameException
            - skip empty facet names on search queries 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-19 15:14:02 +00:00
Tatyana Valkevych
8e6acabc2f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104107: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104059: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         104006: Merged DEV to V4.2-BUG-FIX (4.2.5)
            83993 : MNT-12265 : Uploading a new version of a .rtf file in Mac OS breaks the preview
               - Using mimetype map from Alfresco at upload


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-14 15:35:17 +00:00
Tatyana Valkevych
fa2b5569db Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101332: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100713: RA-55 - Move Slingshot JS Extension to Share enablement project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:24:03 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
d3331bcd0f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98874: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98718: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98561: Merged NESS/4.2.N-2015-02-10 (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98467: MNT-13358 : Share fails to render imported documents when metadata has empty cm:creator or cm:modifier values
               - modified the username decorator and the people bean to handle empty usernames
            98550: MNT-13358 : Share fails to render imported documents when metadata has empty cm:creator or cm:modifier values
               - added unit tests and corrected formating of previous commit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:36:03 +00:00
Alan Davis
8d0db021a5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94144: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94082: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93943: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93775: Merged DEV to V4.1-BUG-FIX (4.1.10)
               93465: MNT-8810 : Audit: Double READ on first Share preview
                  - Audit READ for cm:content no longer occurs when thumbnail is created or read.
                  - Audit READ for cm:thumbnail occurs when content of doclib or webpreview is read.
            93874: MNT-8810 : Audit: Double READ on first Share preview
               - Fixed test failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32:45 +00:00
Alan Davis
a5fd70c692 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91636: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91586: Missing license headers and improve method comments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:37:17 +00:00
Alan Davis
af849d4521 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91561: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91503: Fix for MNT-12875 - Tags list in Repository view does not work when overridden repository root node using xpath syntax is used.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:33:50 +00:00
Alan Davis
8828e5f284 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89398: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89315: MNT-12642: Upload via Share Causes File Corruption
         Reverse Merge V4.2-BUG-FIX (4.2.4)
            85882: Merged DEV to V4.2-BUG-FIX (4.2.4)
               74616 : MNT-11704 : Updating Adobe Illustrator and Photoshop Documents results in loss of mimetype and preview capability
                  - Guess mimetype using content of uploaded new file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:39:26 +00:00
Alan Davis
cf29d5fec8 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85941: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85882: Merged DEV to V4.2-BUG-FIX (4.2.4)
         74616 : MNT-11704 : Updating Adobe Illustrator and Photoshop Documents results in loss of mimetype and preview capability
            - Guess mimetype using content of uploaded new file


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 09:35:09 +00:00
Neil McErlean
51a03a6999 Fix for ACE-3027. Code adjusted to handle spellCheck parameter having null value.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-14 12:47:06 +00:00
Jamal Kaabi-Mofrad
7f4cf333fd Fixed failing tests as a result of r85946 commit.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-30 02:11:00 +00:00
Jamal Kaabi-Mofrad
fc8c649191 - Refactored facet display handlers
- Changed date buckets implementation to use Solr Date math
- Added Site title display handler as well as a test for it
- Reverted back Neil’s work to inject the "special" facet IDs (SITE, TAG etc) from the solr-facets-context.xml as I re-wrote the SolrFacetHelper class.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-29 21:14:26 +00:00
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
2014-09-26 14:13:45 +00:00
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
2014-09-25 15:14:37 +00:00
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
2014-09-25 11:29:05 +00:00
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
2014-09-25 10:35:22 +00:00
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
2014-09-20 10:56:42 +00:00
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
2014-09-20 10:51:27 +00:00
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
2014-09-19 22:28:29 +00:00
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
2014-09-18 17:27:07 +00:00
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
2014-09-18 17:19:22 +00:00
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
2014-09-18 17:14:25 +00:00
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
2014-09-03 18:07:02 +00:00
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
2014-09-03 15:21:53 +00:00
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
2014-09-03 12:13:50 +00:00
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
2014-09-03 12:01:49 +00:00
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
2014-08-06 08:14:03 +00:00
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
2014-08-05 09:43:41 +00:00
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
2014-08-04 19:36:26 +00:00
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
2014-07-22 16:13:06 +00:00
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
2014-07-22 13:27:30 +00:00
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
2014-07-22 12:15:29 +00:00
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
2014-05-19 12:52:21 +00:00
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
2014-05-19 12:50:06 +00:00
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
2014-05-19 12:49:53 +00:00
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
2014-05-19 12:49:26 +00:00
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
2014-05-19 12:48:13 +00:00
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
2014-05-19 12:29:03 +00:00
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
2014-05-19 12:14:59 +00:00
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
2014-05-06 10:45:59 +00:00
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
2014-04-30 16:17:51 +00:00
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
2014-04-30 16:13:31 +00:00
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
2014-04-03 16:26:47 +00:00
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
2014-04-03 16:21:32 +00:00
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
2014-04-02 21:54:58 +00:00
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
2014-02-12 14:10:32 +00:00
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
2014-02-12 10:12:44 +00:00