Commit Graph

2424 Commits

Author SHA1 Message Date
Tatyana Valkevych
f85ac6aca0 MNT-11148: Merged V4.2-BUG-FIX (4.2.3) to V4.2.1 (4.2.1.3)
66979: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
      66917: Merged DEV to V4.2.2-PATCHES (4.2.2)
         66804 : MNT-11089 : [Pentest] XSS #1
            - Added mimetype filter on server-side

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@67042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-09 10:57:06 +00:00
Tatyana Valkevych
9ef543f2ee Merged V4.2-BUG-FIX (4.2.3) to V4.2.1 (4.2.1.3)
65947: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
      65946: Merged HEAD-BUG-FIX (4.3/Cloud) to V4.1-BUG-FIX (4.1.9)
         65934: MNT-11059: ActivitiWorkflowRestApiTest and JBPMWorkflowRestApiTest failing since we switched to British Summer Time
            - Changed the dateformatter imports to compare equal dates correctly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@66877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-07 09:32:50 +00:00
Will Abson
0cbd025194 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66644: Merged WAT2 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      65659: WAT2 - fix to Live Search to filter config nodes from results.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-03 16:23:43 +00:00
Will Abson
f9ad39cda6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66632: Merged WAT2 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      64922: Fixed failing SiteServiceTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-03 16:22:28 +00:00
Will Abson
3b62f3e21e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
66631: Merged WAT2 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      64868: Made sites.get work the same way as livesearch, use findSites to do a 'contains' search instead of listSites to do a canned query ACE-1072


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66712 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-03 16:22:21 +00:00
Will Abson
6da4c16464 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
Andrey Che
e04b146b1a Merged DEV to HEAD (4.3/Cloud)
66480: ACE-1154: Outcome of the Review and Approve task is not displayed in the "My Completed Task" component.
      Oracle specific issue: Set default value for outcome label.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-03 06:14:54 +00:00
Alan Davis
bdd65c3d9f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65934: MNT-11059: ActivitiWorkflowRestApiTest and JBPMWorkflowRestApiTest failing since we switched to British Summer Time
      - Changed the dateformatter imports to compare equal dates correctly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:30:51 +00:00
Alan Davis
227f276ab4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65911: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65744: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65743: MNT-10487: Public API does not allow to query for pooled tasks with candidate-users and groups
            Do not add involvedUser to the query if candidateUser or candidateGroup is set (suggested by Frederik Heremans).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66282 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:28:45 +00:00
Alan Davis
d709289ef8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65656: Declare version of xml-apis and xercesImpl in parent pom.
   Upgrade maven-sirefire-plugin to 2.17


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:08:31 +00:00
Alan Davis
65a1fa4e1b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65638: ACE-969 Upgrade mockito from 1.8.0 to 1.9.5


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:07:24 +00:00
Alan Davis
afcd38825f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65603: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65504: Merged DEV to V4.2-BUG-FIX (4.2.2)
         64017 : MNT-10908 : WebDAV lock refresh calls are not processed
            - LOCK method was modified to update lock expiry date correctly.
            - PROPFIND method should not generated lock discovery response for expired locks
         64152 : MNT-10908 : WebDAV lock refresh calls are not processed
            - Unit tests to prove the fix. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:59:20 +00:00
Alan Davis
265620433f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65595: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65448: MNT-9963: Merged DEV to V4.2-BUG-FIX
         65040: MNT-9963: URL property in /api/people API is incorrect
            - Fix url property to contain correct "people" value


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:52:42 +00:00
Alan Davis
71cdbe8445 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65434: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65008 : MNT-10551 : PUT sites/<siteId>/members/<personId>
            - Throw InvalidArgumentException if the person is not site member
         65046 : MNT-10551 : PUT sites/<siteId>/members/<personId>
            - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:48:02 +00:00
Alan Davis
3913fde282 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65590: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65433: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63225 : MNT-10536 : Public API > GET nodes/<nodeId>/comments.
            - Throw InvalidArgumentException (status 400) if detected node is not a content or a folder
         65046 : MNT-10536 : Public API > GET nodes/<nodeId>/comments.
            - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:46:59 +00:00
Alan Davis
080827166a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65494: ACE-969 Upgraded Apache Commons components:
   * commons-beanutils from 1.7.0 to 1.9.1
   * commons-codec from 1.5 to 1.9
   * commons-compress from 1.4.1 to 1.8
   * commons-digester from 1.6 to 1.8.1
   * commons-discovery from 0.2 to 0.5
   * commons-jxpath from 1.2 to 1.3
   * commons-logging from 1.1.1 to 1.1.3
   * commons-net from 2.2 to 3.3
   * commons-pool from 1.5.5 to 1.6


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:26:23 +00:00
Alan Davis
85a044dab3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64840: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64783: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.
      Re-enable PublishingRestApiTest test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:07:52 +00:00
