Commit Graph

2894 Commits

Author SHA1 Message Date
Mark Rogers
615378aae6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68163: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67892: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67777: MNT-11172 : Code updates required for auto-generated topic content
         Updated the webscript description files.
         67877: MNT-11172 : Code updates required for auto-generated topic content
         Corrected a typo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:22:16 +00:00
Mark Rogers
00f38fb7c4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68140: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67633: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         67123: Merged changes from 4.1.6 and DEV:
            65930: MNT-11035: Site manager cannot cancel editing of a file which is being edited with Edit Online
               - Back to the previous implementation of ScriptNode#getIsLocked() method that was changed in MNT-8736. Also, the upload.post.js was corrected to allow new version upload operation for a locked working copy.
            65936: MNT-11035: Site manager cannot cancel editing of a file which is being edited with Edit Online
               - Fix build failure. Add required imports.
            67065: MNT-11036: Cancel Editing link does not appear for Edit Online
               - Unlock permission is required for "Cancel Editing" action, when a document is in "Edit Online" state.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:15:09 +00:00
Mark Rogers
a4891cca64 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68134: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67568: MNT-9905 : Pending Invites created by one site manager aren't visible to other site managers
       Build failed, unit test was fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:13:11 +00:00
Mark Rogers
1a3013e3f3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68126: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67461: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         66886: Merged DEV to V4.1-BUG-FIX
          66841 : MNT-9905 : Pending Invites created by one site manager aren't visible to other site managers
           Execute some operation: "Invite/Search", "Pending Invites/Search" and "Pending Invites/Search/Cancel" using 'system' user. Corrected code. Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:10:58 +00:00
Mark Rogers
80e0409f8f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68122: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67228: MNT-7492: Merged DEV to V4.2-BUG-FIX (4.2.3)
         66153: MNT-7492: Simple Web Script fails with "transaction required" error when authentication=none
            - Retrieve baseDir of the RepoStore on behalf of System User


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:09:39 +00:00
Mark Rogers
b331e89f27 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68118: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67153: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67111 : MNT-10873 : Renaming folders while editing documents using webdav and Windows 7 can lead to 0k (empty) documents created in the trash can.
            - Empty documents are not archived eny more if were created in response to LOCK webdav method.
            - Unit test was implemented.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:09:00 +00:00
Mark Rogers
2d3ff34928 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68109: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65860: MNT-10430 "CMIS: NPE getting mandatory aspects with browser binding"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:06:24 +00:00
Mark Rogers
bb6f6e619e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68108: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65761: MNT-10430 "CMIS: NPE getting mandatory aspects with browser binding"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68396 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:06:04 +00:00
Mark Rogers
3f70a2c709 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67758: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67035: MNT-11032 : In Public Share preview page, the Document Details link redirects to the Dashboard
         - Ignoring of null value was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:05:06 +00:00
Mark Rogers
0b6c361dae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67754: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66874: Merged DEV to V4.2-BUG-FIX (4.2.3)
         66788 : MNT-10411 : Wrong status returned when  calling webscript api/invite/{inviteId}/{InviteTicket}?inviteeUserName={invitee uid}
            - Return propper invitation status. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:03:47 +00:00
Mark Rogers
c351fa81e9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67749: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      64008: ACE-772: Topics from the sites the user is not a member of are displayed in My Discussions dashlet
         - Incorrect display of topics into "My Discussions" dashlet is fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:02:10 +00:00
Mark Rogers
2821d0afde Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67743: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66008: Merged DEV to V4.2-BUG-FIX (4.2.2)
         66007: MNT-10487: Public API does not allow to query for pooled tasks with candidate-users and groups
            Corrected the previous commit made to the duplicate piece of code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:01:30 +00:00
Mark Rogers
75a58497fc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67741: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65962: MNT-10103: Merged DEV to V4.2-BUG-FIX (4.2.2).
         64750: MNT-10103: Advanced Search by Tag or custom fields not working in 4.2. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:00:52 +00:00
Mark Rogers
6c92799b91 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67736: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65943: MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
      Fixed some unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:59:12 +00:00
Mark Rogers
25adfb7df4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67466: BDE-266 Move JettyComponent util classes to test source, so that we can get rid of Jetty in the war


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:48:14 +00:00
Mark Rogers
c62d459485 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67453: BDE-266 Define the version in the top-level pom for these dependencies, so that we always get the right one:
       log4j, slf4j-api, slf4j-log4j12, alfresco-xmlfactory, jaxen, freemarker, joda-time, jackson-core-asl, jackson-mappel-asl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68340 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:47:53 +00:00
Gethin James
f1d48732b6 Added a new findSites() method for use by live-search and Site Finder (sites.get.js) for ACE-1513
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-26 16:20:13 +00:00
Tatyana Valkevych
74274fad03 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67215: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      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/HEAD/root@67219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-11 15:12:21 +00:00
Tatyana Valkevych
0a966c949b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67214: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66976: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
         66800: Merged DEV to 4.2.2
            66599: MNT-11091: [Pentest] External URL Processing 
               Check if uploaded file is image.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@67218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-11 15:12:04 +00:00
Tatyana Valkevych
d390f881dd MNT-11154: Merged V4.2-BUG-FIX (4.2.3) to V4.2.1 (4.2.1.3)
66976: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
      66800: Merged DEV to 4.2.2
         66599: MNT-11091: [Pentest] External URL Processing 
            Check if uploaded file is image.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/V4.2.1/root@67070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-09 15:39:48 +00:00
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