Sara Aspery
f7e69629bb
Merge branch 'release/V3.0' into release/V3.1
2020-01-02 18:21:48 +00:00
Sara Aspery
03eee1b8e3
Update license headers
2020-01-02 16:20:24 +00:00
Sara Aspery
841340c1e8
Merge branch 'release/V2.7' into release/V3.0
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/apiTesting/SearchClassifiedContent.java
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkChecker.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/DocumentSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/RecordSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/interceptor/SavedSearchClassificationEnforcementTest.java
# rm-enterprise/rm-enterprise-repo/src/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/SecurityMarkCheckerUnitTest.java
2020-01-02 16:15:49 +00:00
Sara Aspery
b48d31457a
Update license headers
2020-01-02 15:05:02 +00:00
Sara Aspery
0ed125b0b5
Merge branch 'release/V2.6' into release/V2.7
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/model/AbstractSecureItem.java
2020-01-02 14:19:01 +00:00
Sara Aspery
943dc45a10
Update license headers
2020-01-02 13:57:59 +00:00
Roxana Lucanu
04a74aa699
Merge branch 'merge-3.1/RM-7060_FixSearchAspect' into 'release/V3.1'
...
Resolve RM-7060 "Merge 3.1/ fixsearchaspect"
See merge request records-management/records-management!1331
2019-12-10 07:04:45 +00:00
Roxana Lucanu
d0cb729f35
Merge branch 'release/V3.0' into merge-3.1/RM-7060_FixSearchAspect
2019-12-09 14:39:06 +02:00
Roxana Lucanu
9ef79baddd
Merge branch 'merge-3.0/RM-7060_FixSearchAspect' into 'release/V3.0'
...
Resolve RM-7060 "Merge 3.0/ fixsearchaspect"
See merge request records-management/records-management!1330
2019-12-09 12:36:21 +00:00
Roxana Lucanu
45e39aa4bd
Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect
2019-12-09 10:49:30 +02:00
Roxana Lucanu
04d89e16b5
Merge branch 'release/V2.7' into merge-3.0/RM-7060_FixSearchAspect
2019-12-09 10:44:26 +02:00
Roxana Lucanu
8f9faf6b0e
Merge branch 'merge-2.7/RM-7060_FixSearchAspect' into 'release/V2.7'
...
Resolve RM-7060 "Merge 2.7/ fixsearchaspect"
See merge request records-management/records-management!1329
2019-12-09 08:24:51 +00:00
Roxana Lucanu
6035370684
Merge branch 'release/V2.6' into merge-2.7/RM-7060_FixSearchAspect
2019-12-04 15:44:29 +02:00
Roxana Lucanu
ac12711512
Merge branch 'merge-2.6/RM-7060_FixSearchAspect' into 'release/V2.6'
...
Resolve RM-7060 "Merge 2.6/ fixsearchaspect"
See merge request records-management/records-management!1321
2019-12-04 13:40:22 +00:00
Roxana Lucanu
8d5ff56f8f
Merge branch 'release/V2.5' into merge-2.6/RM-7060_FixSearchAspect
2019-12-03 11:58:42 +02:00
Ross Gale
77799d1632
Merge branch 'merge-3.1/mergeUp' into 'release/V3.1'
...
Merge 3.1/merge up
See merge request records-management/records-management!1320
2019-12-02 07:58:27 +00:00
Ross Gale
6b01d76ed1
Merge branch 'release/V3.0' into merge-3.1/mergeUp
2019-11-29 15:55:07 +00:00
Ross Gale
d74cbe52b6
Merge branch 'merge-3.0/mergeUp' into 'release/V3.0'
...
Merge 3.0/merge up
See merge request records-management/records-management!1319
2019-11-29 15:52:19 +00:00
Ross Gale
7048f30e89
Record only merge of version change.
2019-11-29 12:12:07 +00:00
Ross Gale
3505e8dfd6
fix conflicts
2019-11-29 10:59:47 +00:00
Roxana Lucanu
89cc90cef7
Merge branch 'feature-2.5/RM-7060_FixSearchAspect' into 'release/V2.5'
...
RM-7060 Reapply search aspect when filing/moving
See merge request records-management/records-management!1315
2019-11-28 13:22:55 +00:00
Roxana Lucanu
f138d31436
RM-7060 Fix integration tests
2019-11-27 11:28:32 +02:00
Roxana Lucanu
a7f2dec355
RM-7060 Reapply search aspect when filing/moving
2019-11-26 21:57:35 +02:00
Ross Gale
3c2a6f269c
Merge branch 'merge-2.7/RM-7051_RecordOnly' into 'release/V2.7'
...
Resolve RM-7051 "Merge 2.7/ recordonly"
See merge request records-management/records-management!1311
2019-11-26 13:24:29 +00:00
Ross Gale
850dd8fc15
Record only merge of version change.
2019-11-26 11:36:53 +00:00
Ross Gale
78bec90215
Merge branch 'merge-2.6/RM-7051_RecordOnly' into 'release/V2.6'
...
Resolve RM-7051 "Merge 2.6/ recordonly"
See merge request records-management/records-management!1310
2019-11-26 11:28:38 +00:00
Ross Gale
cb5e060731
Record only merge of version change.
2019-11-26 11:22:35 +00:00
Ross Gale
c9f73f70bc
Merge branch 'merge-2.5/RM-7051_RecordOnly' into 'release/V2.5'
...
Resolve RM-7051 "Merge 2.5/ recordonly"
See merge request records-management/records-management!1309
2019-11-26 11:16:17 +00:00
Ross Gale
8c721c710c
Record only merge of version change.
2019-11-26 10:38:34 +00:00
Ross Gale
9d3dae0666
Merge branch 'merge-2.7/RM-7051_MergeUp' into 'release/V2.7'
...
Resolve RM-7051 "Merge 2.7/ mergeup"
See merge request records-management/records-management!1308
2019-11-26 08:43:17 +00:00
Ross Gale
813ed3ced6
Update version.properties
2019-11-25 08:35:50 +00:00
Ross Gale
3937379587
RM-7051 resolving conflict
2019-11-25 08:31:09 +00:00
Ross Gale
93f3458498
Merge branch 'merge-2.6/RM-7051_mergeUp' into 'release/V2.6'
...
Resolve RM-7051 "Merge 2.6/ mergeup"
See merge request records-management/records-management!1306
2019-11-22 18:15:24 +00:00
Ross Gale
ffaf55c7d3
Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
...
Resolve RM-7051 "Hotfix 2.5/ disposition"
See merge request records-management/records-management!1303
Adds web script to ensure all records have correct disposition instructions
2019-11-22 18:15:24 +00:00
Ross Gale
0fb8c59172
Merge branch 'merge-2.5/RM-7051_mergeUp' into 'release/V2.5'
...
Resolve RM-7051 "Merge 2.5/ mergeup"
See merge request records-management/records-management!1305
2019-11-22 14:25:27 +00:00
Ross Gale
df6d92d031
Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
...
Resolve RM-7051 "Hotfix 2.5/ disposition"
See merge request records-management/records-management!1303
Adds web script to ensure all records have correct disposition instructions
2019-11-22 14:25:27 +00:00
Ross Gale
12aa2c4616
Updating version number after release
2019-11-22 08:55:41 +00:00
alfresco-build
eaca05e4b6
[maven-release-plugin] prepare for next development iteration
2019-11-21 18:15:33 +00:00
alfresco-build
79de26057c
[maven-release-plugin] prepare release V2.5.3.3
2019-11-21 18:15:29 +00:00
Ross Gale
e0dd0ca886
Merge branch 'hotfix-2.5/RM-7051_Disposition' into 'release/V2.5.3.x'
...
Resolve RM-7051 "Hotfix 2.5/ disposition"
See merge request records-management/records-management!1303
2019-11-21 14:32:24 +00:00
Ross Gale
8f42f0caf0
RM-7051 merge
2019-11-21 11:08:39 +00:00
Ross Gale
9e4586b699
RM-7051 review comments
2019-11-21 11:04:35 +00:00
Roy Wetherall
347a2ef9db
Prevent unwanted audit entries appearing when updating the records
2019-11-21 13:54:09 +11:00
Ross Gale
022647d84b
RM-7051 simplyfing sql and adding check for links
2019-11-21 01:16:37 +00:00
Ross Gale
9099444e2d
RM-7051 updating messaging
2019-11-20 13:33:35 +00:00
Ross Gale
9c1904db77
RM-7051 running the find records and update as system
2019-11-20 10:51:33 +00:00
Ross Gale
cdf1118b29
RM-7051 removing previous sql code
2019-11-19 16:20:39 +00:00
Ross Gale
364ee7838a
RM-7051 removing patch code updating webscript
2019-11-19 13:38:40 +00:00
Roy Wetherall
dca4cf154f
Added web script to do record disposition schedule updates
2019-11-19 20:56:26 +11:00
Ross Gale
898a95cd85
RM-7051 updating patch code
2019-11-18 23:28:08 +00:00
