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
Roxana Lucanu
c4525dec49 RM-7145 Fix for hasMoreItems 2020-03-31 10:59:21 +03:00
Roxana Lucanu
e0835f9e82 Revert "Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6'" 
This reverts merge request !1350
 2020-01-27 08:14:33 +00:00
Tom Page
9dfe26829d RM-5733 porting fix - cherry picked commit a2f515a6 2020-01-19 19:32:21 +02:00
Roxana Lucanu
490051aa21 Merge branch 'feature-2.5/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.5' 
RM-7065 Add write transaction in a read only one for creating a node

See merge request records-management/records-management!1344
 2020-01-14 19:02:48 +02:00
Roxana Lucanu
286d18e24c Revert "Merge branch 'merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel' into 'release/V2.6'" 
This reverts merge request !1349
 2020-01-14 16:40:18 +00:00
Roxana Lucanu
ffc768cbd5 Merge branch 'merge-2.6/MNT-20822_hasMore' into 'release/V2.6' 
Resolve MNT-20822 "Merge 2.6/ hasmore"

See merge request records-management/records-management!1350
 2020-01-14 14:13:33 +00:00
Roxana Lucanu
897a450001 Merge branch 'release/v2.6.0.x' into merge-2.6/MNT-20822_hasMore 2020-01-13 18:21:07 +02:00
Roxana Lucanu
48bb960725 Merge branch 'release/v2.5' into merge-2.6/RM-7065_RetentionScheduleInheritanceRecordLevel 2020-01-13 16:30:57 +02:00
Roxana Lucanu
dbde8cefbb RM-7065 fix integration test 2020-01-09 20:21:29 +02:00
Ross Gale
1e38a577a0 MNT-20822 adding comment to overwritten method 2020-01-09 13:36:35 +00:00
Roxana Lucanu
f06f2df8b1 RM-7065 ode review comments 2020-01-08 20:38:37 +02:00
Roxana Lucanu
862c19df35 RM-7065 added forgotten setter 2020-01-07 10:48:49 +02:00
Roxana Lucanu
f30cca289d RM-7065 Add write transaction in a read only one for creating a node 2020-01-07 10:06:17 +02:00
Ross Gale
75bc33640e MNT-20822 adding fix for has more 2020-01-06 16:15:04 +00:00
Ross Gale
2dd9015ad8 MNT-20822 adding fix for has more 2020-01-06 13:58:03 +00:00
Ross Gale
57e464b47f Updating headers 2020-01-06 11:54:31 +00:00
Roxana Lucanu
392ea281b1 update license header 2020-01-06 10:17:27 +02:00
Sara Aspery
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Roxana Lucanu
2afd579818 Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect 2019-12-03 11:58:42 +02:00
Roxana Lucanu
2b7541b501 RM-7060 Reapply search aspect when filing/moving 2019-11-26 21:57:35 +02:00
Ross Gale
5d3efcc4c4 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 18:15:24 +00:00
Ross Gale
92c8c2db21 Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x' 
Resolve RM-7051 "Hotfix 2.5/ disposition"

See merge request records-management/records-management!1303

Adds web script to ensure all records have correct disposition instructions
 2019-11-22 14:25:27 +00:00
Tom Page
156da02c65 Update license headers. 2019-10-02 14:58:48 +01:00
cagache
8c3371b7f0 Back-port fix from MNT-19967 
(cherry picked from commit c412db13d5)
 2019-07-10 07:52:28 +03:00
rlucanu
88f2cecdd0 Reset code back to 7229ec2fbc. 2019-07-10 07:49:40 +03:00
rlucanu
726dcc2e02 Revert "Record only merge of version change." 
This reverts commit eab3137a7c, reversing
changes made to 249675acc7.
 2019-07-09 12:12:28 +03:00
cagache
dfb473eef6 added unit tests 2019-02-18 15:16:48 +02:00
cagache
6a5c267170 addressed code review comments 2019-02-18 10:57:16 +02:00
cagache
b09d7bf8ea added javadoc and removed unused imports 2019-02-15 17:11:04 +02:00
cagache
6ba8c36281 MNT-20145 Duplicate the content url when declaring node as record, version as record, classifying or securing if the node has copies or it is a copy 2019-02-15 16:41:18 +02:00
cagache
1cae71c02a added behaviour to duplicate the bin before declaring a version record 2019-02-14 12:55:10 +02:00
cagache
d94b0fb7fd added IT for delete classified content with copies 2019-02-13 16:00:05 +02:00
cagache
87b56030bd MNT-20145 Don't delete the content url if the file has copies or it is a copy 2019-02-07 17:54:46 +02:00
Ross Gale
c98274f77f RM-6702 updating headers to 2019 2019-01-03 14:30:44 +00:00
Ross Gale
1f2034b4fe RM-6702 Updating licence headers 2019-01-03 09:23:49 +00:00
cagache
7419a076c7 MNT-19967 Get record disposition schedule from first parent category which has one 2018-09-27 12:40:04 +03:00
cagache
b12e058cc7 use fileFolderService instead of contentService 2018-08-24 17:26:25 +03:00
cagache
270e9835de MNT-18806 create a new content URL for the copy only if it has content 2018-08-24 16:25:20 +03:00
cagache
3d0194e9d4 Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/MNT-18806_DeleteCopy_fp 2018-08-24 13:33:59 +03:00
cagache
49aae5d00e MNT-18806 create a new content bin for the copy on copy complete behavior 2018-08-24 13:25:45 +03:00
Claudia Agache
88a17d7007 Merge branch 'feature-2.6/RM-6504_ChangeACSVersion' into 'release/V2.6' 
RM-6504 Changed ACS version

See merge request records-management/records-management!1098
 2018-08-21 14:17:20 +01:00
Rodica Sutu
ea6ad35b65 update the ElementInfo() according to REPO-2983 2018-08-20 12:21:44 +03:00
Rodica Sutu
d04ea4b657 remove custom record search converter 2018-08-16 19:11:57 +03:00
cagache
6717a32b9c Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/MNT-18558_PermissionIssue 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/record/DeclareInPlaceRecords.java
 2018-06-11 14:49:24 +03:00
Ross Gale
6c5813bc46 MNT-19442 merging up fix for 2.5.4 2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
8883ce2777 MNT-18558 Fix permission issue 2018-06-05 17:22:47 +03:00
Ross Gale
0acddd3802 MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider 2018-06-04 14:48:39 +01:00
Rodica Sutu
297af07a32 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5 
# Conflicts:
#	rm-automation/pom.xml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
#	rm-enterprise/pom.xml
 2018-02-24 21:48:16 +02:00
Elena Hardon
8ad2f373b7 MNT-19114 - Made review changes 2018-02-19 13:40:52 +02:00
Elena Hardon
be3bb1e2f9 RM-19114: Removed the condition on creating only 2 folder-types from root and modified the unit test that was checking this 
(cherry picked from commit af108af09125ed3da3e6ff6673434c3b045469a2)

# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java
 2018-02-15 20:47:38 +02:00