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
3,212 Commits 324 Branches 2,170 Tags
f49cd946e188a8421fc999346717a3323cb1538b
Commit Graph

3212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Langlois
a1a9684540 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:57:15 +00:00
David Webster
ff748f7c3a MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:57:15 +00:00
Samuel Langlois
079c0a6823 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-10 14:55:38 +00:00
David Webster
6c6d9398b1 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-10 14:55:38 +00:00
David Webster
7b2fe91534 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2017-03-10 14:52:23 +00:00
David Webster
78bdeada80 Update versions following release of 2.2.0.3 2017-03-10 14:48:11 +00:00
Silviu Dinuta
b68e12b8b3 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
82d33ee82e Merge branch 'release/V2.4' into merge-2.5/RM-4835_UpdateUITests 2017-03-10 13:44:40 +02:00
Rodica Sutu
c7da05f65a 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
23c901af64 MNT-17550: Release 2.2.0.3 2017-03-09 17:02:39 +00:00
Rodica Sutu
c861747b84 -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
e7176597e8 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
c547a5601e 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
217ec53966 MNT-17550/BDE-996 Fix TestNG version to 6.10 2017-03-09 11:37:13 +00:00
David Webster
0ae2d548c7 MNT-17550: Update POM to work around build issue (BDE-996) 2017-03-09 10:55:37 +00:00
David Webster
e85ea821ad 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
f35919c25d Merge branch 'merge-2.5/V2.4.0.2Release' into 'release/V2.5' 
Merge 2.5/v2.4.0.2 release

See merge request !97
 2017-03-01 12:38:05 +00:00
Tom Page
66f920bfc1 Merge release/V2.4 into release/V2.5. 2017-03-01 12:35:30 +00:00
Tom Page
189bb3c2ef 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
fdfd314701 Merge release/V2.4.0.x into release/V2.4. 2017-02-28 11:59:11 +00:00
alfresco-build
daa9e53f09 [maven-release-plugin] prepare for next development iteration 2017-02-28 11:29:40 +00:00
alfresco-build
e8e5003b6d [maven-release-plugin] prepare release V2.4.0.2 2017-02-28 11:29:38 +00:00
Tom Page
8b60927bf4 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 8268b29400.
 2017-02-28 06:54:04 +00:00
Tom Page
8268b29400 RM-4760 Update maven release to use ssh rather than https. 2017-02-27 15:57:38 +00:00
Tuna Aksoy
93d56c580f 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
8fc7ba3913 Merge branch 'merge-2.5/RM-4308_AuditManagePermissions' into 'release/V2.5' 
Merge 2.5/rm 4308 audit manage permissions

See merge request !84
 2017-02-24 16:00:00 +00:00
Tom Page
8336d270fe RM-4308 Merge release/V2.4 into release/V2.5. 2017-02-24 13:09:13 +00:00
Tom Page
a4599de854 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
895fe29edc Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +00:00
Tom Page
68156b91c8 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
0359c8f4ea MNT-17512 Update audit event strings after review from UA. 2017-02-24 10:05:56 +00:00
Tom Page
53f2d3d620 Merge branch 'feature-2.5/FixMavenLaunchFor512' into 'release/V2.5' 
Feature 2.5/fix maven launch for512

See merge request !67
 2017-02-24 08:20:08 +00:00
Tom Page
116322705c 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
96f9efb183 Merge MNT-17512_AuditPermissionChanges into release/V2.4. 2017-02-23 17:00:35 +00:00
Tom Page
ef73be4d58 MNT-17512 Add audit events for changes to inherited permissions. 2017-02-23 12:06:09 +00:00
Tom Page
bd137ccca1 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
cb8b6b804e MNT-17512 Fix compilation for Java 7. 2017-02-23 08:32:11 +00:00
Tom Page
adde6730ff MNT-17512 Revert debugging change to RecordsManagementAuditServiceImpl.java. 2017-02-23 08:26:49 +00:00
Tom Page
d27c9a209b MNT-17512 Add auditing of RM permission changes. 2017-02-22 16:34:25 +00:00
Tom Page
bb566b71d2 Record only merge release/V2.5.1.x into release/V2.5 2017-02-22 16:25:38 +00:00
David Webster
39cf937e4d Update versions ready for 2.5.1.1 work 2017-02-22 16:21:20 +00:00
alfresco-build
2243ff1c09 [maven-release-plugin] prepare for next development iteration 2017-02-22 15:37:47 +00:00
alfresco-build
00b4d9b138 [maven-release-plugin] prepare release V2.5.1 2017-02-22 15:37:45 +00:00
Tuna Aksoy
8a14116cf2 Updated source code management tags after moving to the new gitlab server 2017-02-22 15:16:44 +00:00
Tom Page
6fec039920 Update year to 2017 on license headers. 2017-02-21 14:23:31 +00:00
Tom Page
d97e87c719 Fix plugin repositories to allow running against 5.1.2. 
Also move the enterprise-related repositories into the enterprise profile.
 2017-02-16 11:41:04 +00:00
Tom Page
6a53e953f5 Merge branch 'feature-2.5/browsePerformance' into 'release/V2.5' 
Feature 2.5/browse performance

See merge request !46
 2017-02-15 11:48:00 +00:00
Tom Page
dfeaf10756 Merge branch 'feature-2.5/RM-4861_AddBehaviours' into 'release/V2.5' 
Feature 2.5/rm 4861 add behaviours

See merge request !63
 2017-02-15 11:19:29 +00:00
Tom Page
dee7e2d580 RM-4681 Fix typo and add behaviour for moving RM items. 2017-02-15 04:03:58 +00:00
Tom Page
f7622c0231 RM-4681 Add behaviours to restrict where rm items can be created. 
Record categories can only go in the file plan, or under other record
categories. Record folders can only have categories as a primary parent,
and holds or transfers as secondary parents.
 2017-02-14 16:19:45 +00:00