Tuna Aksoy
6836596a22
Merge branch 'master' into feature/RM-4012_Category_REST_API_2
2016-10-26 16:15:31 +01:00
Tom Page
db7b1684a4
Merge release/V2.5 into master.
2016-10-25 14:22:15 +01:00
Tom Page
7731f4e245
RM-2526 Merge release/V2.4 into release/V2.5.
2016-10-25 10:28:13 +01:00
roxana
8f8b0268f2
I've tweaked the tests a bit to handle daylight savings.
...
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
2016-10-24 14:40:08 +01:00
Tom Page
05d14de22b
RM-2526 Fix location of MultipleSchedulesTest.
2016-10-24 14:07:39 +01:00
Ana Bozianu
e686da88de
fixed audit unit tests
2016-10-18 18:28:29 +03:00
Tom Page
a0e5ed3693
RM-2526 Fix license headers.
2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814
Merge RM-2526 Blended disposition schedule into release/V2.4.
2016-10-18 10:54:43 +01:00
Tuna Aksoy
4ba9e64824
Merge branch 'master' into feature/RM-4012_Category_REST_API
2016-10-12 08:45:08 +01:00
Tuna Aksoy
d95c83df5a
Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016
2016-10-11 20:21:21 +01:00
Tuna Aksoy
0597d60f94
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
2016-10-11 17:00:35 +01:00
Tuna Aksoy
2dc520e898
Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
# rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
# rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
# rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
# rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
2016-10-10 20:49:13 +01:00
Tom Page
d80be797b8
RM-2526 Remove unwanted extra copy of cherry-picked test file.
2016-10-10 15:20:45 +01:00
Tuna Aksoy
79b680e4e5
Merge branch 'master' into feature/RM-4012_Category_REST_API
...
Conflicts:
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
rm-enterprise/rm-enterprise-repo/pom.xml
2016-10-09 16:21:15 +01:00
Tuna Aksoy
7ea10996f9
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_a4c106d
...
Conflicts:
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1727Test.java
2016-10-07 14:40:39 +01:00
Tuna Aksoy
f934297f11
Fixed failing integration and UI tests
2016-10-06 16:26:39 +01:00
Tuna Aksoy
1928e120da
Temp workaround to fix the failing integration tests
2016-10-05 23:58:05 +01:00
Tuna Aksoy
8eff7635df
Merge branch 'release/V2.5' into merge/MergeV25ToMaster
2016-10-05 21:56:11 +01:00
Tuna Aksoy
9d02e0c768
Merge branch 'feature-2.4/RM-4095_Fix_Failing_Integration_Test' into release/V2.4
2016-10-05 19:28:45 +01:00
Tuna Aksoy
b7311e28ac
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25
...
Conflicts:
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
2016-10-05 15:20:19 +01:00
Tuna Aksoy
f28ab68609
Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3
...
# Conflicts:
# rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
# rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
# rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
2016-10-04 22:56:45 +01:00
Roxana Lucanu-Ghetu
3be9d3718c
Merge branch 'feature-2.4/RM-3060' into 'release/V2.4'
...
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off
Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.
See merge request !157
(cherry picked from commit 7345f55384
2016-10-03 12:10:20 +03:00
Tuna Aksoy
13cfe5914d
RM-4095 (Fix failing tests after merging 2.3.0.x up to master)
2016-10-01 22:50:50 +01:00
Tom Page
483bb55a13
Let git handle line endings for us.
2016-09-23 14:36:49 +01:00
Tom Page
bbf9580519
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
Tuna Aksoy
9ecea8d44f
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:47:29 +01:00
Tuna Aksoy
b4298928bd
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:45:57 +01:00
Tuna Aksoy
96e9f8828f
Merge branch 'release/V2.3' into release/V2.4
...
Conflicts:
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
2016-09-22 10:39:50 +01:00
Tom Page
b08d4a788e
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Ana Bozianu
a249953a92
Merge 2.4 merge fix into 2.5
2016-09-21 15:56:06 +03:00
Ana Bozianu
16927d264c
fixed merge error
2016-09-21 15:40:27 +03:00
Ana Bozianu
0a084b2f60
Merge release/2.5 into master
2016-09-21 15:12:01 +03:00
Ana Bozianu
4d2fc69747
Merge release/V2.4 into release/V2.5
2016-09-21 14:33:23 +03:00
Ana Bozianu
a4030ba15d
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Tuna Aksoy
a234bab816
Merge branch 'release/V2.5' into 'master'
...
Merge changes from release/V2.5 into master
See merge request !509
2016-09-20 23:27:32 +01:00
Tuna Aksoy
fa74649d2f
RM-3902 (RM 2.5 Community Release)
2016-09-20 16:05:40 +01:00
Roxana Dina
62a1570f27
RM-3913 FIXMEs should have JIRAs assigned to them.
...
Mention issue number next to Fixme's.
2016-09-06 16:00:49 +03:00
Roy Wetherall
152a6c3484
RM-3027: Remove extended security when a record is copied
2016-08-22 17:17:43 +01:00
Roy Wetherall
8ce7296712
RM-3074: Deleted creators cause failures when declaring records
2016-08-22 15:06:43 +01:00
Roy Wetherall
0a6d7bcf1c
RM-3074: Test group reuse
2016-08-22 08:43:30 +01:00
Roy Wetherall
af04f5367b
RM-3027: Fixed failing test
2016-08-19 13:03:19 +01:00
Roy Wetherall
b48ce96af4
RM-3074: Fixup community integration tests
2016-08-19 12:21:50 +01:00
Roy Wetherall
e4acf5ad7f
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
2016-08-19 10:19:48 +01:00
Roy Wetherall
656909148f
Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities
2016-08-15 13:15:24 +10:00
Roy Wetherall
ee51bd896a
RM-3074: Integration tests
...
* including fix for ghosted records being visible in collab sites
2016-08-15 13:14:53 +10:00
Roy Wetherall
2c1a417e88
RM-3074: Integration Tests, including BDT test helpers to simplify code
2016-08-12 08:39:13 +10:00
Ana Bozianu
cec1ff908a
Merge branch 'feature/RM-3512_QueryForAuthorities' into 'master'
...
Feature/rm 3512 query for authorities
RM-3512 - Add sorting/filtering capabilities for more than one field
Added canned query to retrieve the authorities so we can sort/filter by multiple fields. We support filtering by name pattern, authority type and clearance(new) and sorting by authority name, display name (new), authority type (new) and clearance (new).
Explaining the query:
- all the authorities (users and groups) are under a common zone (APP_DEFAULT) whose node id I pass as parameters trough #{authorityContainerNodeId}
- the authority name is either username (#{qnameUserName}) or group id (#{qnameAuthorityName}).
- I build the display name by concatenating firstName lastName and groupName. Any user has firstName but not all groups have group names (the default groups only have group id). So if after concatenating the 3 properties the display name is null then we are dealing with a default group. In this case the display name will be the group id without the "GROUP_" prefix = substring(authorityName.string_value, 7)
- there is no need for qname id null checks as I never pass null to the query. If I can't find a qname id in the database I simply pass INT_MIN so the qname won't match any row. This way the results are not altered and the query is easy to read.
- the clearance and authority type are not ordered by natural order (ordering alphabetically would look random to the final user) but by a predefined order.
See merge request !410
2016-08-11 18:55:01 +01:00
Roy Wetherall
53bb5ec60c
Merge branch 'master' of gitlab.alfresco.com:records-management/records-management into feature/remove-dynamic-authorities
2016-08-11 10:20:31 +10:00
Oana Nechiforescu
3f38931f12
Updated test to use Cut Off as action label.
2016-08-09 17:53:39 +03:00
Roy Wetherall
f7222748ff
RM-3074: Rename getReader and getWriter methods
2016-08-09 15:06:48 +10:00
