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
4,672 Commits 324 Branches 2,170 Tags
c4525dec491647ac1b01bbdfb140ebf573ea3452
Commit Graph

634 Commits

Author SHA1 Message Date
Ana Bozianu
eef010c2cb Merge RM-2396 and RM-3727 to master 2017-04-06 10:52:25 +03:00
Ana Bozianu
4ea6723600 Merge 'release/V2.4' into 'release/V2.5' 2017-04-06 10:18:16 +03:00
Ana Bozianu
31331d91bc Merge branch 'feature-2.4/RM-3727_VitalRecordsToReviewNotification' into 'release/V2.4' 
Feature 2.4/rm 3727 vital records to review notification

See merge request !194
 2017-04-05 14:41:04 +01:00
Ana Bozianu
6a1b32a405 RM-3727 - fixed typo 2017-04-05 15:18:11 +03:00
Ana Bozianu
4e91c9b4ed RM-3727 - added unit test for reviewed action and removed notification issued property 2017-04-05 12:04:31 +03:00
Ana Bozianu
38a81d5934 RM-3727 - fixed query and exposed cron job expression in properties 2017-04-04 18:31:17 +03:00
Tuna Aksoy
db492e568f RM-2396: Fixed failing integration tests 2017-04-03 12:05:24 +01:00
Tuna Aksoy
b4a788be3d RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-28 07:23:39 +01:00
Tom Page
f6aeea6687 RM-4942 Ensure the API sorting is case insensitive. 
Take notice of the locale of the server when performing the sort. Also
fix the security group and mark comparators to use the same system.
 2017-03-23 14:22:19 +00:00
Tuna Aksoy
11ac1451c0 Merge branch 'release/V2.5' into merge/Merge_2332_2396 
Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
 2017-03-15 22:17:52 +00:00
Tuna Aksoy
c1103ffbf5 Merge branch 'release/V2.4' into merge-2.5/Merge_2332_2396 2017-03-15 16:38:37 +00:00
Tuna Aksoy
4ef4a1a2b9 Merge branch 'feature-2.4/RM-2396_Record_upload_failure_via_webdav' into release/V2.4 2017-03-15 16:28:38 +00:00
Ana Bozianu
343648614a Merge release/V2.5 into master 2017-03-15 17:59:21 +02:00
Tuna Aksoy
cbad0acae3 Fixed share port for local UI tests and also addressed review comment. 2017-03-15 14:39:57 +00:00
Tuna Aksoy
c9b6227036 RM-4804_Transfer_Completed_Records 2017-03-15 13:17:38 +00:00
Ana Bozianu
19ff92a4c1 Merge merge-2.5 into master 2017-03-15 13:17:37 +02:00
Ana Bozianu
36935814ff Merge release/V2.4 into release/V2.5 2017-03-15 13:05:23 +02:00
Ana Bozianu
62ef6644f0 RM-3265 - fix merge error 2017-03-13 14:53:21 +02:00
Ana Bozianu
8c59aac344 Merge feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder into 
feature-2.4/RM-3265_MoveDestroyedRecordFolders
 2017-03-13 14:25:18 +02:00
Tuna Aksoy
2f06487a3b RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-13 01:01:33 +00:00
Tuna Aksoy
92f0e5bff0 RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-12 21:00:19 +00:00
Tuna Aksoy
5acdf861cf RM-2396 (Upload record via WebDAV fails with org.alfresco.repo.security.permissions.AccessDeniedException) 2017-03-10 17:45:48 +00: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
Ana Bozianu
13d8d50811 Merge branch 'feature/RM-4619_createFolderThroughFTP' into 'master' 
RM-4619 - convert the folder nodes before setting identifier

See merge request !89
 2017-03-06 09:36:57 +00:00
Ana Bozianu
530bb47f57 RM-4619 - fixed the reject record issue 2017-03-03 15:13:03 +02:00
Tom Page
219e4a33dc Merge branch 'merge/RM-4308_AuditManagePermissions' into 'master' 
Merge/rm 4308 audit manage permissions

Closes MNT-17512

See merge request !86
 2017-03-03 07:55:05 +00:00
Ana Bozianu
0353a21611 Revert "Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion"" 
This reverts commit b055176b14.
 2017-03-01 21:32:00 +02:00
Ana Bozianu
b055176b14 Revert "RM-4619 - add the rm search aspect when a record folder is created via conversion" 
This reverts commit 92b9f4df4a.
 2017-03-01 20:46:22 +02:00
Tuna Aksoy
7f0cb596b8 Merge branch 'master' into feature/Update_Alfresco_Dependencies_5_2_d 
Conflicts:
	pom.xml
 2017-02-28 17:41:28 +00:00
Ana Bozianu
f607cbf7be RM-4619 - fixed java7 compilation error 2017-02-27 22:23:04 +02:00
Ana Bozianu
92b9f4df4a RM-4619 - add the rm search aspect when a record folder is created via conversion 2017-02-27 20:11:01 +02:00
Ana Bozianu
c444abb362 RM-4619 - after doing the automated conversion the record component identifier is editable 2017-02-27 17:51:16 +02:00
Ana Bozianu
950c0028f3 RM-4619 - updated unit tests 2017-02-27 16:17:22 +02:00
Ana Bozianu
7e08ee2f98 RM-4619 - convert the folder nodes before setting identifier 2017-02-27 12:41:39 +02:00
Tom Page
0124a94486 RM-4308 Merge release/V2.5 into master. 2017-02-24 16:04:02 +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
895fe29edc Merge release/V2.4.0.x into merge/MNT-17512_AuditManagePermissions. 2017-02-24 10:19:44 +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
6fec039920 Update year to 2017 on license headers. 2017-02-21 14:23:31 +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
Ana Bozianu
1e63b628a0 RM-4673 - delete unused import 2017-02-13 19:24:20 +02:00
Ana Bozianu
31465786bf RM-4673 - moved try catch in the create method so we can use the group name and fixed an update attribute bug 
(cherry picked from commit 22241b1d618f068489218a5d6ef48890333ff1c5)
 2017-02-13 19:20:30 +02:00
Ana Bozianu
43ce56b3b3 RM-4673 - added try catch to handle concurrent attempt to create group 
(cherry picked from commit cb08f0e597e01a17ebab6191f9900e01187e7260)
 2017-02-13 19:20:23 +02:00