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,616 Commits 324 Branches 2,170 Tags
04a74aa6996041d009ea7bc45f93cf209b648d93
Commit Graph

830 Commits

Author SHA1 Message Date
Roxana Lucanu-Ghetu
9080fc7976 RM-2053 Added classification capability restriction to classify action. Code review changes. 2018-03-27 01:25:49 +03:00
Rodica Sutu
b537bf6804 minor java docs update 2018-03-23 17:31:02 +02:00
Rodica Sutu
9d6bdeaa8b review changes 2018-03-23 17:28:21 +02:00
Rodica Sutu
da54db41c7 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
94581b56fa audit the delete person event on beforeDeleteNode 2018-03-20 21:52:25 +02:00
Rodica Sutu
f658688783 audit the cm:person beforeDeleteNode 2018-03-20 08:49:04 +02:00
Rodica Sutu
7b7948ccb4 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
d11efb8c77 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
f1e3c0b853 MNT-19114 - Made review changes 2018-02-19 13:40:52 +02:00
Elena Hardon
e1b24791be 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
6d1b54d23d RM-6040 Fix Highest Classified Child for non-container 2018-02-09 09:58:53 +00:00
Sara Aspery
4bdcbd68b7 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
46e56fa7a4 RM-5733 Removed unused parameter allowContextFromAsOf. 2018-02-04 21:52:46 +02:00
Roxana Lucanu-Ghetu
4c42b2cdf6 RM-5733 Changed the way retention as of date is calculated. 2018-02-02 16:11:38 +02:00
Sara Aspery
5c17f76656 RM-6008 Highest child classification Rest API 2018-02-02 10:52:28 +00:00
Sara Aspery
72b4fc4011 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
cdf68bc39e RM-5987 View Audit Log - removed spring default 2018-01-30 11:50:06 +00:00
Rodica Sutu
2f104e9215 minor updates for getHighestClassificationLevelFromImmediateChildren() implementation 
unit tests & integration tests created
 2018-01-29 18:16:15 +02:00
Rodica Sutu
0dfc32fc15 review updates - minor formatting, update java docs 2018-01-29 09:29:08 +02:00
Rodica Sutu
0167d75c44 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
245ffee3e0 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
69439bb3d8 RM-5987 changes from review 2018-01-26 07:11:20 +00:00
Rodica Sutu
0de2737529 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
d466e29dbc RM-5987 use Spring to hold max entries default 2018-01-24 09:08:09 +00:00
Sara Aspery
c748b65cd9 RM-5987 View Audit Log can crash Alfresco 2018-01-23 17:59:41 +00:00
Tom Page
0393f338ec 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
55472663ba 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
0a54487bcf 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
16d7e961de RM-5927 Changes from review 2018-01-18 11:41:02 +00:00
Sara Aspery
b1c33ab9a4 RM-5927 Check installed vs current version 2018-01-18 02:58:38 +00:00
Sara Aspery
1d144c612b RM-5927 Check version nbrs and remove appliesTo 2018-01-17 06:47:24 +00:00
Tom Page
0268299006 Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
350a198837 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Tom Page
9becfe79a5 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
db4871fd8d Replace a few RuntimeExceptions with AlfrescoRuntimeExceptions. 2018-01-12 14:54:51 +00:00
Tom Page
20edcae7c4 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
be45b4ba37 Simplify inequality check as suggested in code review. 2018-01-08 08:34:42 +00:00
Tom Page
dbc57451ed 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
d46ff0b2dd 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
77b5d35685 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
29e00d1ec2 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
1cb87e7d6c Merge branch 'master' into feature/RM-5225_AppendUniqueIdToRecordOnCopyToAction_fp 2018-01-03 12:13:53 +02:00
Ana Manolache
f908442af2 update headers to 2018 2018-01-03 12:01:00 +02:00
Elena Hardon
5fd6602038 RM-5970 - Removed onCopyComplete method from RecordComponentIdentifierAspect because it was overwriting the existing unique id for a record on copy to action 2017-12-21 10:58:30 +02:00
Tom Page
a0e770052b Merge release/V2.6 into master. 2017-12-19 10:27:34 +00:00
Tom Page
01961c2382 Merge release/V2.5 into release/V2.6. 2017-12-19 10:26:22 +00:00
Tom Page
ebfee294df Merge release/V2.5.2.x into release/V2.5. 2017-12-19 10:20:48 +00:00
Ross Gale
88ac5834c9 Merge branch 'release/V2.6' into merge/2.3.2 2017-12-11 15:19:33 +00:00
Ross Gale
b0cc81fc2c Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Sara Aspery
defcb53c70 MNT-18771 Publish Job Upgrade Error 2017-12-08 22:10:16 +00:00