Commit Graph

795 Commits

Author SHA1 Message Date
Tom Page
699e29bb28 Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3. 2016-10-20 15:20:00 +01:00
Tom Page
48a65f5067 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
David Webster
5077b83ddc Merge branch 'release/V2.2' into merge-2.3/HF-2.2.0.2-merge 2016-10-18 16:40:14 +01:00
David Webster
063479a0c0 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2016-10-18 16:36:10 +01:00
David Webster
b04584ba58 Set up 2.2.0.x HF branch ready for next release 2016-10-18 16:23:46 +01:00
Tom Page
3ad77f6f00 Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3. 2016-10-18 10:36:47 +01:00
roxana
1dea4c9d2d Modified validation for link conditions to compare the original disposition of the record with the target one. 2016-10-18 10:57:08 +03:00
Tom Page
c8577fe90c RM-3386 Persist the fact that an "as of" date has been manually set.
If a "disposition as of" date is manually set using "Edit Retention Date"
then don't update it when changing the disposition schedule steps. Use a
new property to store the fact that the "disposition as of" date has been
manually set.
2016-10-14 16:15:16 +01:00
Mihai Cozma
747ac95e20 RM-4245_update_module_version 2016-10-13 15:37:54 +03:00
David Webster
03118d9e0e MNT-16852: Fix typo in XML 2016-10-13 11:36:47 +01:00
David Webster
14b3e8e212 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
David Webster
9ed162ae2f MNT-16852: First pass at extracting permission mapping to properties file. 2016-10-12 15:08:17 +01:00
Tom Page
b80bff48aa Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule. 2016-10-10 14:34:36 +01:00
Tom Page
4d58308d9a 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
roxana
181ab39f2d Removed disposition selection strategy. 2016-10-09 21:51:09 +03:00
Mihai Cozma
fc1e4a5710 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
Tom Page
70eb0cb399 RM-3386 Centralise the logic for recalculating "disposition as of" dates. 2016-10-04 16:42:28 +01:00
Tuna Aksoy
276aed6179 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 2016-10-03 17:02:06 +01:00
Tuna Aksoy
853220b997 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
17099d1731 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
4cb13c0052 RM-4095 (Fix failing tests after merging 2.3.0.x up to master) 2016-10-01 21:56:18 +01:00
David Webster
8470ed38f8 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
66771a2973 RM-4162 RM-4907 Merge release/V2.3.0.x into release/V2.3. 2016-09-30 16:23:58 +01:00
David Webster
76ca8ea811 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
31c6b1e228 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
adca3362ba Update versions to 2.2.0.2-SNAPSHOT 2016-09-28 14:17:06 +01:00
David Webster
21d4f7db03 HF 2.2.0.1 update module version numbers 2016-09-28 11:47:55 +01:00
Tom Page
e673d7ab03 Let git handle line endings for us. 2016-09-27 13:55:53 +01:00
Silviu Dinuta
3209fff5cd Merge branch 'hotfix-2.3/RM-4097' into hotfix-2.3/RM-4096_RM_4097 2016-09-26 18:26:36 +03:00
Silviu Dinuta
577173c2b6 RM-4097: added fix for both issues 2016-09-26 17:32:53 +03:00
Tom Page
7e14b5231b Let git handle line endings for us. 2016-09-21 13:48:28 +01:00
Tom Page
d4937aeda4 Let git handle line endings for us. 2016-09-21 13:47:25 +01:00
Silviu Dinuta
bad87a123e incremented to 2.3.0.8-SNAPSHOT 2016-09-20 14:06:58 +03:00
Ana Bozianu
a930f5e4f1 Merge release/V2.3.0.x into release/V2.3 2016-09-20 14:00:59 +03:00
Roxana Lucanu
d0b8a79a8a RM-3030 - added filePlan aspect for every thumbnail from renditions
(cherry picked from commit 1de1bcf5f4)
2016-09-15 15:45:34 +03:00
Silviu Dinuta
cc78febd0c RM-3906: added short description for url parameters 2016-09-14 05:19:15 +03:00
Silviu Dinuta
9b5e311936 RM-3960: did most of the review mentioned improvements 2016-09-13 21:12:15 +03:00
Silviu Dinuta
280a3656be RM-3906: added max records parameter in webscript url as obtional and
added aurthentication to admin
2016-09-13 18:04:39 +03:00
Silviu Dinuta
194e075cc6 RM-3906: Implemented webscript 2016-09-13 15:58:43 +03:00
Roy Wetherall
f9ef2cd585 RM-3074: Initial refactoring of the extended security service implementation
RM-3074: Added root group and zones

