Commit Graph

1491 Commits

Author SHA1 Message Date
Alan Davis
415f7fee2c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100986: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100829: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100693: Merged DEV to V4.2-BUG-FIX (4.2.5)
            89520 : MNT-12597: Share: Accepting site invitation via email does not show on the 'Completed Task' task.
               - Using asignee from request parameter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-01 01:25:45 +00:00
Alan Davis
d65016321b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100869: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100839: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100838: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100835: MNT-13752: LinksRestApiTest fails during Summer
               - Fix for the build failure. Use the same ISO8601DateFormat to compare values.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-31 23:22:08 +00:00
Alan Davis
f8a6393af4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100471: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100280: Fix to correctly handle root node (null parent qname reference) in ChildAssocRefWrapper for Admin Console scripts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:17:24 +00:00
Alan Davis
1d16fa63ab Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100257: Reverse Merge 5.0.N (5.0.2)
         << Cause 4 build errors >>
         100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
            99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
               - Filter inherited permissions before try to remove them
               - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:16:14 +00:00
Alan Davis
64910942ed Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
         99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
            - Filter inherited permissions before try to remove them
            - Added unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:14:56 +00:00
Alan Davis
6ae2064bfe 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
179a047da4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99765: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99696: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99593: Merged DEV to V4.2-BUG-FIX (4.2.5)
            99564: MNT-13567: [Workflow Public API] : incorrect hasMoreItems value
               - Fixed test failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:56:18 +00:00
Alan Davis
6095d2399e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99763: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99694: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99487: Merged DEV to V4.2-BUG-FIX (4.2.5)
            99401: MNT-13567: [Workflow Public API] : incorrect hasMoreItems value
               - Comparison operator was changed to take in account SkipCount > totalItems condition.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:55:57 +00:00
Alan Davis
9034d57c09 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99691: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99496: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99400: Merged DEV to V4.2-BUG-FIX (4.2.5)
            99360 : MNT-13234 : Duplicate activities in activities feed
               - Added check for avoid duplicate activities
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:52:23 +00:00
Alan Davis
cfa04ebc70 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99377: BENCH-369: BM-0004: API and internals for Alfresco server
    - Move commons Math3 to 'core' project for general reuse
    - Clone NormalDistributionHelper class from Benchmark projects to Alfresco 'core'
    - API added: http://localhost:8080/alfresco/s/api/model/filefolder/load
      JSON:
      {
      "folderPath":"/Sites/t2/documentLibrary",
      "fileCount":"1",
      "minFileSize":"1024",
      "maxFileSize":"2048",
      "maxUniqueDocuments":"10000"
      }
    - Above JSON will create 1 file in the 't2' site document library with spoofed plain text
    - Change away from deprecated API for TransactionListenerAdapter
    - Fix imports and neatness
    - Improve FileNotFoundException details
    - Disable timestamp propagation on the parent folder to reduce CPU overhead
    - Document changes relating to the addition of cm:description properties
    - Add options to control generation of MLText cm:description fields
      - descriptionCount: number of cm:description translations to include
      - descriptionSize:  size in bytes of each cm:description translation
    - Use released 'alfresco-text-gen' V1.1
    - Use fixed text-gen component to prevent ArrayIndexOutOfBOunds
    - Tighten up error message when errors occur on reading content strings
    - Fix random seed generation bug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99503 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-16 13:36:33 +00:00
Alan Davis
8c2e2c77a1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99314: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99190: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99008: Merged DEV to V4.2-BUG-FIX (4.2.5)
            96553: MNT-13206: Temporary "_IDX_..." folders created and not removed when editonline and file path long.
              - VtiPathHelper will be used to resolve paths for Vti methods.
            97131: MNT-13206: Temporary "_IDX_..." folders created and not removed when editonline and file path long.
               - Move and Delete methods were corrected to hande requests with "_IDX_SITE_" identificator.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-12 05:19:48 +00:00
