Commit Graph

2424 Commits

Author SHA1 Message Date
Will Abson
caf168e07e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71592: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70331: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70280: MNT-10122 : Related to MNT-2234 - Incorrect workflow history when using jBPM
           - Fixed tests failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:10:16 +00:00
Will Abson
d88b6f4d22 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71590: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70329: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70256: MNT-9918: Merged DEV to V4.1-BUG-FIX (4.1.9)
            63236: MNT-9918: Orphan links not handled properly in share
               - Display orphan links in Share


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:10:08 +00:00
Will Abson
802b1777cd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71587: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70327: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70241: MNT-10122: Merged DEV to V4.1-BUG-FIX (4.1.9)
            63046: MNT-10122 Related to MNT-2234 - Incorrect workflow history when using jBPM
             - In JBPMEngine.getTaskProperties() was added ContentModel.PROP_CREATOR property. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:09:49 +00:00
Samuel Langlois
9571a2899d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
73022: Merge V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3.0)
      72991: Merged DEV to V4.2-BUG-FIX (4.2.3)
         72988 : MNT-11584 : Failing test InviteServiceTest.testGetInvitationStatus()
               - Restore runAsUser after InviteByTicket webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-05 16:15:24 +00:00
Samuel Langlois
484ca8fcfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
71698: Merge V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3)
      71693: MNT-11264 Workflow public API for tasks is returning other users tasks
        Revert commit 69670: this was not a bug and the previous behaviour was the right one. This will fix failures in TaskWorkflowApiTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-05 16:13:56 +00:00
Jamal Kaabi-Mofrad
1c5666c4ba ACE-1918: Surf-config patch improvements. Made:
- surfConfigFolder patch to use Cron trigger
          - surf-config SQL query more efficient
	  - changes to comments and formatting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-04 14:39:31 +00:00
Jamal Kaabi-Mofrad
f8aef1344a ACE-1447: Added 'cm:indexControl' aspect to surf-config folder and its children so they wouldn’t be indexed. Also added an asynchronous patch.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-02 04:03:57 +00:00
Pavel Yurke
82a6725fe9 ACE-1787: Reverse Merged - Wrong commit was made
71809: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus.
   71928: ACE-1787 Drop-down menu icon is not displayed for many cases
             Added a constant arrow symbol ("&#9662") to be used in the drop down menus. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-30 11:02:18 +00:00
Kevin Roast
e1c2cf4699 Merged BRANCHES/DEV/KEVINR3 to HEAD
72208: ACE-1828 - Cannot find system files on the Search page in Share. Removed system created files from search results for LiveSearch.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-29 08:14:08 +00:00
David Draper
1f63c49fb1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70754: Modifications to files after merge from WAT1 to HBF so that the two branches are the same except for version.properties and pom.xml versions
   These changes need to be checked as they may have been incorrectly merged to WAT1 in the first place.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 13:04:59 +00:00
David Draper
1918e24a74 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
f828820796 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
d8d81b5768 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70670: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      68292: QuADDS - changed REST to reduce authentication requirements from admin to user (users still need permission on a folder that the admin will need to create)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:46:50 +00:00
David Draper
c6c1d17af4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70648: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      67974: QuADDS - REST service updated to use search.selectNodes to avoid eventual consistency issues on SOLR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:41:32 +00:00
David Draper
62833ecb90 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70634: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      67816: Reverted r67799, as the solution has a performance hit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:37:43 +00:00
David Draper
04a13fb354 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70631: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      67799: ACE-1447: Excluded surf-config files from the search query to get the correct facet Meta.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:37:02 +00:00
David Draper
465e3889b2 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
de15cdc396 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70545: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      66795: Updated lines 540-562 of search.lib.js to match HEAD-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:15:56 +00:00
Alan Davis
215fb666c4 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
Alan Davis
44cfe87ccf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70236: Merge V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3)
       70216: Merge V4.2.2 to V4.2-BUG-FIX (4.2.3)
          70214: MNT-10430 Upgrade alfresco-opencmis-extension to 0.9 in Maven POM files as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:39:41 +00:00
Alan Davis
fdfc8bd5dd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70232: Upgrade PostgreSQL JDBC driver to 9.3-1101-jdbc41


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:37:40 +00:00
Alan Davis
b691910e46 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70205: Move re-creation of the database in the pre-clean Maven phase, because it makes more sense


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:30:25 +00:00
Alan Davis
bb69555aeb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70062: Merged BRANCHES/DEV/KEVINR to BRANCHES/DEV/HEAD-BUG-FIX
      66634: Search prototype - found a way to remove Data Dictionary, Sites, Site containers and other junk from "all sites" query without the use of PATH - This could be used to speed up the Cloud "All Sites" query...
   Added Cloud override of Search component to force Search UI All Sites filter state through the Repository wide search (no PATH!) on the back-end.
    - Much faster Cloud searches against "All Sites"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:24:57 +00:00
Alan Davis
c4a0b32cdf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69764: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69679: Merged DEV to V4.2-BUG-FIX (4.2.3)
         69619 : MNT-11354 : org.alfresco.repo.webservice.types.NamedValue.isMultiValue is initialized to null
            - Set default FALSE value to isMultiValue. Remove nillable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:46:56 +00:00
Alan Davis
85a75da6b2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69762: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69670: MNT-11264 : Workflow public API for tasks is returning other users tasks
       Corrected workflow public api behavior.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:44:51 +00:00
Alan Davis
c89bee1ff4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69761: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69649: Merged DEV to V4.2-BUG-FIX
         69604: MNT-11378: Intermittent test failures: ProcessWorkflowApiTest and TaskWorkflowApiTest
          - Add logging to find out cause of failing on bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:43:48 +00:00
Alan Davis
962295dc5a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69695: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68570: Merged DEV to V4.2-BUG-FIX (4.2.3)
         68084 : MNT-11237 : CMIS uploading file larger the 4mb fails
            - Ensure that temp directory exists before buffering request input stream.
            - Test webscript was added (simply buffers request input stream)
            - TempFileProvider now has method to get or create temp folder inside system temp directory
            - Unit test was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:35:21 +00:00
Alan Davis
ffd09244c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68528: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68303: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68256: MNT-11342: Merged V4.1.7 (4.1.7.7) to V4.1-BUG-FIX (4.1.9)
            65718: MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
               Call onContentUpdate policies on ASPECT_NO_CONTENT removal as it means that new content was uploaded.
               For WebDAV ASPECT_NO_CONTENT is removed on UNLOCK of the new node.
            65741: MNT-10966: 4.1.7 breaks onContentUpdate policies when using webdav
               Add unit test for case
            - Test resources alraedy existed on V4.1-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:30:37 +00:00
Alan Davis
49c93a5978 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68527: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68302: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68117: MNT-11315: Merged V4.1.6 (4.1.6.17) to V4.1-BUG-FIX (4.1.9)
            64849: Merged DEV to PATCHES/V4.1.6 (4.1.6.11)
               63976 : MNT-10797 : Support HTTP Basic auth for /alfresco/cmisatom CMIS binding when using kerberos
                  - Added fallback authentication mechanism for webdav authentication filter for kerberos. So it should be possible to login via BASIC authentication when kerbeross SSO enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:29:37 +00:00
Mark Rogers
7fb813b6ac Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68223: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67994: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
         67783: Merged DEV to V4.2.2-PATHCES (4.2.2)
            67645: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
             - Catch SocketException and report in log that client has cut off communication. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:35:06 +00:00
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