* added root inplace group, created on start-up if not already there
* all groups created in RM zone
* fixed up file plan permission unit test and removed ignore from test
suite
* removed delimeters from groups names to keep length to a min

RM-3074: Find groups and handle clashes

* refactor how existing groups are found
* name with index
* handle hash clahses

RM-3074: Add exact group match

* ensure that hash match is backed up with exact match
* fill out JDoc

RM-3074: unit testing of extended security service impl

RM-3074: groups assigned to RM roles, not authorities

* IPR groups are now assigned to RM roles rather than the individual
authorities
* more unit tests

RM-3074: Remove unnecessary files

RM-3074: review comments

RM-3074: Refactor so read and write groups are reused independantly based on review comments

RM-3074: Inplace move no longer needs to modify extended security

* inplace move no longer needs to store and reset extended security
* no need to clear extended security when assoc is removed
* a couple of extra checks to inplace move integration test

RM-3074: place common logic to get readers and writers of a node in one place

* added getReadersAndWriters method to extended permission service
* refactored calling services, consolidating code into one location
* extended unit test

Note: getFullAuthenticatedUser has been removed from writers list as it
makes no logical sense since you must be a writer in order to perform
these operations in the first place.

RM-3074: Rename set/remove methods on extended security interface

* create deprecated service interface to tidy things up
* create set method and deprecate exisiting
* crate remove method and deprecate exisiting
* remove deprecation warnings in code

RM-3074: missing file

Change in project structure

RM-3074: Rename getReader and getWriter methods

RM-3074: Unit test for records with renditions

RM-3074: Integration Tests, including BDT test helpers to simplify code

RM-3074: Integration tests

* including fix for ghosted records being visible in collab sites

Add completeEvent method

RM-3074: Review comments

RM-3074: Contributor didn't get write in-place access as expected

* owner derived from cm:creator was not added to writer list
* fully authenticated user in base test was being set incorrectly
* transaction executed outside authentication in BDT classes

RM-3074: missing file

RM-3074: Fixup community integration tests

RM-3074: Fixed failing test

RM-3074: Test group reuse

RM-3074: Deleted creators cause failures when declaring records

RM-3074: Fix unit tests

RM-3074: Remove extended security when a record is copied

Add AlfMock to help backport unit tests

RM-3074: Compile tests with 1.8

RM-3074: Fix integration test

RM-3074: Fix integration tests
2016-09-09 14:00:38 +10:00
Tom Page
9c9fa0b01f Let git handle line endings for us. 2016-09-08 16:27:10 +01:00
Tom Page
880c7506bc Update version to 2.3.0.7-SNAPSHOT. 2016-08-08 11:15:39 +01:00
Roy Wetherall
b38df8aa4e Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/RM-3114-2.3Merge 2016-06-24 15:26:22 +10:00
Tom Page
86c6cd3d7f Merge release/V2.2.1.x into release/V2.2.
Conflicts:
	pom.xml
	rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
	rm-server/pom.xml
	rm-share/config/alfresco/module/org_alfresco_module_rm_share/module.properties
	rm-share/pom.xml
	rm-ui-tests/pom.xml
2016-06-20 10:31:36 +01:00
Roxana Lucanu
22d7efe18f Updated version to 2.2.1.6-SNAPSHOT 2016-05-16 17:25:39 +03:00
Ana Bozianu
a9d32dd8f0 Update version to 2.3.0.6-SNAPSHOT 2016-05-10 19:54:29 +03:00
Ana Bozianu
9f00a4c821 Update version to 2.3.0.5-SNAPSHOT 2016-05-10 16:45:27 +03:00
Ana Bozianu
84d63650c1 Revert "Update version to 2.3.0.5-SNAPSHOT"
This reverts commit e901666d3f.
2016-05-10 15:18:33 +03:00
Ana Bozianu
e901666d3f Update version to 2.3.0.5-SNAPSHOT 2016-05-10 15:17:33 +03:00
Tom Page
fd6ba15eac Update version to 2.3.0.4-SNAPSHOT. 2016-04-13 09:07:57 +01:00