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
2,457 Commits 324 Branches 2,170 Tags
4fb07179d7e4fe195cb02836b03ff72a4b51f2ee
Commit Graph

2457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Webster
4fb07179d7 MNT-16852: Add in accidentally deleted bean extender 2016-10-24 17:38:34 +01:00
David Webster
859afafee9 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Mihai Cozma
0cf49bfce9 Fix version with more digits. modified: pom.xml 2016-10-19 08:58:32 +03:00
Mihai Cozma
6c65fa5c7e Merge commit '2745b7' into release/V2.4 2016-10-18 17:39:09 +03:00
Mihai Cozma
78a8885954 Merge branch 'feature-2.3/RM-4250_fileplan_creation_freeze' into release/V2.3 2016-10-17 16:02:21 +03:00
Mihai Cozma
75a8477d0e Fix resource filtering 2016-10-17 13:45:25 +03:00
Mihai Cozma
b6b903c88b Merge branch 'feature-2.3/RM-4245_update_module_version' into release/V2.3 2016-10-14 11:38:51 +03:00
Mihai Cozma
df373db229 add symetrical build-helper-maven-plugin for both rm-share and rm-server 2016-10-14 11:18:28 +03:00
Mihai Cozma
a757cec753 Fixed to handle more digits 2016-10-13 17:08:59 +03:00
Mihai Cozma
cc2046f31a RM-4245_update_module_version 2016-10-13 15:37:54 +03:00
Tuna Aksoy
2dc520e898 Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
 2016-10-10 20:49:13 +01:00
Tom Page
9ed29822ee Merge feature-2.3/RM-3386_DispositionCreatedDate into release/V2.3. 
RM-3386 Ensure that we always use the same method when calculating the "disposition as of" date for the next disposition step.
 2016-10-10 14:20:57 +01:00
Tom Page
b75b546fa6 RM-3386 Fix the logger to be private static final. 2016-10-07 15:14:36 +01:00
Tom Page
b310f5cdc9 RM-3386 Integration test to check that updating the disposition period works. 
This test is the scenario given in the bug report. Create a record that has a
next disposition step in a year. Update the step to be three years, and check
that the record's 'disposition as of' date is updated accordingly.
 2016-10-07 14:57:54 +01:00
Mihai Cozma
24ba8c0961 Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' into release/V2.3 2016-10-07 09:36:59 +03:00
Mihai Cozma
69db34ebd4 Add comments to the method 2016-10-06 13:42:10 +03:00
Mihai Cozma
02556460a4 fix ' And a warning is logged' 2016-10-06 13:17:48 +03:00
Mihai Cozma
309faaea05 Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' of gitlab.alfresco.com:records-management/records-management into RM-2368_Initial_version_record_does_not_inherit_document 2016-10-06 13:08:22 +03:00
Mihai Cozma
7163bc7cda RM-2368 Initial version record does not inherit document type and 
aspects from original document
 2016-10-06 13:03:40 +03:00
Tuna Aksoy
05725e6cce Push unstaged changes 2016-10-05 22:16:52 +01:00
Tuna Aksoy
9d02e0c768 Merge branch 'feature-2.4/RM-4095_Fix_Failing_Integration_Test' into release/V2.4 2016-10-05 19:28:45 +01:00
Tom Page
1ac97228b5 RM-3386 Create unit tests for persistPeriodChanges and calculateAsOfDate. 2016-10-05 16:37:21 +01:00
Silviu Dinuta
3b8f954fcb Merge release/V2.3.0.x into release/V2.3 2016-10-05 11:54:24 +03:00
Silviu Dinuta
3a7bf93d29 changed the version to 2.3.0.9-SNAPSHOT in the pom files and incremented 
the version in module.properties files
 2016-10-05 11:50:22 +03:00
Silviu Dinuta
868c7ef411 removed snapshot from all the pom files 2016-10-05 11:03:11 +03:00
Tuna Aksoy
f28ab68609 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
 2016-10-04 22:56:45 +01:00
Tom Page
0bde77323a RM-3386 Centralise the logic for recalculating "disposition as of" dates. 2016-10-04 16:42:28 +01:00
Tom Page
132b5088c8 RM-3386 Replace apache logger with slf4j. 
Use slf4j to remove the need for a log level check. Note that the constant
strings will be concatenated at compile time so we don't have to worry
about the performance issue here.
 2016-10-04 16:42:28 +01:00
Tom Page
34ab6905d0 RM-3386 Refactor duplicated disposition date code into method. 2016-10-04 16:41:04 +01:00
Mihai Cozma
0d309d2ba7 Re-format acceptance criteria comments 2016-10-04 14:34:07 +03:00
Mihai Cozma
65c0116063 Re-format acceptance criteria comments 2016-10-04 14:27:03 +03:00
Mihai Cozma
04ac478189 Re-format acceptance criteria comments 2016-10-04 14:22:59 +03:00
Tuna Aksoy
f0ceb96e1f Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 2016-10-03 17:02:06 +01:00
Tuna Aksoy
fa291eaa06 Merge branch 'release/V2.3.0.x' into feature-2.3/RM-4162_MergeToV2.3 
Conflicts:
	rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
	rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
 2016-10-03 16:06:45 +01:00
Mihai Cozma
6d2752d34a RM-2368 Initial version record does not inherit document type and 
aspects from original document
 2016-10-03 18:02:20 +03:00
Tuna Aksoy
b8ad24e6bc Merge branch 'hotfix-2.3/RM-4095_Fix_Failing_InplaceRecordPermissionTest' into release/V2.3.0.x 2016-10-03 07:32:34 +01:00
Tuna Aksoy
13cfe5914d RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 22:50:50 +01:00
Tuna Aksoy
deefa0987d RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 21:56:18 +01:00
Tuna Aksoy
18580aa649 RM-4101 (Link to, Copy to and File to rules fail when not run in background) 2016-10-01 17:21:57 +01:00
David Webster
2ceade040e Record Only: Merge branch 'release/V2.3' into release/V2.4 2016-09-30 17:15:47 +01:00
David Webster
028e3d47e3 Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/merge_from_v2.2.0.1 2016-09-30 16:33:49 +01:00
Tom Page
72e875ba1e RM-4162 RM-4907 Merge release/V2.3.0.x into release/V2.3. 2016-09-30 16:23:58 +01:00
David Webster
ecbf4d1edc Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1 2016-09-30 15:35:04 +01:00
Silviu Dinuta
965cb83669 RM-4162: formatting fix 2016-09-29 23:02:13 +03:00
Silviu Dinuta
431c6cd31b RM-4162: fixed formatting 2016-09-29 22:44:37 +03:00
Silviu Dinuta
9ec3f89637 RM-4162: added extra parentNodeRef parameter, checked writers and 
readers individually for null and added unit tests for the changes
 2016-09-29 18:44:06 +03:00
David Webster
3bf3ece86b Update versions to 2.2.0.2-SNAPSHOT 2016-09-28 14:17:06 +01:00
David Webster
31e10e6a4a HF 2.2.0.1 update module version numbers 2016-09-28 11:47:55 +01:00
David Webster
b63fe71b99 HF 2.2.0.1 version number updates 2016-09-28 11:28:16 +01:00
Tom Page
2e0cebc7c6 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00