Commit Graph

350 Commits

Author SHA1 Message Date
Mihai Cozma
010e79be05 RM-4320 Upgrade RM 2.5.1 to Alf 5.2 2016-11-16 16:53:15 +02:00
Ana Bozianu
c782ce305b RM-4373 - added filling condition for editing transfer container and transfer nodes 2016-11-16 16:40:53 +02:00
Ana Bozianu
7b328dfa6c RM-4373 - made transfer and hold containers editable 2016-11-16 15:26:52 +02:00
Silviu Dinuta
8b172ac8e9 RM-4293: created capabilities for deleting transfer container and hold
container and restricted the deletion from behaviour beans
2016-11-16 15:09:58 +02:00
Silviu Dinuta
51f99f1846 RM-4293: prevent filePlan and unfiled Record container from behaviour
beans, also removed deleteNode method from RMNodesImpl and some unit
tests
2016-11-15 19:00:48 +02:00
Mihai Cozma
3f7a3e2be1 RM-4320 Upgrade RM 2.5.1 dependency to Alfresco 5.2_SNAPSHOT 2016-11-14 17:33:34 +02:00
Silviu Dinuta
e8fd663859 Merge master into feature/RM-4327 2016-11-14 14:08:09 +02:00
Silviu Dinuta
515475b870 RM-4327: extracted error messages for type restrictions in
action.service.properties
2016-11-14 11:21:32 +02:00
Ana Bozianu
6befb8bd1b RM-4357 - defined allowable operations using RM's capabilities 2016-11-11 18:30:14 +02:00
Mihai Cozma
375c7e1b13 Merge branch 'feature/RM-4329_Alfreco_Search_in_colaboration_site_doesn't_work' into 'master'
Feature/rm 4329 alfreco search in colaboration site doesn't work

See merge request !616
2016-11-11 09:50:21 +02:00
Tom Page
1efc9333e5 RM-2526, RM-4264 Merge release/V2.5 into master. 2016-11-10 14:02:56 +00:00
Tom Page
a75f2d4a1d RM-2526, RM-4264 Merge release/V2.4 into release/V2.5. 2016-11-10 10:52:59 +00:00
Silviu Dinuta
b571ad6381 Merge master into feature/RM-4326 2016-11-10 11:10:51 +02:00
Mihai Cozma
3899fa1d2d RM-4329 Update rmsearch to the latest core search version 2016-11-09 14:18:53 +02:00
Silviu Dinuta
ddab49bf51 RM-4326: undo some formatting 2016-11-09 12:53:53 +02:00
Silviu Dinuta
49cb2f59ae RM-4326: undo some formatting 2016-11-09 12:51:14 +02:00
Silviu Dinuta
7e06083595 RM-4326: removed checkPostPermission method and changed RmSyteType to
handle allowed created types
2016-11-09 12:44:19 +02:00
Silviu Dinuta
9782ff2757 RM-4326: undo some formatting 2016-11-08 20:47:10 +02:00
Silviu Dinuta
03174c61c4 RM-4326: allow creation under hold type only from HoldServiceImpl 2016-11-08 20:40:51 +02:00
Silviu Dinuta
9a2e543c00 RM-4326: undo some formatting 2016-11-08 18:44:42 +02:00
Silviu Dinuta
0836e9682b RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:38:35 +02:00
Silviu Dinuta
c7f1fcafc8 RM-4326: undo some formatting 2016-11-08 17:36:21 +02:00
Roxana Lucanu-Ghetu
ac8c7388d2 Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526 2016-11-08 17:35:25 +02:00
Silviu Dinuta
fce705ff72 RM-4326: allow creation in transfer container only from
TransferServiceImpl
2016-11-08 17:26:07 +02:00
Silviu Dinuta
b3aa001eb0 RM-4326: added restriction for types that are accepted to be create in
unfiled record folder
2016-11-08 11:42:58 +02:00
Silviu Dinuta
6a6eec8963 Merge master into
feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers
2016-11-04 13:11:14 +02:00
Ana Bozianu
0dab61199e RM-4319 - remove value for the removed setter 2016-11-04 11:28:25 +02:00
Silviu Dinuta
26ba43752d RM-4312: restrained record folder creation in unfiled records container 2016-11-03 16:51:52 +02:00
Tom Page
388afb73e6 Change line endings for surf files. 2016-10-31 09:02:41 +00:00
Tom Page
d4831245c4 Merge release/V2.5 into master. 2016-10-28 16:56:07 +01:00
Tom Page
d24a22264c Merge release/V2.4 into release/V2.5. 2016-10-28 13:31:20 +01:00
Tom Page
eb00635594 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
Tuna Aksoy
935b516646 Merge branch 'feature/RM-4012_Category_REST_API' into feature/RM-4012_Category_REST_API_2 2016-10-26 17:33:53 +01:00
Tuna Aksoy
ded1bbef88 Merge branch 'master' into feature/RM-4012_Category_REST_API_2 2016-10-26 16:15:31 +01:00
Ana Bozianu
c84fc6ee9e RM-4259 - added method security condition 2016-10-26 18:14:29 +03:00
David Webster
9878ca9cb6 MNT-16852: Fix merge error. 2016-10-25 16:57:19 +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
Silviu Dinuta
ca416fd603 RM-3963: prevent POST request directly in RM site node 2016-10-25 09:47:01 +03:00
David Webster
b8437018de MNT-16852: Add in accidentally deleted bean extender 2016-10-24 17:38:34 +01:00
David Webster
348128ef58 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
Tom Page
0b52d1bd73 RM-3386 Merge commit '48a65f5' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01:00
Silviu Dinuta
1d2e70b14f RM-4199: after review changes 2016-10-21 11:58:11 +03:00
Silviu Dinuta
ac7a451eea RM-4199: changes to include compliance in body create type, also changed
the delete part to only delete rm site
2016-10-20 03:27:52 +03:00
Silviu Dinuta
3a7bda1aed RM-4199: changed package structure, removed content2.bin since we don't
use welcome component for rm site, also added some comments and
simplified the validation of the site since we don't need to ad site id
and site visibility for rm site, given that site id is always rm and
site visibility always PUBLIC
2016-10-19 17:08:03 +03:00
Tom Page
c7b4f284ff Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Silviu Dinuta
b61559071b RM-4199: create rm site rest api impl 2016-10-18 12:21:42 +03: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