Silviu Dinuta
817aa74bfb
RM-4007 fixed some formatting
2016-10-13 16:02:00 +03:00
Silviu Dinuta
1564a8bb1f
Merge remote-tracking branch 'origin/feature/RM-4007_PosibillityToUploadContent' into feature/RM-4012_Category_REST_API
2016-10-13 15:57:38 +03:00
Mihai Cozma
747ac95e20
RM-4245_update_module_version
2016-10-13 15:37:54 +03:00
Ana Bozianu
798b76a8ed
fixed "get pending reviews" solr query
2016-10-13 15:29:12 +03:00
David Webster
03118d9e0e
MNT-16852: Fix typo in XML
2016-10-13 11:36:47 +01:00
David Webster
14b3e8e212
MNT-16852: Optimise list conversion as per code review comment
2016-10-13 11:06:11 +01:00
Silviu Dinuta
b510c89ac7
RM-4007: implemented method for uploading content
2016-10-13 10:50:16 +03:00
David Webster
eca62dfc83
MNT-16852: Add comment explaining reason behind extracting mapping to properties file
2016-10-12 15:31:12 +01:00
David Webster
60c2cb693b
MNT-16852: Remove unnecessary imports
2016-10-12 15:25:06 +01:00
David Webster
9ed162ae2f
MNT-16852: First pass at extracting permission mapping to properties file.
2016-10-12 15:08:17 +01:00
David Webster
f9dd2df5a1
MNT-16852: Fix issue reading properties in Outlook Integration
2016-10-12 09:22:14 +01:00
Tuna Aksoy
72afd52a1d
Merge branch 'master' into feature/RM-4012_Category_REST_API
2016-10-12 08:45:08 +01:00
roxana
fa042c81ae
Changed calculating as of date
2016-10-12 02:13:53 +03: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
David Webster
5cfcd584a5
MNT-16852: Refactor hasPermission method for readability
2016-10-11 12:57:38 +01:00
David Webster
66c9ffe848
MNT-16852: Give write properties permission to file records
2016-10-11 12:51:25 +01:00
roxana
d9bb9b2e00
I've changed the method that calculates the as of date to take in consideration the record creation date instead of the action creation date.
2016-10-11 12:28:07 +03:00
cetra3
a84d41a0b7
Check to see whether repository models are initliased
...
Mirrored from community commit c81600dbfe2006e6ae6531c52704f12d497e4398
2016-10-11 01:37:22 +01:00
Ana Bozianu
ba795912e3
RM-4012 - added specific types, deleted duplicated code and use a core node
2016-10-10 23:44:49 +03: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
d13850dd6e
RM-2526 Add cherry-picked test to test suite.
...
Nb. The test currently fails at the moment.
2016-10-10 15:29:38 +01:00
Tom Page
2b125f7593
RM-2526 Remove unwanted extra copy of cherry-picked test file.
2016-10-10 15:20:45 +01:00
roxana
3ff00097b5
Merge branch 'feature-2.3/RM2526_BlendedDispositionSchedule' of https://gitlab.alfresco.com/records-management/records-management into feature-2.3/RM2526_BlendedDispositionSchedule
2016-10-10 17:14:16 +03:00
roxana
6b2183fb67
Moved UpdateNextDispositionActionTest/
2016-10-10 16:50:21 +03:00
Tom Page
f55111fe6c
RM-2526 Fix NPE found by integration tests.
2016-10-10 14:45:06 +01:00
Tom Page
b80bff48aa
Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule.
2016-10-10 14:34:36 +01:00
Tom Page
4d58308d9a
Merge feature-2.3/RM-3386_DispositionCreatedDate into release/V2.3.
...
RM-3386 Ensure that we always use the same method when calculating the "disposition as of" date for the next disposition step.
2016-10-10 14:20:57 +01:00
roxana
181ab39f2d
Removed disposition selection strategy.
2016-10-09 21:51:09 +03:00
roxana
f0370a443b
Addresed code review comments.
2016-10-09 20:50:28 +03: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
Tom Page
9a9600c782
RM-3386 Fix the logger to be private static final.
2016-10-07 15:14:36 +01:00
Tom Page
4439f9bc18
RM-3386 Integration test to check that updating the disposition period works.
...
This test is the scenario given in the bug report. Create a record that has a
next disposition step in a year. Update the step to be three years, and check
that the record's 'disposition as of' date is updated accordingly.
2016-10-07 14:57:54 +01:00
Tuna Aksoy
cba239d488
Merged V2.4 to V2.5
2016-10-07 14:42:43 +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
roxana
6b916b977f
Changed a bit the methods to be more readable.
2016-10-07 10:45:49 +03:00
Mihai Cozma
fc1e4a5710
Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' into release/V2.3
2016-10-07 09:36:59 +03:00
David Webster
1605c715db
MNT-16852: First pass at Write Properties permission handling
2016-10-06 21:59:11 +01:00
Ana Bozianu
9c23eabf40
RM-4012 - update and delete node
2016-10-06 20:34:58 +03:00
Ana Bozianu
5a4cc334e6
RM-4012 - removed special containers and disposition schedules from the result list
2016-10-06 19:58:33 +03:00
Tuna Aksoy
f0a83e23d1
Fixed failing integration and UI tests
2016-10-06 16:26:39 +01:00
Ana Bozianu
19e02d402c
RM-4012 - moved the rest api to org.alfresco.rest.api package and extended nodes service
2016-10-06 16:34:01 +03:00
Mihai Cozma
6155c71e24
Add comments to the method
2016-10-06 13:42:10 +03:00
Mihai Cozma
3a74bc28f5
fix ' And a warning is logged'
2016-10-06 13:17:48 +03:00
Mihai Cozma
1f114d5a1d
Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' of gitlab.alfresco.com:records-management/records-management into RM-2368_Initial_version_record_does_not_inherit_document
2016-10-06 13:08:22 +03:00
Mihai Cozma
98ca0abe19
RM-2368 Initial version record does not inherit document type and
...
aspects from original document
2016-10-06 13:03:40 +03:00
Tuna Aksoy
feb9bc09c7
Temp workaround to fix the failing integration tests
2016-10-05 23:58:05 +01:00
Tuna Aksoy
ee13f7bbf7
Push unstaged changes
2016-10-05 22:16:52 +01:00
Tuna Aksoy
ffc926b37b
Merged branch for v2.5 -> master
2016-10-05 22:05:30 +01:00
Tuna Aksoy
524ec7ba84
Merge branch 'release/V2.5' into merge/MergeV25ToMaster
2016-10-05 21:56:11 +01:00
