inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 330 Branches 2,178 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
46cf88b223 Merge branch 'release/V2.5' of git.alfresco.com:records-management/records-management into feature-2.5/RM-6093_FixTestExecutionOrder 
# Conflicts:
#	rm-automation/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
 2018-02-22 10:12:01 +02:00
Rodica Sutu
1fe8242944 attempt (2) to fix running the test methods in different classes interleaved 2018-02-21 22:57:16 +02:00
Rodica Sutu
2a42637ed7 Merge branch 'feature-2.5/MNT-19114_TestForCreateWikiPage' into 'release/V2.5' 
MNT-19114 Test

See merge request records-management/records-management!856
 2018-02-21 17:21:25 +00:00
Rodica Sutu
194928c0da upgrade the dataPrep dependency 
add a simple test to cover create wiki page issue (MNT-19117)
 2018-02-20 22:52:34 +02:00
alfresco-build
0e869a735f [maven-release-plugin] prepare for next development iteration 2018-02-19 14:24:52 +00:00
alfresco-build
5d80268501 [maven-release-plugin] prepare release V2.7-EA2 ags-2.7-EA2 2018-02-19 14:24:50 +00:00
Elena Hardon
f1e3c0b853 MNT-19114 - Made review changes 2018-02-19 13:40:52 +02:00
Tom Page
a1c9dbc505 Merge branch 'feature/RM-6080_ClassifyRecordFoldersAndCategoriesTests_sm' into 'feature/v2.7EA1' 
RM-6080 Check that cleared rm users with filling permissions on a category can classify with children the category or the record folder

See merge request records-management/records-management!843
 2018-02-19 08:35:48 +00:00
Elena Hardon
b581d58726 MNT-19114: Removed unused comments 2018-02-16 16:08:18 +02:00
Elena Hardon
0da89c011c MNT-19114 - Added integration test which shows that wiki pages can now be created as immediate folder type children under RM site 2018-02-16 16:07:18 +02:00
Tom Page
96e3b8d1b2 RM-6080 Use system user to handle metadata node. 
This allows an rm admin user to classify record folders and their children.
 2018-02-16 11:10:17 +00: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
alfresco-build
cbfa402a24 [maven-release-plugin] prepare for next development iteration 2018-02-14 15:59:52 +00:00
alfresco-build
50091181f3 [maven-release-plugin] prepare release V2.7-EA1 ags-2.7-EA1 2018-02-14 15:59:50 +00:00
Tom Page
fb87586fa1 Remove tag from scm management. 2018-02-14 15:41:21 +00:00
Sara Aspery
e5d42ac653 Merge branch 'feature/RM-6040_HighestChildClassificationAllowsNonContainer_sm' into 'master' 
Resolve External Issue

See merge request records-management/records-management!834
 2018-02-09 16:10:17 +00:00
Sara Aspery
2c0133d0a2 Merge branch 'master' into 'feature/RM-6040_HighestChildClassificationAllowsNonContainer_sm' 
# Conflicts:
#   rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/HighestClassificationFromImmediateChildrenTest.java
 2018-02-09 10:13:01 +00:00
Sara Aspery
6d1b54d23d RM-6040 Fix Highest Classified Child for non-container 2018-02-09 09:58:53 +00:00
Rodica Sutu
fa973b90f7 Merge branch 'feature/fix_continueSuiteToRun' into 'master' 
Fix for stopping the suite of tests to run if @Before/@After fails

See merge request records-management/records-management!830
 2018-02-09 07:48:21 +00:00
Rodica Sutu
9b9dce1db2 update the suite of tests with configfailurepolicy="continue" 2018-02-08 15:51:24 +02:00
gbroadbent
29933615d3 JAPANESE: Updated bundle based on EN-rev2018-02-07 2018-02-08 12:36:52 +00:00
gbroadbent
a357526160 SPANISH: Updated bundle based on EN-rev2018-02-07 2018-02-08 12:33:57 +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
Rodica Sutu
06974177a5 Merge branch 'feature/RM-6007_highestClassificationLevelApiDevelopment_sm' into 'master' 
RM-6007 - Added method to find the highest classification level seen by an user in a folder

See merge request records-management/records-management!798
 2018-01-30 15:21: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
1c222cddf6 Merge branch 'feature/RM-6006_SQL_Query' into 'master' 
feature/RM-6006_SQL_Query

See merge request records-management/records-management!794
 2018-01-29 08:10:56 +00: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
cagache
398f8079fe automated test cases for edit classification sources 2018-01-18 10:12:48 +02:00
Sara Aspery
b1c33ab9a4 RM-5927 Check installed vs current version 2018-01-18 02:58:38 +00:00
cagache
e13ef5e0ae revert last change 2018-01-17 13:05:54 +02:00
cagache
a4167525a2 updated selectors based on review 2018-01-17 13:01:56 +02:00
Sara Aspery
1d144c612b RM-5927 Check version nbrs and remove appliesTo 2018-01-17 06:47:24 +00:00
Tom Page
b18561e81e Merge release/V2.6 into master. 2018-01-16 13:14:22 +00:00
Tom Page
0268299006 Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
4d727df4e1 Record-only merge V2.6.0.x into V2.6 2018-01-16 12:26:25 +00:00