Alan Davis
48974b90cf Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99015: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
    - Refactor of admin console core (non JMX) into Community project
    - Enterprise extensions extend core
    - Moved Interpreter consoles into Community Admin Console
    - Moved Node Browser into Community Admin Console


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-09 21:20:38 +00:00
Alan Davis
58d58b2479 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98968: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98792: Merged NESS/5.0.N-2015_03_04 (5.0.2) to 5.0.N (5.0.2)
         98764: MNT-13364: Failing tests on DB2: QuickShareRestApiTest, SiteServiceTest, GetMethodRegressionTest
            - fixed tests in QuickShareRestApiTest, SiteServiceTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-07 08:08:06 +00:00
Alan Davis
021c0d71d9 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98899: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98890: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98886: Reverse merged V4.1-BUG-FIX (4.1.10)
            << Original commits for this issue caused a performance problem found in 5.0.1 testing >>
            98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
               98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                 - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
            98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
               - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 22:36:57 +00:00
Alan Davis
935887658c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98720: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98568: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
              - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
         98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
            - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-06 08:05:06 +00:00
Alan Davis
0dd0c87f93 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98426: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98384: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98286: MNT-13473: Merged CLOUD39 (Cloud 39.3) to 5.0.1 (5.0.1)
            97951: MNT-13456:


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98533 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:43:09 +00:00
Alan Davis
d0f7fdedf7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98425: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98374: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98372: Merged CLOUD39 (Cloud39.3) to 5.0.1 (5.0.1)
            98353: MNT-13456:


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98532 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:42:32 +00:00
Alan Davis
fb3f359b79 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98422: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98303: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         98253: Fix for     MNT-13503    Solr throws exceptions when activating and then deactivating a model
         - also fixed running embedded tests
         98263: Fix for     MNT-13503    Solr throws exceptions when activating and then deactivating a model
         - fix failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:41:02 +00:00
Alan Davis
36a5e95b8d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98420: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98291: Merged DEV to 5.0.N (5.0.2)
         98157: MNT-13494: Site activities dashlet: notification about deleted blog (save as draft) isn't displayed
            - The isDraft value will be extracted using "isDraft" key.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98527 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-03 23:40:30 +00:00
Alan Davis
7aacfc700c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98074: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97985: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97827: Merged DEV to V4.2-BUG-FIX
          97818: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Corrected junit tests. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-26 07:47:08 +00:00
Alan Davis
7802d4d1dc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98073: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97984: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97763: Merged DEV to V4.2-BUG-FIX
          96388: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Detect "AlfrescoLockKeeperImpl" and then create new LockInfo object. 
          97572: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Added marker for webdav lock. Added new junit test.
          97725: MNT-13183 : Folder accessed through WebDAV is empty when a document is locked through CIFS access
           Corrected some code. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-26 07:46:57 +00:00
Alan Davis
f7b7a8c2bd Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
98009: Merged DEV (5.0.0.BF) to HEAD-BUG-FIX (5.1/Cloud)
      75872: ACE-1408 : Oracle: JBPMWorkflowRestApiTest testTaskInstancePut always fails
      Fixed hiddenTransitions property handling on case of Oracle.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-25 13:30:50 +00:00
Alan Davis
625288ed18 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97695: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97685: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97573: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
            97499: MNT-13194: GetMethodRegressionTest takes from 20 seconds to 4 hours depending on database
               - Fixed the test cleanup.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-21 07:53:33 +00:00
Alan Davis
3307a0a2e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97453: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97429: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         97330: Merged DEV to V4.2-BUG-FIX (4.2.5)
            97261 : MNT-13276 : 403 Forbidden exceptions with "pooled" workflows for Activiti REST API if user (a member of the task assigned group) is not in the administrators group
               - Added check for a member of the task assigned group
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-20 15:04:35 +00:00
Alan Davis
05ad9c59e4 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96863: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96770: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         96760: Merged DEV to 5.0.1 (5.0.1)
            96635: MNT-13310 : Failing test: PublishingRestApiTest testPublishingQueuePost
               - IN_PROGRESS and COMPLETED statuses are added to expected list to take into account slow environments


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-12 09:59:36 +00:00
Alan Davis
65514834c1 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96603: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96403: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         96402: Merged 5.0.0 (5.0.0.6) to 5.0.1 (5.0.1)
            96290: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Escape url.service in html.status.ftl
            96295: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Added XssVulnerabilityEnterpriseTest to enterprise-remote-api
            96364: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Escape args.authenticatorName to avoid XSS
            96365: MNT-13291 : [Security] XSS in /ModuleDeployment
               - Escape args.authenticatorName in enterprise webscripts. Use js_string to encode JavaScript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-10 13:19:10 +00:00
