cagache
6717a32b9c
Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/MNT-18558_PermissionIssue
...
# Conflicts:
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/record/DeclareInPlaceRecords.java
2018-06-11 14:49:24 +03:00
Ross Gale
6c5813bc46
MNT-19442 merging up fix for 2.5.4
2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
8883ce2777
MNT-18558 Fix permission issue
2018-06-05 17:22:47 +03:00
Ross Gale
0acddd3802
MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider
2018-06-04 14:48:39 +01:00
Rodica Sutu
297af07a32
Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5
...
# Conflicts:
# rm-automation/pom.xml
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
# rm-enterprise/pom.xml
2018-02-24 21:48:16 +02:00
Elena Hardon
8ad2f373b7
MNT-19114 - Made review changes
2018-02-19 13:40:52 +02:00
Elena Hardon
be3bb1e2f9
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
Tom Page
98765ca22c
Updating license header to 2018
2018-01-16 12:31:06 +00:00
Tom Page
1cda9176a5
Updating license header to 2018
2018-01-16 12:21:10 +00:00
Tom Page
dd613e9492
Merge release/V2.5 into release/V2.6.
2017-12-19 10:26:22 +00:00
Tom Page
8c150529ca
Merge release/V2.5.2.x into release/V2.5.
2017-12-19 10:20:48 +00:00
Ross Gale
f21bed1e01
Merge branch 'release/V2.5' into merge-2.6
2017-12-11 10:49:30 +00:00
Sara Aspery
eca2c62f9d
MNT-18771 Publish Job Upgrade Error
2017-12-08 22:10:16 +00:00
Ross Gale
89e9032a14
RM-5883 adding updated schema number to ensure patch runs in later upgrades, including break command to ensure patch will only run once
2017-12-08 14:49:47 +00:00
Ross Gale
caa99535a1
Merge branch 'release/V2.4' into merge2.5
2017-12-06 11:29:10 +00:00
Ross Gale
f70ad4df3e
RM-5878 mnt changes added to a 2.4 branch
2017-12-05 16:21:07 +00:00
Ana Bozianu
d8da2251e6
Merge remote-tracking branch 'origin/merge-2.5/MNT-18793_to_2.5.x' into merge-2.6/MNT-18793
2017-11-27 15:15:03 +02:00
Ana Bozianu
895e863f11
Merge MNT-18793 from release/V2.5.0.x into release/V2.5
2017-11-27 15:09:13 +02:00
Ana Bozianu
0f62fbe006
MNT-18793 - added paginated navigation in the disposition action executer
2017-11-24 14:27:03 +00:00
Rodica Sutu
1f6e2c1c6f
Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x
2017-11-24 09:51:59 +02:00
Ana Bozianu
0fbe36eaa3
MNT-18793 - added paginated navigation in the disposition action executer
2017-11-23 22:21:51 +02:00
Roxana Lucanu-Ghetu
bdfc843820
RM-5839 Fixed permission denied error and added integration test for the fix.
2017-11-13 10:57:12 +02:00
Roxana Lucanu-Ghetu
8ffc0268ec
RM-5844 Fix permission error.
2017-11-09 11:00:26 +02:00
Ana Bozianu
8d376c5c30
RM-5617 - added integration test and fixed small issues discovered in the process
2017-10-24 17:30:39 +03:00
Ana Bozianu
28704ef015
Feature/rm 5655 classification beyond highest child
2017-09-29 11:39:00 +01:00
Ramona Popa
ee41bb144b
Feature/rm 4729 declassification timeframe rest api
2017-08-22 09:19:03 +01:00
Tuna Aksoy
16300ef0ff
Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonsJavaApiTests' into feature/RM-4707_Classification_Reason_CRUD_REST_API
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
2017-08-04 15:09:02 +01:00
Ana Bozianu
b936f40326
RM-4717 - tests, one failing
2017-08-03 20:28:13 +03:00
Tom Page
c58f7af109
RM-5481 Handle empty string as a reason or exemption id.
...
If the empty string is passed as a classification reason or exemption id then the API framework
converts it to null for us. We should throw a 404 (not found) error, because there are no reasons
or exemptions with the empty string as their id (or null for that matter). Add two new REST API
tests for these cases.
Also stopped using the helper method addParam in TopicsWithInstructionsTest, as it is only saving us
about ten characters, causes an extra import and includes an explicit mention of the topicsApi
inside it (i.e. it doesn't work at all with the guidesAPI).
2017-08-03 13:10:37 +01:00
Tom Page
3bdbee6a01
RM-5309 Merge release/V2.5 into master.
2017-07-24 18:49:10 +01:00
Tom Page
a89fbdede0
MNT-18083 Merge release/V2.5 into master.
2017-07-24 18:45:44 +01:00
Tom Page
96ee22624b
RM-5420 Code review fixes including move toIndentedString into a helper method.
2017-07-24 15:53:35 +01:00
Ramona Popa
c3a3136fb4
RM-5309 - added behaviour bean for qshare:shared aspect and integration test
2017-07-20 11:48:10 +03:00
Tom Page
250ae1e9db
Merge branch 'merge-2.5/MNT-18083_SearchPerformance' into 'release/V2.5'
...
Merge 2.5/mnt 18083 search performance
See merge request !373
2017-07-19 08:39:44 +01:00
Tuna Aksoy
9e832df5ec
RM-5345: Fixed review comments (cherry picked from commit 16ead6e)
...
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 2220fd8
2017-07-10 16:47:44 +01:00
Tuna Aksoy
2e78ed572a
Merge branch 'feature-2.5/RM-5359_integration_test' into merge/RM25_20170709
...
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-authorities-SqlMap.xml
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-common-SqlMap.xml
2017-07-09 18:41:25 +01:00
Tuna Aksoy
83db97a5e3
RM-5359 (An admin user can't declare as record a secured file)
2017-06-30 17:22:38 +01:00
Tuna Aksoy
a206c1e95e
Merge branch 'feature/RM-5345_Fix_security_issues' into 'master'
...
Feature/rm 5345 fix security issues
See merge request !374
2017-06-30 15:45:29 +01:00
Tuna Aksoy
16ead6e811
RM-5345: Fixed review comments
2017-06-28 16:03:38 +01:00
Tuna Aksoy
14dbe100cf
Merge branch 'release/V2.5' into merge/RM_25_2017_07_28
2017-06-28 14:36:45 +01:00
Tuna Aksoy
965539d8f2
RM-5347: Resources should be closed
2017-06-27 16:52:51 +01:00
Tuna Aksoy
2220fd889e
RM-5346: Null pointers should not be dereferenced
2017-06-27 16:35:51 +01:00
Tom Page
082ec147f7
MNT-18083 Merge release/V2.5.0.x into release/V2.5.
2017-06-27 16:24:40 +01:00
Sara Aspery
b9e0017b1e
final change after review - replace logger method
2017-06-27 15:12:22 +01:00
Sara Aspery
10209ef6fa
updated serialId in new RecordMissingMetadataException
2017-06-27 12:48:59 +01:00
rwetherall
88af91dda5
Use the bean id in the cache key to prevent actions and identifiers clashing
2017-06-27 21:42:08 +10:00
rwetherall
c56d48666e
Fix BaseEvaluator cache. Name missing from key.
2017-06-27 16:11:25 +10:00
rwetherall
a5409044c5
Transaction cache on BaseEvaluator.evaluate method
2017-06-27 13:13:25 +10:00
Sara Aspery
1cbdc500d0
changes following review
2017-06-26 12:41:02 +01:00
rwetherall
875fd314b2
Search browse performance improvements
...
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
2017-06-26 07:47:50 +01:00
