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
5,032 Commits 324 Branches 2,170 Tags
5849812683437c645eb9fcbed5c468d6da411c89
Commit Graph

716 Commits

Author SHA1 Message Date
Sara Aspery
5849812683 Update license headers 2020-01-02 15:05:02 +00:00
Sara Aspery
1f7a81fd45 Merge branch 'release/V2.6' into release/V2.7 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
 2020-01-02 14:19:01 +00:00
Sara Aspery
8ae4ef6290 Update license headers 2020-01-02 13:57:59 +00:00
Roxana Lucanu
26cd72a416 Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect 2019-12-04 15:44:29 +02: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
cc52137795 RM-7051 resolving conflict 2019-11-25 08:31:09 +00: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
cagache
1f6bb8c277 apply code style 2019-09-02 13:33:37 +03:00
Roy Wetherall
02411e3e59 Deal with review comments 2019-08-30 11:28:44 +10:00
Roy Wetherall
88e538ddbb Addition tests for records, fixed up a couple of issues in the query method as a result. 2019-08-29 21:35:00 +10:00
Roy Wetherall
e282c0584e Fix issue with inaccurate results returning from content URL query 
* added integration test for MNT scenarios
* checked for nodeId's that don't exist in query results
* changed DAO method to return set of node references rather tha nodeId strings
* turned off logging by default
 2019-08-29 12:28:04 +10:00
Roy Wetherall
4518cd8615 Add logging to rm query DAO implementation 2019-08-29 09:50:57 +10:00
Sara Aspery
30f770a504 Merge branch 'feature-2.7/MNT-20740_BinDuplicationHotFix' into hotfix-2.7/MNT-20740_BinDuplicationHotFix 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
 2019-08-22 12:29:45 +01:00
Sara Aspery
ecbaa3b40c MNT-20740 New db query 2019-08-22 11:19:34 +01:00
Sara Aspery
640ddc95f9 MNT-20740 BinDuplicationHotFixSqlRefactor 2019-07-30 16:35:48 +01:00
Ross Gale
aa83ccaab8 MNT-20741 adding code to check for subtypes 2019-07-11 15:41:14 +01:00
Ross Gale
e2e0e5631a MNT-20740 initial commit for delete protection for copied records 2019-07-10 10:53:27 +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
Ross Gale
0c2833a5a2 RM-6787 updating copy and add behaviors for other aspects to use duplication utility class 2019-04-02 11:47:29 +01:00
Ross Gale
47c8d875e9 RM-6787 adding fix for version number increasing and bin duplicating more than needed 2019-04-01 17:54:23 +01:00
rlucanu
86ae0f726a RM-6786 another fix 2019-03-14 16:24:50 +02:00
rlucanu
2f15cc786e RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
Rodica Sutu
475164672e Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 09:19:23 +02: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
Rodica Sutu
78b7f39695 Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2019-01-16 11:44:49 +02:00
Ross Gale
0d9f375d7b RM-6702 updating headers to 2019 2019-01-04 10:11:45 +00: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
3dedf274f2 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/Merge_MNT-19967_From2.6 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/DispositionScheduleService.java
 2018-10-02 14:51:13 +03:00
cagache
7419a076c7 MNT-19967 Get record disposition schedule from first parent category which has one 2018-09-27 12:40:04 +03:00
Rodica Sutu
a9b292c9fa Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2018-09-10 12:50:01 +03:00
Rodica Sutu
2b8ebc8bb7 Merge origin/release/V2.6' into merge-2-7/MNT-19080_RM-6504_MergeFrom2.6 
* remotes/origin/release/V2.6:
  fixed tests because exception changed
  use fileFolderService instead of contentService
  MNT-18806 create a new content URL for the copy only if it has content
  MNT-18806 create a new content bin for the copy on copy complete behavior
  MNT-18806 Add REST test for deleting copy of record.
  MNT-18806 Remove some raw Exceptions from REST test framework.
 2018-08-27 20:01:26 +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
Rodica Sutu
086faa7a19 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2-7/MNT-19080 2018-08-23 14:48:06 +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