Tom Page 7a2598dfc7 Fixing unresolved merge conflicts. ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2015-09-09 13:19:06 +00:00

..

audit

Revert to original code structure pre-mavenization

2014-01-08 06:38:59 +00:00

bootstrap

RM-1575: Missing information from Hold Report

2014-06-30 09:56:38 +00:00

capability

Merged V2.3 to V2.1.1:

2015-03-12 23:14:33 +00:00

dod5015

RM-1652 (Classified Records capabilities are never used)

2014-08-18 10:19:35 +00:00

messages

Merged V2.3 to V2.1.1:

2015-03-12 23:14:33 +00:00

model

Merge HEAD to BRANCHES/V2.1.0.x:

2014-07-16 02:00:27 +00:00

patch

RM-1465: RMv21CapabilityPatch takes ages to complete

2014-07-02 02:45:53 +00:00

query

Revert to original code structure pre-mavenization

2014-01-08 06:38:59 +00:00

security

RM-2058: RM Manager can't access Users and Groups (after upgarde)

2015-03-15 23:48:58 +00:00

action-context.xml

RM-1224 (Rmadmin user is not created if auth chain contains not only ALfrescoNTLM)

2014-06-11 08:53:23 +00:00

alfresco-global.properties

RM-2026: Unable to complete historical records when mandatory meta-data missing

2015-03-10 03:10:49 +00:00

extended-repository-context.xml

Fixing unresolved merge conflicts.

2015-09-09 13:19:06 +00:00

log4j.properties

Merge BRANCHES/V2.1.0.x to BRANCHES/V2.2:

2014-10-27 22:31:55 +00:00

module-context.xml

RM-1211: Generate hold report

2014-04-29 07:21:54 +00:00

module.properties

Update version to 2.1.0.3

2014-09-16 23:33:19 +00:00

rm-action-context.xml

Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:

2015-04-29 08:35:10 +00:00

rm-audit-context.xml

RM-1510 (Audit events are incorrectly displayed)

2014-05-22 11:00:47 +00:00

rm-capabilities-context.xml

RM-1361 - Edit Review Date action is not present for cutoff actions.

2014-03-21 04:43:48 +00:00

rm-deprecated-context.xml

Revert to original code structure pre-mavenization

2014-01-08 06:38:59 +00:00

rm-disposition-properties-context.xml

RM: Revert to r59943 due to SVN madness

2014-01-15 16:46:17 +00:00

rm-id-context.xml

Revert to original code structure pre-mavenization

2014-01-08 06:38:59 +00:00

rm-job-context.xml

Merged BRANCHES/V2.1 to BRANCHES/V2.2:

2015-09-09 10:30:08 +00:00

rm-model-context.xml

RM-1540: Event is displayed for record moved to category with no disposition

2014-06-20 05:02:06 +00:00

rm-public-services-security-context.xml

Merge BRANCHES/V2.1.0.x to BRANCHES/V2.2:

2014-10-27 22:31:55 +00:00

rm-report-context.xml

RM-1211: Generate hold report

2014-04-29 07:21:54 +00:00

rm-service-context.xml

Fixing unresolved merge conflicts.

2015-09-09 13:19:06 +00:00

rm-ui-evaluators-context.xml

Fixing unresolved merge conflicts.

2015-09-09 13:19:06 +00:00

rm-webscript-context.xml

RM-2391 - Added capability checking to the AuditLog Get REST API. Added a unit test. Minor changes on the Share side to forward the forbidden status.

2015-08-03 08:43:40 +00:00

rm-workflow-context.xml

Revert to original code structure pre-mavenization

2014-01-08 06:38:59 +00:00