Alan Davis
82126fa6f0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96473: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96360: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96323: Reverse Merge V4.2-BUG-FIX (4.2.5)
            << Reverted as build has been broken for 4 days >>
            95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
               94398: MNT-13234 : Duplicate activities in activities feed
                  - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
               94483: MNT-13234: Duplicate activities in activities feed
                  - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:52 +00:00
Alan Davis
7a008c3eb7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96472: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96359: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96305: MNT-13212: Merged DEV to V4.2-BUG-FIX (4.2.5)
            96032: MNT-13212: Details of tasks assigned to any user are visible to all users via API call
               - Restore workflow permission check in interceptor for getAssignedTasks and getPooledTasks methods. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:43 +00:00
Alan Davis
3b7e58c86a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96471: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96358: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         95704: Merged DEV to V4.2-BUG-FIX (4.2.5)
            94398: MNT-13234 : Duplicate activities in activities feed
               - Changed getFollowers() method with implementing username case sensitive specific, like it done in getSiteMembers() method.
            94483: MNT-13234: Duplicate activities in activities feed
               - Added test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:32:33 +00:00
Alan Davis
010ba4a86c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96317: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      96272: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         96106: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96045: Merged DEV to V4.1-BUG-FIX (4.1.10)
               94227 : MNT-12569: Problems with org/alfresco/repository/thumbnail scripts
                  - Added a test
               94339 : MNT-12569: Problems with org/alfresco/repository/thumbnail scripts
                  - Implemented 'PUT' method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:29:39 +00:00
