Commit Graph

24 Commits

Author SHA1 Message Date
Andrei Rebegea
c1270defd1 Merged 5.2.N (5.2.2) to HEAD (5.2)
135255 arebegea: MNT-17427 : api/invite/cancel deletes records in the database with a GET: CSRF/XSS attack
      - delete the script/org/alfresco/repository/invite/invite.get
      - use the alternatives: script/org/alfresco/repository/site/invitation/invitation.post and script/org/alfresco/repository/site/invitation/invitation.delete
      - updating the tests
      - updating the controller for the invitation.delete to a java controller
      - fix test fallout (SiteServiceTest testInviteDisabledUser - expected error status code)
      - improve security by allowing only invitationIDs that belong the the site passed as parameter to be canceled
      - be consistent and return 404 when an invitationID can not be found


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-06-14 17:02:29 +00:00
Alan Davis
f5f174c76c Merged 5.2.N (5.2.1) to HEAD (5.2)
131286 amukha: Merged DEV to 5.2.N (5.2.1)
      131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
      131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - added patch to remove JBPM database tables
      131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - replaced generic DB script with database specific scripts
      131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix DB2 patch
      131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
         - Fix JBPM table removal patch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:46:48 +00:00
Alexandru Epure
e637bcbd6e Merged 5.2.N (5.2.1) to HEAD (5.2)
128660 jkaabimofrad: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128649 jkaabimofrad: Merged JAMAL/MNT-16371 (5.1.2) to 5.1.N (5.1.2)
         128626 jkaabimofrad: MNT-16371: Turned off Inherit Permissions and explicitly added the Site Manager role for the Site to the surf-config folder when it is first created. Also, revoked ownership privileges for surf-config contents.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-08-09 14:06:17 +00:00
Alan Davis
3e1e1edbaa Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
da8101a5ba Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Alan Davis
7bcccda334 Merged 5.1.N (5.1.1) to HEAD (5.2)
122427 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
         -added validation on backend to prevent multiple requests for joining a site
         -updated unit tests
         -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:47 +00:00
Alan Davis
98a4e139b4 Merged 5.1.N (5.1.1) to HEAD (5.1)
120594 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120538 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:35 +00:00
Alan Davis
33bb9e3ad3 Merged 5.1.N (5.1.1) to HEAD (5.1)
120443 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:10 +00:00
Alan Davis
d3d2a6612a Merged 5.1.N (5.1.1) to HEAD (5.1)
120429 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:00 +00:00
Alan Davis
de829cb701 Merged 5.1.N (5.1.1) to HEAD (5.1)
120428 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:51 +00:00
Alan Davis
58efe344c2 Merged 5.1.N (5.1.1) to HEAD (5.1)
120413 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:34 +00:00
Ray Gauss
16f3bba3ba Merged SHA-SIMP-1 (5.1.0) to HEAD (5.1)
105171: SHA-935: Repository Invite Flow Changes
     - Updated remote-api tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-25 14:00:46 +00:00
Tatyana Valkevych
d047d67fb3 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101312: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      99983: RA-62: fix SiteServiceTest so that it uses FileFolderService for copy/move instead of /slingshot API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-08 16:10:03 +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
Will Abson
9326da6ec3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71771: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71676: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         71427: Merged DEV to V4.1-BUG-FIX (4.1.9)
            70397 : MNT-10917 : Group permissions lost when copying/moving folders from repository to site's document library (from Share UI)
               - Added cleaning site permission only at copy from site to another site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:34:31 +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
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
be6f4be740 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
            58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Delete associated groups on callback when archived site is purged. Add unit test for case.
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:24:08 +00:00
Alan Davis
44130c06af Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
         AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
         59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
               58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
                  58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
                  58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Return beforePurgeNode callback binding to Site class.
               58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
               58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
                  58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                     - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
         59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
               - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
                 was being used in later versions.
         59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
            - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:23:12 +00:00
Alan Davis
fd8771e7aa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:19:54 +00:00
Alan Davis
349356d20c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58201: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58101: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
          58100: Build/test fixes after R 58059 revised fix for MNT-9794   Authorities with duplicate names can be easilly created using « AuthorityService »


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61940 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:54:36 +00:00
Alan Davis
6d29eb307f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57073: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56560: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56114: MNT-9104: If username contains uppercase letters the action of joining a site will not be displayed in "My activities"
          Added the license to new test classes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:15:04 +00:00
Samuel Langlois
788d3c9c89 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00