Alan Davis
663a50d6f9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64839: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64771: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:06:48 +00:00
Alan Davis
a2dd866651 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64836: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64764: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         64694: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9)
            64236: MNT-10862: Merged DEV to PATCHES/V4.1.8.
               63948: MNT-10862: Incorrect time on Wiki Pages list
                - In pagelist.get.json.ftl was changed date format.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:03:34 +00:00
Alan Davis
a67180f8a0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64816: ACE-1101 Remove AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:01:29 +00:00
Alan Davis
a035271251 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64788: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64683: MNT-10915: Public API Activities : activityType org.alfresco.site.user-joined doesn't contain siteId
       - Modify unit test to use SiteService for inviting user


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:56:46 +00:00
Alan Davis
a94703eb6a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64698: Fix unit tests in Maven build of remote-api: xml-apis dependency was missing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:39:41 +00:00
David Draper
35bab76625 ACE-1172: ExtensibilityContainer update to support Surf updates
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@65685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-27 08:11:29 +00:00
Pavel Yurke
0ee790b33b Merged DEV to HEAD (4.3.0)
65440: ACE-1150: Sorting the list of user does not work
      - people.get.js was corrected to take in account the sortBy and sortAsc paramenters.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@65463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-24 13:03:59 +00:00
David Draper
afc5b6240a Merged BRANCHES/DEV/KEVINR to HEAD (updates to Aikau modules)
63693: Aikau faceted search - added basic facet display - doesn't yet support filtering results
   63700: Aikau faceted search - updates to support application and removal of filters
   63786: QuADDS - Initial code drop (Remote API CRUD creation - PUT and DELETE stubbed but not implemented) + basic Form/Collection page allowing creation and listing of data
   63818: QuADDS - Added QuaddsWidgets to generate UI from QuADDS, updated default QuADDS page to be related to Facet Management
   63821: QuADDS - Added delete to CRUD operations
   63839: QuADDS - minor tweaks to get page creator working on branch and palette updates for QuADDS
   64046: QuADDS - Aikau updates for selecting items in list and updating form
   64075: QuADDS - Added PUT support to complete CRUD operations
   64098: QuADDS - widget palette updates in prep for demo
   64855: Aikau faceted search - support for max. hit threshold, sort (alpha/asc/desc) and max. displayed filters
   64856: QuAADS - Update to support dynamic updates of CSS and dependencies for QuaddsWidgets module
   64857: Aikau faceted search - render applied filters correctly
   64866: Aikau faceted search - style updates
   64901: Aikau page creation - added support for editing previously created pages using the DND creator
   64912: Aikau page creation - added option to export the page model as a WebScript controller
   64934: Aikau faceted search - style tweaks to adopt grid approach

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-20 12:36:31 +00:00
Alan Davis
d50a3dea35 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64503: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      64010: Fixed the returned JSON for the get admin-sites webscript, which wasn't returning the correct JSON with empty "entries".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 08:10:21 +00:00
Alan Davis
67cd1a9513 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64497: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63979: Aikau unit test code-coverage tweaks and remote page/app fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 08:03:49 +00:00
Alan Davis
305d585df2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64469: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63596: ACE-809: Updated site-admin webscript to include the new attribute "userIsSiteManager".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 07:34:29 +00:00
Alan Davis
c0b2d8eddd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64446: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63151: Reverted most of the ACE-493 implementation, committed in r62555, as a new Get sites webscript for the site admins, implemented in r63040. Also, modified the existing tests for the Get sites webscript.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 07:09:44 +00:00
Alan Davis
c3a054b969 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64443: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63040: ACE-493, ACE-538: created site admin Get sites API, which supports pagination.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64589 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 02:01:25 +00:00
Alan Davis
cf882a2480 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64429: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62555: ACE-493, ACE-503 and ACE-511: Modified sites service APIs to support Manage Sites feature.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:43:38 +00:00
Alan Davis
b0add3b79a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64426: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62536: Reverted Sites Public REST API changes, committed in r61735 and r62502. Also updated CloudSiteServiceImpl overlay to override isSiteAdmin method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:40:20 +00:00
Alan Davis
25895187d8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64416: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      61735: ACE-493: Made Sites Public REST API Get method callable by Admins or by users that are made members of the new "Site Admin" group.
      ACE-503: Created a new PUT method in Sites Public REST API, such that it is possible to modify the visibility of a site.
      ACE-511: Created a new DELETE method in Sites Public REST API, such that it is possible to delete a site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:29:23 +00:00
