inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,676 Commits 324 Branches 2,170 Tags
1a47c4c44c5f868e355d97cda43408f5a9c1d3cc
Commit Graph

2676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
d729a69922 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
ffc1fe1992 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into 
feature-2.4/RM-3265_MoveDestroyedRecordFolders
 2017-03-13 14:25:18 +02:00
Tuna Aksoy
5aa3721b91 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
98628c75de RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tuna Aksoy
a9375ada87 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00:00
David Webster
0512d6a308 MNT-17550: Remove unnecessary file changes (should have been a record only merge from V2.3.0.x) 2017-03-10 16:00:23 +00:00
David Webster
4f355ad10d Merge branch 'release/V2.3.0.x' into release/V2.3 2017-03-10 15:53:13 +00:00
David Webster
3e3349a919 Merge branch 'release/V2.2' into release/V2.3 2017-03-10 15:51:22 +00:00
Samuel Langlois
ff00888ac4 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
9950f4868c MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
407e1f1e65 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
7dce59e4c8 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
5960df0286 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
50bb522a3e Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
Silviu Dinuta
796f32a461 Merge branch 'feature-2.4/RM-4163_DeclareRecordsConcurrencyIssue' into 'release/V2.4' 
RM-4163: added integration test for scenario provided by Roy and got the

See merge request !116
 2017-03-10 12:51:18 +00:00
Rodica Sutu
c7119d7b41 Merge branch 'feature-2.4/RM-4835_UpdateInviteUsersMethod' into 'release/V2.4' 
Feature 2.4/rm 4835 update invite users method

See merge request !117
 2017-03-10 10:22:36 +00:00
David Webster
b19235004d MNT-17550: Release 2.2.0.3 2017-03-09 17:02:39 +00:00
Rodica Sutu
c68070f50f -update dataprep dependency 
-change the method to invite user from inviteUserToSiteAndAccept to createSiteMember (see MNT-17427)
 2017-03-09 16:56:35 +02:00
Silviu Dinuta
fab6cdfe9b RM-4163: added integration test for scenario provided by Roy and got the 
fix from master
 2017-03-09 16:27:50 +02:00
David Webster
52d46bef65 Merge branch 'hotfix-2.2/MNT-17550' into 'release/V2.2.0.x' 
MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up.

See merge request !114
 2017-03-09 13:16:14 +00:00
Samuel Langlois
c6a698ad55 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-09 11:37:13 +00:00
David Webster
a29ac3e653 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-09 10:55:37 +00:00
David Webster
57b4de11b2 MNT-17550: Add in null checks to prevent NPE and allow correct error codes to bubble up. 2017-03-08 16:05:00 +00:00
Tom Page
cc0c2d477f Merge branch 'merge-2.4/V2.4.0.2Release' into 'release/V2.4' 
Merge 2.4/v2.4.0.2 release

See merge request !93
 2017-03-01 12:34:04 +00:00
Tom Page
47ccbf6e13 Merge release/V2.4.0.x into release/V2.4. 2017-02-28 11:59:11 +00:00
alfresco-build
270727c5aa [maven-release-plugin] prepare for next development iteration 2017-02-28 11:29:40 +00:00
alfresco-build
e172a93995 [maven-release-plugin] prepare release V2.4.0.2 ags-2.4.0.2 2017-02-28 11:29:38 +00:00
Tom Page
4135565f36 Revert "RM-4760 Update maven release to use ssh rather than https." 
Use https for the hotfix, as Samuel has updated the build. We should use
ssh in future though, as it requires less configuration in Bamboo.

This reverts commit 9657806429.
 2017-02-28 06:54:04 +00:00
Tom Page
9657806429 RM-4760 Update maven release to use ssh rather than https. 2017-02-27 15:57:38 +00:00
Tuna Aksoy
45ccd1667e Updated source code management tags after moving to the new gitlab server 
(cherry picked from commit 4d5091f5d0c59504e8db33bd08d3d4c8a6d47111)
 2017-02-27 14:48:53 +00:00
Tom Page
0dcdab2b1e Merge branch 'merge-2.4/MNT-17512_AuditManagePermissions' into 'release/V2.4' 
Merge 2.4/mnt 17512 audit manage permissions

See merge request !82
 2017-02-24 13:05:58 +00:00
Tom Page
c3aaa264f0 Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00
Tom Page
d338fe3fe0 Merge branch 'feature-2.4/MNT-17512_AuditManagePermissions' into 'release/V2.4.0.x' 
Feature 2.4/mnt 17512 audit manage permissions

See merge request !80
 2017-02-24 10:16:27 +00:00
Tom Page
6a756f9f5d MNT-17512 Update audit event strings after review from UA. 2017-02-24 10:05:56 +00:00
Tom Page
ac65ee7758 MNT-17512 Minor fixes after review. 
Add new service method to security bean. Add early exit from audit event
finding loop. Tidy javadoc and remove some blank lines.
 2017-02-24 08:05:11 +00:00
Tom Page
78ac6f5261 Merge MNT-17512_AuditPermissionChanges into release/V2.4. 2017-02-23 17:00:35 +00:00
Tom Page
7dab46ad40 MNT-17512 Add audit events for changes to inherited permissions. 2017-02-23 12:06:09 +00:00
Tom Page
6616f0c572 MNT-17512 Allow partial updates to audit events. 
This is required so that the multiple calls to add permission and remove
permission do not overwrite each other within the transaction (e.g. if
there are permissions for multiple authorities being added, or if a
permission is being changed for a user).
 2017-02-23 10:51:46 +00:00
Tom Page
f83a6d7373 MNT-17512 Fix compilation for Java 7. 2017-02-23 08:32:11 +00:00
Tom Page
57f1566907 MNT-17512 Revert debugging change to RecordsManagementAuditServiceImpl.java. 2017-02-23 08:26:49 +00:00
Tom Page
9d52279f4e MNT-17512 Add auditing of RM permission changes. 2017-02-22 16:34:25 +00:00
Tom Page
8b1012312b Update year to 2017 on license headers. 2017-02-21 14:23:31 +00:00
Tom Page
dc1292833d MNT-16881 Add CreateChild permission to the write group. 
Note that the RM permission code in RecordsManagementPermissionPostProcessor
is not navigating the permission group hierarchy correctly. This is a simple
fix to solve the issue referenced, but the full fix will go into master.
 2017-01-24 11:21:35 +00:00
Tuna Aksoy
5c30a491da Merge branch 'release/V2.3' into release/V2.4 2017-01-04 14:13:35 +00:00
Tuna Aksoy
4090a7e66f Merge branch 'release/V2.3.0.x' into release/V2.3 2017-01-04 13:58:14 +00:00
Tuna Aksoy
373bac00e3 Updated version number to 2.3.0.10-SNAPSHOT 2017-01-04 13:54:12 +00:00
Tuna Aksoy
f4c344b54f Release RM 2.3.0.9 2017-01-04 12:40:14 +00:00
Tuna Aksoy
4462899fb1 RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00
Tuna Aksoy
9f5c1f9215 Merge branch 'release/V2.3' into release/V2.4 2016-12-28 20:34:52 +00:00
Tuna Aksoy
868766c586 Merge branch 'release/V2.3.0.x' into release/V2.3 2016-12-27 20:38:30 +00:00