Alan Davis
5629ef1754 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94375: Merged DEV (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94337: SHA-52: Downloading file via Quick-Share link does not keep international characters in file names
      Fixed QuickShareContentGet webscript to use correct name for downloaded files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:39:40 +00:00
Alan Davis
d47f8618ad Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94326: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94249: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         94198: MNT-12956: Merged DEV to V4.2-BUG-FIX (4.2.5)
            94044: MNT-12956: Querying secondary objectTypes like Aspects towards 1.1 CMIS endpoint fails with: Invalid column for cmis:document cmis:secondaryObjectTypeIds
               - For Solr configure search.OpenCMISQueryService1.1 to use OpenCMISDictionaryService1.1. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95074 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:38:44 +00:00
Alan Davis
f0e8b61c26 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94143: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94081: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93932: Merged DEV to V4.2-BUG-FIX
          93931 : MNT-13191 : Opening /alfresco/webdav from a Kerberos-authenticated IE11 browser causes HTTP error 500
           If user exists in "_alfAuthTicket" session attribute - make full authentication for user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:32:31 +00:00
Alan Davis
8c5fa86309 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94075: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94040: MNT-13150: Merged dev. 5.0.N (5.0.1) to 5.0.N (5.0.1)
          94034: MNT-13150: Web Scripts ignores correct credential provided by user, continues to use expired or invalid ALF_TICKET and at the same time repeatedly prompts for another credential input
              - Basic authentication handling has been added in order URL ticket is not valid. Additional debug logging has been added to report about invalid ticket


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:31:31 +00:00
Alan Davis
10971d5415 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:29:20 +00:00
Alan Davis
7e1f737e7e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93834: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93734: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         - SOURCE/root/projects/remote-api/config/alfresco/templates/webscripts/org/alfresco/collaboration/calendar.get.html.ftl
           was removed from 5.0 as part of an EOL activity
         93559: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            93544: Merged DEV to V4.2.4 (4.2.4)
               93482: MNT-13174: /share/service/components/form {htmlid} unsanitized: XSS vulnerability
                - Add html escape to avoid XSS vulnerability 
            93545: Merged DEV to V4.2.4 (4.2.4)
               93508 : MNT-13177 : /alfresco/wcservice/search/keyword {l} unsanitized: XSS vulnerability 
                  - Escape search.localeId property
            93549: Merged DEV to V4.2.4 (4.2.4)
               93540 : MNT-13173 : /share/service/components/form {destination} unsanitized: XSS vulnerability
                  - Add html escape to avoid XSS vulnerability
            93555: Merged DEV to V4.2.4 (4.2.4)
               93476: MNT-13178: /alfresco/wcservice/api/search/person {l} unsanitized: XSS vulnerability
                  - Add url escape to avoid XSS vulnerability
            93556: Merged DEV to V4.2.4 (4.2.4)
               93477: MNT-13176 : /alfresco/wcservice/collaboration/calendar {nodeRef} unsanitized: XSS vulnerability
                  - Added ?html built-in processing for nodeRef argument. 
         93718: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            93671: Merged DEV to PATCHES/V4.2.4 (4.2.4)
               93661: MNT-13180: go through all API URI and confirm all parameters are sanitized
                  - Add unit test that checks all webscripts for sanitized parameters
            93672: MNT-13190: /alfresco/wcservice/sample/blog/search {q} unsanitized: XSS vulnerability
               Add html escape to fix XSS vulnerability
            93691: MNT-13190: /alfresco/wcservice/sample/blog/search {q} unsanitized: XSS vulnerability
               Patch imported blogsearch template


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:22:44 +00:00
Alan Davis
9762aeb94f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93587: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93514: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93316: Merged DEV to V4.2-BUG-FIX (4.2.5)
            93033 : MNT-13093 : Users cannot add Comments to any documents in Alfresco via Alfresco Mobile App.
               - Include subTypes of desired type to expectedTypes
            93140 : MNT-13093 : Users cannot add Comments to any documents in Alfresco via Alfresco Mobile App.
               - TypeConstraint is changed to check for subClass on demand. Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:27:54 +00:00
Alan Davis
51d5d85846 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93534: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93421: MNT-12982: Merged DEV to 5.0.N (5.0.1)
         93385: MNT-12982: WQS unable to connect to repository
            - Return back empty username which is required for authentication via tickets. For SSO fallbacks do ticket validation if credential is the ticket.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:25:52 +00:00
Alan Davis
586807e319 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93371: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93309: MNT-12794: Merged dev. 5.0.N (5.0.1) to 5.0.N (5.0.1)
          92772: MNT-12794: [Security] Information leak via verbose eror messages
              - Not public exceptions have been transformed into a configurable parameter. The basic configuration has been moved to .web-scripts-application-context.xml.. A safe choice for the name of the parent bean in the context of enterprise tests was put into the .enterprise-web-scripts-application-context.xml.. to ensure that the Cloud tests will work well without not public exceptions configuration. All tests related to the not public exceptions are implemented in .org.alfresco.repo.web.scripts.RepositoryContainerTest.. << N. B.: This revision does not contain changes for Cloud >>


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:21:40 +00:00
Alan Davis
ca7800351f Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93264: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93239: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93194: MNT-12991 : Disabled users can be invited in site
            - Resolved build failures, corrected tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:20:12 +00:00
Alan Davis
c2cefdabfa Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93248: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93130: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93124: Merged DEV to V4.2-BUG-FIX (4.2.5)
            92705 : MNT-12991 : Disabled users can be invited in site
               - Added check for disabled user
               - Added unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:14:38 +00:00
Alan Davis
cfb92ca02b Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92755: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92746: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         92700: MNT-13026: JDK8: 5 test failures in remote-api
         Fixed tests to check JSON correctly as in JDK8 the objects have different order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:05:28 +00:00
Alan Davis
8d4dcadbfc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92630: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92573: Merged DEV to 5.0.N (5.0.1)
         92438: SHA-15 : SPP: Recurrence: null value is displayed in details of event which occurs monthly/yearly on day/weekday/weekend day
            - Added display message day/weekday/weekend day for monthly/yearly Recurrence


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:54:31 +00:00
Alan Davis
46c4d07af0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
92620: ACE-3703 - Refactor Repository Admin Console framework to allow the basic framework to work in Community version
     - Framework base moved to web-client project.
     - Refactored Enterprise admin console to base from the web-client one.
     - Empty Community admin console start page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:53:46 +00:00
Alan Davis
a35aee7b1e Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91788: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91682: Merged 5.0.0 (5.0.0.1) to 5.0.N (5.0.1)
         91617: MNT-12879: Cannot preview or download document with explicit permissions
         Disabled activity generation for file downloads from a private site if the user is not a member of the site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:39:15 +00:00
Alan Davis
0732cc642c Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91710: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91606: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         << Merging only new CMIS >>  
         91469: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91306: Merged DEV to PATCHES/4.2.4
               91267 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Escaping of control characters was added
               91286 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Added tests to check incorrect char in description property of node.
         91470: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
            91313: MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
               - Build failure fixed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:37:48 +00:00
Alan Davis
9f84dc7c72 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
91358: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      91138: Merged DEV to V4.2-BUG-FIX (4.2.5)
         91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
            - Extracting "creationDate" property via filter, like in v3.4
      91139: MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
         - Reverted "merge" to incorrect branch
      91260: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY)
         91156: Merged DEV to V4.2-BUG-FIX (4.2.4)
            91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
               - Extracting "creationDate" property via filter, like in v3.4
      91264: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY)
         91181: Reverse Merged V4.2-BUG-FIX (4.2.5) to V4.2.4 (4.2.4)
            91156: Merged DEV to V4.2-BUG-FIX (4.2.4)
               91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
                  - Extracting "creationDate" property via filter, like in v3.4
            91161: Merged DEV to PATCHES/4.2.4
               91109 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Escaping of control characters was added
               90723 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata
                  - Added tests to check incorrect char in description property of node.
      91342: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5)
         91254: Merged DEV to PATCHES/4.2.4
            91232 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results
               - Extracting "creationDate" property via filter, like in v3.4


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:22:28 +00:00
Alan Davis
fc1a9c75ad Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90946: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90874: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.5)
         90590: MNT-12281 : Cannot set CSV delimiter in DeclarativeSpreadsheetWebScript
         Added CSV delimiter as a request parameter to the DeclarativeSpreadsheetWebScript implementations 
         Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:08:31 +00:00