Alan Davis
98992479a4 HEAD-BUG-FIX and HEAD now identical except for expected differences
- Corrections after merges

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 19:45:16 +00:00
Alan Davis
5da5243dea Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64100: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      64055: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         63882: MNT-10876: Range Requests Can Fail For Files Over 2GB in Some Cases
            - Added checks for bytesLeft greater than Integer.MAX_VALUE


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:44:32 +00:00
Alan Davis
22fa3e75c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64048: Merged DEV to HEAD-BUG-FIX (4.3.0)
      << Had been committed to the wrong branch (HEAD) >> 
      64031: MNT-10724: Metadata set by an onContentPropertyUpdate policy is overriden during upload via upload.post.js Repository web script
      Applied solution proposed by Axel Faust - removed two save() calls.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64345 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:32:01 +00:00
Alan Davis
4d0ba55b90 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63903: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63817: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63504 : MNT-10687 : Cannot appendContentStream to PWC
            - Remove ALF-20118 fix
         63648 : MNT-10687 : Cannot appendContentStream to PWC
            - Test appending content to PWC using CMIS 1.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:05:52 +00:00
Alan Davis
8c22b5885e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63888: Reverse merge
      << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEHEAD0-197, https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEHEAD0-198 >>
      63819:  Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
         63695: ACE-772: Topics from the sites the user is not a member of are displayed in My Discussions dashlet.
        - Fixed incorrect display of topics into "My Discussions" dashlet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:04:54 +00:00
Alan Davis
d7377a2965 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63819:  Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63695: ACE-772: Topics from the sites the user is not a member of are displayed in My Discussions dashlet.
        - Fixed incorrect display of topics into "My Discussions" dashlet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:03:57 +00:00
Alan Davis
c7a7beae1c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63706: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63631: MNT-10806: NPE with passthru SSO when client does not accept cookies
      Add improved logging for case when NTLM details can not be retrieved from session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:48:23 +00:00
Alan Davis
e3b808c63c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63704: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63576: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59932 : MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
            - Implementation of org.alfresco.opencmis.mapping.DescriptionProperty added. Register PropertyAccessor only for CMIS 1.1
         63562 : MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
            - Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:46:28 +00:00
Alan Davis
222991d53e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63671: Merged DEV to HEAD-BUG-FIX (4.3)
      63629: Removed tabs after finishing ACE-762


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:39:01 +00:00
Alan Davis
5e7c96fe91 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63670: Merged DEV to HEAD-BUG-FIX (4.3)
      63618: Fixed ACE-762: BM-0012: NodeLockedException not handled by CMIS
             - Refactored interceptor to handle previous TODO: Dig into exceptions to find deep causal issues of interest
             - Added unit test
             - Translate lock-related Alfresco exception into CMIS exception
      63619: Further testing for ACE-762: BM-0012: NodeLockedException not handled by CMIS
             - Extended test to ensure that locked nodes generate the correct CMIS exception
      63630: Added test for ACE-762 and cleaned up pointless warnings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:38:05 +00:00
Alan Davis
cab496539d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63652: Merged DEV to HEAD-BUG-FIX (4.3.0)
      63110: ALF-20817: Wiki links e.g. [[ ]] does not handle standard wiki format [[Page#anchor]]
        - '#' symbol was added to the special characters, corrected parser to handle wiki format with anchor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:59 +00:00
Alan Davis
9665248b1d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63335: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63264: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63206 : MNT-10760 : "Error loading items" in My Discussions dashlet on Site Dashboard
            - Added encoding to ISO9075 of search query for discussions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:04:35 +00:00
Alan Davis
e288cc2112 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63080: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62921: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62833: ALF-20448: Public API Activities : activityType org.alfresco.site.user-joined doesn't contain siteId
          - Modify ActivitiesImpl.getSiteId() method to handle situation when default tenant domain is used. 
          - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:45:02 +00:00
Alan Davis
d6fb189489 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63066: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62716: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62654: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
          - Report about IllegalStateException to LOG.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:32:57 +00:00
Alan Davis
8e7f620ac1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63065: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62754: MNT-9587: Workflows task properties values are not compliant with data-dictionary-property-definitions.
      Correct count of task properties which increased after fix that returns default value for properties with no value.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:32:01 +00:00
Alan Davis
2bbf9c822e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63064: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62673: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62610: MNT-9587: Workflows task properties values are not compliant with data-dictionary-property-definitions.
         Add default name as "Task" for bpm:workflowTasks and fix WorkflowModelBuilder to return default property values if no were set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:31:03 +00:00
Alan Davis
957c03475d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63061: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62574: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62526:  Merged DEV to V4.1-BUG-FIX (4.1.8)
            59843: MNT-2258: IE's File Download box does not show a filename correctly when that have non-ASCII characters in the filename
              - Use legacy filename token with encoded value in "Content-Disposition" header on file download operation for IE7 too.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:28:09 +00:00