Ross Gale
993b4f5846
MNT-19442 merging up fix for 2.5.4
2018-06-06 09:31:42 +01:00
Ross Gale
783bccb925
MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider
2018-06-04 14:48:39 +01:00
Rodica Sutu
d11efb8c77
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
f1e3c0b853
MNT-19114 - Made review changes
2018-02-19 13:40:52 +02:00
Elena Hardon
e1b24791be
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
0268299006
Updating license header to 2018
2018-01-16 12:31:06 +00:00
Tom Page
350a198837
Updating license header to 2018
2018-01-16 12:21:10 +00:00
Tom Page
01961c2382
Merge release/V2.5 into release/V2.6.
2017-12-19 10:26:22 +00:00
Tom Page
ebfee294df
Merge release/V2.5.2.x into release/V2.5.
2017-12-19 10:20:48 +00:00
Ross Gale
b0cc81fc2c
Merge branch 'release/V2.5' into merge-2.6
2017-12-11 10:49:30 +00:00
Sara Aspery
defcb53c70
MNT-18771 Publish Job Upgrade Error
2017-12-08 22:10:16 +00:00
Ross Gale
24f6fedc24
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
ea4b979a5f
Merge branch 'release/V2.4' into merge2.5
2017-12-06 11:29:10 +00:00
Ross Gale
c8932192f9
RM-5878 mnt changes added to a 2.4 branch
2017-12-05 16:21:07 +00:00
Ana Bozianu
915e99394c
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
4fcfdb164e
Merge MNT-18793 from release/V2.5.0.x into release/V2.5
2017-11-27 15:09:13 +02:00
Ana Bozianu
33af594d47
MNT-18793 - added paginated navigation in the disposition action executer
2017-11-24 14:27:03 +00:00
Rodica Sutu
8765349a80
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
75469a0f5b
MNT-18793 - added paginated navigation in the disposition action executer
2017-11-23 22:21:51 +02:00
Roxana Lucanu-Ghetu
d0b96f58ab
RM-5839 Fixed permission denied error and added integration test for the fix.
2017-11-13 10:57:12 +02:00
Roxana Lucanu-Ghetu
3747970225
RM-5844 Fix permission error.
2017-11-09 11:00:26 +02:00
Ana Bozianu
e6a54af4a7
RM-5617 - added integration test and fixed small issues discovered in the process
2017-10-24 17:30:39 +03:00
Ana Bozianu
41311ef40b
Feature/rm 5655 classification beyond highest child
2017-09-29 11:39:00 +01:00
Ramona Popa
0917a23dee
Feature/rm 4729 declassification timeframe rest api
2017-08-22 09:19:03 +01:00
Tuna Aksoy
642e8b2ac8
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
bae4d0c394
RM-4717 - tests, one failing
2017-08-03 20:28:13 +03:00
Tom Page
277d9aabbd
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
88a3c42750
RM-5309 Merge release/V2.5 into master.
2017-07-24 18:49:10 +01:00
Tom Page
7e1b33dad7
MNT-18083 Merge release/V2.5 into master.
2017-07-24 18:45:44 +01:00
Tom Page
cb31194cb1
RM-5420 Code review fixes including move toIndentedString into a helper method.
2017-07-24 15:53:35 +01:00
Ramona Popa
1eb4e09a83
RM-5309 - added behaviour bean for qshare:shared aspect and integration test
2017-07-20 11:48:10 +03:00
Tom Page
a473316d3d
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
402ea0ca9a
RM-5345: Fixed review comments (cherry picked from commit f86440b)
...
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 8130305
2017-07-10 16:47:44 +01:00
Tuna Aksoy
5cfc0b3b1b
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
3c822e95cb
RM-5359 (An admin user can't declare as record a secured file)
2017-06-30 17:22:38 +01:00
Tuna Aksoy
1ce62e0434
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
f86440be72
RM-5345: Fixed review comments
2017-06-28 16:03:38 +01:00
Tuna Aksoy
6ad0698360
Merge branch 'release/V2.5' into merge/RM_25_2017_07_28
2017-06-28 14:36:45 +01:00
Tuna Aksoy
0ff080f305
RM-5347: Resources should be closed
2017-06-27 16:52:51 +01:00
Tuna Aksoy
813030506e
RM-5346: Null pointers should not be dereferenced
2017-06-27 16:35:51 +01:00
Tom Page
9e750f7f2b
MNT-18083 Merge release/V2.5.0.x into release/V2.5.
2017-06-27 16:24:40 +01:00
Sara Aspery
29517c366c
final change after review - replace logger method
2017-06-27 15:12:22 +01:00
Sara Aspery
cbabf8e545
updated serialId in new RecordMissingMetadataException
2017-06-27 12:48:59 +01:00
rwetherall
db19519dc7
Use the bean id in the cache key to prevent actions and identifiers clashing
2017-06-27 21:42:08 +10:00
rwetherall
fcab3c3bdf
Fix BaseEvaluator cache. Name missing from key.
2017-06-27 16:11:25 +10:00
rwetherall
d030ede377
Transaction cache on BaseEvaluator.evaluate method
2017-06-27 13:13:25 +10:00
Sara Aspery
7269b33c65
changes following review
2017-06-26 12:41:02 +01:00
rwetherall
90cd720c42
Search browse performance improvements
...
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
2017-06-26 07:47:50 +01:00
Sara Aspery
fb215876b8
fixing IDE whitespaces
2017-06-24 22:49:27 +01:00
Sara Aspery
80434ce57e
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
2017-06-23 16:40:00 +01:00
