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,214 Commits 324 Branches 2,170 Tags
d645c19e37d03248e6c5bb9651a5594accc468eb
Commit Graph

737 Commits

Author SHA1 Message Date
Rodica Sutu
f95221967c check if the node is rm specific; 2018-04-23 16:38:24 +03:00
Rashmi Itagi
c03849605f Merge branch 'feature/RM-6249_SkipNodesWithExemptions_sm' into 'master' 
RM-6249 Don't update the declassification date of nodes with exemptions.

See merge request records-management/records-management!937
 2018-04-12 09:46:14 +01:00
Ross Gale
062bed8e43 Merge branch 'feature/RM-6137_AddCategoryIdToSearch' into 'master' 
RM-6137 Add record category identifier to search

See merge request records-management/records-management!956
 2018-04-11 18:06:17 +01:00
Ross Gale
522abe1ee9 RM-6137 Add record category identifier to search changes added 2018-04-10 17:11:26 +01:00
Roxana Lucanu-Ghetu
ae53df9d2b RM-6171 Fix to display classify action from a collaboration site. 2018-04-05 11:52:20 +03:00
Roxana Lucanu-Ghetu
d95495c9c7 RM-6171 Added restrictions for displaying classify option. 2018-04-04 15:16:18 +03:00
Tom Page
9435cab7a2 RM-6249 Don't update the declassification date of nodes with exemptions. 2018-03-27 15:29:16 +01:00
Roxana Lucanu-Ghetu
a431b6bfcf RM-2053 Added classification capability restriction to classify action. Code review changes. 2018-03-27 01:25:49 +03:00
Rodica Sutu
3bc1e04717 minor java docs update 2018-03-23 17:31:02 +02:00
Rodica Sutu
5c860eab69 review changes 2018-03-23 17:28:21 +02:00
Rodica Sutu
54203553c2 audit the properties specific to cm:person before deleting the node in order to provide information about the delete user 2018-03-21 23:06:48 +02:00
Rodica Sutu
28f8c48dfa audit the delete person event on beforeDeleteNode 2018-03-20 21:52:25 +02:00
Rodica Sutu
1bef29e80b audit the cm:person beforeDeleteNode 2018-03-20 08:49:04 +02:00
Rodica Sutu
c06ecabb17 Merge branch 'merge-2.6/FixesFrom2.5' into merge/RM-6069_MergeFrom2.6ToMaster 
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/ClassifyRecord.java
#	rm-automation/rm-automation-ui/src/test/resources/smokeTests.xml
#	rm-automation/rm-automation-ui/src/test/resources/testng.xml
 2018-02-27 15:35:44 +02: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
Sara Aspery
27cf9be622 RM-6040 Fix Highest Classified Child for non-container 2018-02-09 09:58:53 +00:00
Sara Aspery
f5a8e7866d Merge branch 'feature/RM-6008_HighestClassificationRestApi_no' into 'master' 
RM-6008 - Highest Child Classification Rest Api

See merge request records-management/records-management!813
 2018-02-05 19:34:28 +00:00
Roxana Lucanu-Ghetu
f78387e57e RM-5733 Removed unused parameter allowContextFromAsOf. 2018-02-04 21:52:46 +02:00
Roxana Lucanu-Ghetu
ee62eb74d8 RM-5733 Changed the way retention as of date is calculated. 2018-02-02 16:11:38 +02:00
Sara Aspery
09304563f2 RM-6008 Highest child classification Rest API 2018-02-02 10:52:28 +00:00
Sara Aspery
b97d4b6998 Merge branch 'feature/RM-5987_ViewFullAuditLogCanCrashAlfresco' into 'master' 
RM-5987 View Audit Log can crash Alfresco

See merge request records-management/records-management!788
 2018-02-01 09:10:12 +00:00
Sara Aspery
ed04588a69 RM-5987 View Audit Log - removed spring default 2018-01-30 11:50:06 +00:00
Rodica Sutu
b42ef56d9e minor updates for getHighestClassificationLevelFromImmediateChildren() implementation 
unit tests & integration tests created
 2018-01-29 18:16:15 +02:00
Rodica Sutu
d5af9932f9 review updates - minor formatting, update java docs 2018-01-29 09:29:08 +02:00
Rodica Sutu
975b2fe323 updates after review: 
update the getChildrenPropertyValues return type
update the existing tests from RecordsManagementQueryDAOImplTest that test getChildrenPropertyValues() method
 2018-01-26 16:48:38 +02:00
Rodica Sutu
547bb407da modify the hasChildrenWithPropertyValues to getChildrenPropertyValues in order to return the query result 
update the implementation where the modified method is used
update tests
 2018-01-26 10:57:49 +02:00