Alan Davis
df3a2630ab Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90921: MNT-12765 - No endpoints can be configured in Share that use external-auth and a different URL - as they will be redirected down the URL for 'alfresco' endpoint.
   Merged PROPERTY_GROUP_PROTOTYPING (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      90742: Refactoring of SSO paths
       - Added Session User authentication support to RemoteUserAuthenticatorFactory - so can use cookie based auth for example with Public API route.
       - Tidy up of common duplicated code constants e.g. _alfAuthTicket
       - Added Global Authentication Filter around the /api/* endpoint to allow SSO active over Public API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:07:31 +00:00
Alan Davis
e9a5d1c670 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90918: MNT-12764 - The X-Alfresco-Remote-User (SsoUserHeader) SSO code path executes x2 requests and is stateful when it does not need to be
   Merged PROPERTY_GROUP_PROTOTYPING (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      90558: Refactoring of SSO paths
       - Added webscripts.authenticator.remoteuser to allow stateless auth of X-Alfresco-Remote-User via the /service servlet mapping. Falls back to basic auth as usual.
       - Refactored PublicApiAuthenticatorFactory to extend new RemoteUserAuthenticatorFactory to allow external auth to work correctly with Public API endpoint.
       - BasicHttpAuthenticatorFactory tweaked to allow sub-classes to use more of its beans and methods.
       - Related code clean up


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:06:54 +00:00