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
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
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
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
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
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
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
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
Ana Bozianu
62952a9306
Revert "Extracted RM Community REST API code to a separate project"
...
This reverts commit 165c08749b
2016-10-05 16:16:52 +03:00
Ana Bozianu
ec66655a1b
Revert "Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project"
...
This reverts commit 74f867dae1
2016-10-05 16:16:04 +03:00
Tuna Aksoy
74f867dae1
Removed RecordsManagementCustomModel and RecordsManagementModel from RM Community Repi and added it to the new RM Community REST API project
2016-10-05 00:08:02 +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
Tuna Aksoy
165c08749b
Extracted RM Community REST API code to a separate project
2016-10-04 12:28:39 +01:00
Ana Bozianu
85d5a80620
RM-4012 - rebamed to fileplan components and used nodes service
2016-10-04 13:01:19 +03:00
Ana Bozianu
3b284fbea9
RM-4012 - added the ig rest api
2016-10-03 14:35:20 +03: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
Tom Page
014e9662bc
Let git handle line endings for us.
2016-09-21 14:55:10 +01: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
da05682d91
RM-3074: missing file
2016-08-19 10:20:09 +01:00
Roy Wetherall
caeee2dafa
RM-3074: Review comments
2016-08-17 10:53:40 +10: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
Roy Wetherall
34bdce8b35
Merge V2.4 to master
2016-08-12 09:02:32 +10:00
Roy Wetherall
c8e7c6272f
Merge 4.2.0.1 to 2.4.1
2016-08-12 08:51:14 +10:00
Roy Wetherall
0a9543405a
RM-3074: Unit test for records with renditions
2016-08-11 10:48:31 +10:00
Roy Wetherall
c7659f9b26
RM-3074: Rename getReader and getWriter methods
2016-08-09 15:06:48 +10:00
Roy Wetherall
30985f1784
RM-3074: Rename set/remove methods on extended security interface
...
* create deprecated service interface to tidy things up
* create set method and deprecate exisiting
* crate remove method and deprecate exisiting
* remove deprecation warnings in code
2016-08-09 12:01:16 +10:00
Roy Wetherall
e93bd3b74a
RM-3074: place common logic to get readers and writers of a node in one place
...
* added getReadersAndWriters method to extended permission service
* refactored calling services, consolidating code into one location
* extended unit test
Note: getFullAuthenticatedUser has been removed from writers list as it
makes no logical sense since you must be a writer in order to perform
these operations in the first place.
2016-08-09 11:20:50 +10:00
Roy Wetherall
b22d408bc5
RM-3074: Inplace move no longer needs to modify extended security
...
* inplace move no longer needs to store and reset extended security
* no need to clear extended security when assoc is removed
* a couple of extra checks to inplace move integration test
2016-08-09 10:27:16 +10:00
Roy Wetherall
1e4c917c1d
RM-3074: Refactor so read and write groups are reused independantly based on review comments
2016-08-08 12:31:44 +10:00
Roy Wetherall
0f676aa7f7
RM-3074: review comments
2016-08-08 11:04:30 +10:00
Roxana Lucanu-Ghetu
a5ba1b3804
Created a property for AlfrescoRuntimeException instead ot the message.
2016-08-04 11:09:15 +10:00
Roxana Lucanu-Ghetu
d6e365ec6c
Moved check for content to be done on commit.
2016-08-04 11:08:53 +10:00
Roxana Lucanu-Ghetu
ee6e676e0d
Added check to allow creating only records inside a record folder.
2016-08-04 11:08:36 +10:00
Roy Wetherall
7a3d9e119d
MNT-16535: non admin users can't file email records via outlook integration
2016-08-04 10:47:20 +10:00