Sara Aspery
7212ec9b98 RM-5987 changes from review 2018-01-26 07:11:20 +00:00
Rodica Sutu
cbeebaedc0 change the old query select_CountChildrenWithPropertyValues to return the list of distinct property values from children 
update the implementation were the updated query is used
 2018-01-24 15:22:10 +02:00
Sara Aspery
48f77fc38e RM-5987 use Spring to hold max entries default 2018-01-24 09:08:09 +00:00
Sara Aspery
c56eec63ea RM-5987 View Audit Log can crash Alfresco 2018-01-23 17:59:41 +00:00
Tom Page
4d1c8624cf Merge branch 'feature/TimeZoneFixUnitTest_no' into 'master' 
Revert changes to getStartOfDay.

See merge request records-management/records-management!780
 2018-01-19 08:14:25 +00:00
Sara Aspery
ee6c2a0251 Merge branch 'feature/RM-5927_v20PatchesRunWhenV22Upgrade' into 'master' 
RM-5927 Add appliesToVersion to v20 v21 patches

See merge request records-management/records-management!764
 2018-01-18 15:36:41 +00:00
Tom Page
3b983d013f Revert changes to getStartOfDay. 
Sonar suggested using the Java 8 method Instant.truncatedTo, as it is faster than
DateUtils.truncate. However it has different handling of TimeZones, and the old
version of this code only works when the server is set to use UTC. In order to fix
this 'properly' we need code like:
  date = (date == null ? new Date() : date);
  return Date.from(date.toInstant().atZone(ZoneId.systemDefault()).truncatedTo(ChronoUnit.DAYS).toInstant());
which is significantly less readable than just using DateUtils.truncate. Given that
this code hasn't ever been highlighted by our profiling, I suggest we revert back
to the older code.
 2018-01-18 16:13:20 +01:00
Sara Aspery
d691d343d6 RM-5927 Changes from review 2018-01-18 11:41:02 +00:00
Sara Aspery
2d075e14d1 RM-5927 Check installed vs current version 2018-01-18 02:58:38 +00:00
Sara Aspery
a196d2b8c3 RM-5927 Check version nbrs and remove appliesTo 2018-01-17 06:47:24 +00:00
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
1cda9176a5 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Tom Page
acae374a35 Add debug log message if exceptions are swallowed. 
Fix a couple of minor issues in DynamicAuthoritiesGet webscript.
 2018-01-12 15:25:56 +00:00
Tom Page
bc07bbfb44 Replace a few RuntimeExceptions with AlfrescoRuntimeExceptions. 2018-01-12 14:54:51 +00:00
Tom Page
965d86508e A couple of minor fixes. 
Fix method signature to refer to the precise exception thrown.

Use Instant from Java 8 rather than DateUtils.truncate.
 2018-01-12 14:13:05 +00:00
Tom Page
f7e98b5df2 Simplify inequality check as suggested in code review. 2018-01-08 08:34:42 +00:00
Tom Page
496b2ca208 Fix some issues raised by Sonar. 
Avoid NPE if calculateListOfEmptyFolders returns null in ScheduleXRecordLoaders.

Fix equals method of a few classes to check against the other instance.

Make synchonisation consistent in AppliedSourceServiceImpl and also remove a
redundant null check.

Use Arrays.toString to make a more readable string representation of an array.

Combine a few if statement branches that do the same thing.
 2018-01-05 16:19:33 +00:00
Tom Page
1ea0b9fccf Merge branch 'feature/RM-5344_DODAuditQuery_fp' into 'master' 
RM-5344 Only gather DOD audit entries if there is a DOD RM site.

See merge request records-management/records-management!759
 2018-01-05 08:19:57 +00:00
Tom Page
00517a13c4 RM-5344 Handle case where site with id "rm" doesn't exist. 
This is not possible normally, but it does happen with the integration tests.

Also fix some whitespace in the test class.
 2018-01-04 14:38:57 +00:00
Tom Page
db72233b70 RM-5344 Only gather DOD audit entries if there is a DOD RM site. 
This creates an edge case where DOD audit entries are no longer displayed
if a DOD RM site is deleted and then a standard RM site is created to
replace it. However this seems like an unlikely use case, and there is a
workaround of exporting the audit log before deleting the DOD RM site.

Two audit queries are still made for DOD RM sites because DOD sites cause
some standard audit entries to be created (e.g. the holds container
created event, etc.).
 2018-01-04 12:08:01 +00:00
Elena Hardon
a81e822b46 Merge branch 'master' into feature/RM-5225_AppendUniqueIdToRecordOnCopyToAction_fp 2018-01-03 12:13:53 +02:00
Ana Manolache
4a145de54e update headers to 2018 2018-01-03 12:01:00 +02:00