Ana Bozianu
5ad8cbde8d
Merge release/V2.5.0.x to release/V2.5
2016-11-07 17:18:23 +02:00
Silviu Dinuta
e06b50f1f9
RM-4312: fixed some integration tests
2016-11-07 16:05:19 +02:00
Tom Page
035e5c630f
RM-1039 Merge commit '92484a8' into master.
2016-10-31 16:16:51 +00:00
Tom Page
703108c159
RM-1039 Merge commit 'f20e02f' into origin/release/V2.5.
2016-10-31 09:55:28 +00:00
Mihai Cozma
f20e02ffed
Merge commit '103734a' into release/V2.4
2016-10-28 14:48:20 +03:00
Tuna Aksoy
ded1bbef88
Merge branch 'master' into feature/RM-4012_Category_REST_API_2
2016-10-26 16:15:31 +01:00
Tom Page
6c51cad5be
Merge release/V2.5 into master.
2016-10-25 14:22:15 +01:00
Tom Page
3604820810
RM-2526 Merge release/V2.4 into release/V2.5.
2016-10-25 10:28:13 +01:00
roxana
4f1ccefae2
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
5468461288
RM-2526 Fix location of MultipleSchedulesTest.
2016-10-24 14:07:39 +01:00
Ana Bozianu
7a33945dff
fixed audit unit tests
2016-10-18 18:28:29 +03:00
Tom Page
970d1080e2
RM-2526 Fix license headers.
2016-10-18 11:29:10 +01:00
Tom Page
c7b4f284ff
Merge RM-2526 Blended disposition schedule into release/V2.4.
2016-10-18 10:54:43 +01:00
Tuna Aksoy
72afd52a1d
Merge branch 'master' into feature/RM-4012_Category_REST_API
2016-10-12 08:45:08 +01:00
Tuna Aksoy
c97b1223d1
Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016
2016-10-11 20:21:21 +01:00
Tuna Aksoy
cf4dc8cbb1
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
d25b0423fb
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
2b125f7593
RM-2526 Remove unwanted extra copy of cherry-picked test file.
2016-10-10 15:20:45 +01:00
Tuna Aksoy
89513a7316
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
cdd02e9c13
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
f0a83e23d1
Fixed failing integration and UI tests
2016-10-06 16:26:39 +01:00
Tuna Aksoy
feb9bc09c7
Temp workaround to fix the failing integration tests
2016-10-05 23:58:05 +01:00
Tuna Aksoy
524ec7ba84
Merge branch 'release/V2.5' into merge/MergeV25ToMaster
2016-10-05 21:56:11 +01:00
Tuna Aksoy
985c9d06b6
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
0614914beb
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
2db9730702
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
80c64b59eb
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 d9883a3b02
2016-10-03 12:10:20 +03:00
Tuna Aksoy
2832594788
RM-4095 (Fix failing tests after merging 2.3.0.x up to master)
2016-10-01 22:50:50 +01:00
Tom Page
eacfd00e0c
Let git handle line endings for us.
2016-09-23 14:36:49 +01:00
Tom Page
b3b2585e99
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
Tuna Aksoy
aa8e1c1b32
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:47:29 +01:00
Tuna Aksoy
717e2f85ba
RM-4095 (failing test after merging 2.3.0.x to 2.3)
2016-09-22 10:45:57 +01:00
Tuna Aksoy
0f596a6e21
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
014e9662bc
Let git handle line endings for us.
2016-09-21 14:55:10 +01:00
Ana Bozianu
8fd8782c8e
Merge 2.4 merge fix into 2.5
2016-09-21 15:56:06 +03:00
Ana Bozianu
be9f4f6f04
fixed merge error
2016-09-21 15:40:27 +03:00
Ana Bozianu
4ce68e9039
Merge release/2.5 into master
2016-09-21 15:12:01 +03:00
Ana Bozianu
85db34ff48
Merge release/V2.4 into release/V2.5
2016-09-21 14:33:23 +03:00
Ana Bozianu
935d6319e1
Merge release/V2.3 into release/2.4
2016-09-21 11:58:40 +03:00
Tuna Aksoy
1d8bf3e67d
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
c3e480b649
RM-3902 (RM 2.5 Community Release)
2016-09-20 16:05:40 +01:00
Roxana Dina
7fd78f9768
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
f2cbb3628a
RM-3027: Remove extended security when a record is copied
2016-08-22 17:17:43 +01:00
Roy Wetherall
3bd4d2d74b
RM-3074: Deleted creators cause failures when declaring records
2016-08-22 15:06:43 +01:00
Roy Wetherall
7d30c1e9b0
RM-3074: Test group reuse
2016-08-22 08:43:30 +01:00
Roy Wetherall
79d2285bcb
RM-3027: Fixed failing test
2016-08-19 13:03:19 +01:00
Roy Wetherall
5364779912
RM-3074: Fixup community integration tests
2016-08-19 12:21:50 +01:00
Roy Wetherall
c6f4561f8c
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
c000285a86
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
9de6c32046
RM-3074: Integration tests
...
* including fix for ghosted records being visible in collab sites
2016-08-15 13:14:53 +10:00
