inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 324 Branches 2,170 Tags
1377cc8e118ac49ad2591bb901b49ac4f50218ca
Commit Graph

600 Commits

Author SHA1 Message Date
Tuna Aksoy
35139aa294 Merge remote-tracking branch 'origin/feature/RM-4362_UpdateAPI_ImplAndDoc' 2016-12-20 16:30:00 +00:00
Tuna Aksoy
1fae861c94 Changed contextPath from "rm-api-explorer" to "ig-api-explorer" 2016-12-19 17:18:45 +00:00
Tuna Aksoy
d1b4c611bb RM-4565 (Update RM API Explorer dependency and split war files) 2016-12-16 22:06:47 +00:00
Ana Bozianu
ede1386710 RM-4418 - added comments and localization 2016-12-16 14:27:01 +02:00
Ana Bozianu
9701b0020f RM-4418 - removed posibility to update content 2016-12-16 11:39:11 +02:00
Ana Bozianu
88d64bc233 RM-4528 - extract original exception so it can be properly mapped to api error code 2016-12-10 14:01:16 +02:00
Tom Page
7640eeca9a RM-4084 Merge commit 'a85d9f5' into master. 
UI tests for prevention of orphaned marks.
 2016-12-05 15:57:07 +00:00
Tom Page
a85d9f5290 RM-4493 Add javax.servlet-api "provided" dependency to community. 
This is required to build the community code against Alfresco 5.2-EA, which
we do as part of the enterprise release build.
 2016-12-01 09:55:33 +00:00
Ana Bozianu
814c349f62 RM-4499 - added check for physical size too 2016-11-30 14:21:48 +02:00
Ana Bozianu
6bb93c6698 RM-4499 - added positive number constraint in the model definition 2016-11-30 12:16:49 +02:00
Ana Bozianu
3b1c13b626 RM-4359 - added mandatory check and javadoc 2016-11-29 17:44:44 +02:00
Ana Bozianu
64f41ee66f RM-4359 - added records endpoint with get/update content requests 2016-11-25 17:36:29 +02:00
Mihai Cozma
952148a0ca Revert "Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'"" 
This reverts commit 1f5c5c0c19.
 2016-11-25 17:17:55 +02:00
Mihai Cozma
1f5c5c0c19 Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'" 
This reverts commit 21b0ad9eff, reversing
changes made to d90c19522e8844ef8a11d2af3f84891bbe1bf71a.
 2016-11-25 16:11:24 +02:00
Mihai Cozma
21b0ad9eff Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5' 
Feature 2.5/merge rm4320 to v2.5

See merge request !651
 2016-11-25 09:25:09 +00:00
Tom Page
3b3decf41c RM-4456 Make unit tests work against Alfresco 5.2.b and 5.1.1. 2016-11-24 16:01:06 +00:00
Tuna Aksoy
b6fdb18124 RM-4399 (Update Alfresco dependency for RM Community to 5.2.b) 2016-11-23 19:43:25 +00:00
Ana Bozianu
316bb4919c RM-4360 - added documentation and fixed an error code 2016-11-23 17:31:39 +02:00
Mihai Cozma
78f344da10 Merge branch 'feature-2.5/RM-4320_Upgrade_RM_2.5.1_Dependency_to_Alf5.2' into feature/Merge_RM4320_to_V2.5 2016-11-22 11:19:57 +02:00
Ana Bozianu
f487877b1c RM-4376 - create RM relative path + unit tests 2016-11-21 17:11:37 +02:00
Roxana Lucanu-Ghetu
15dcebc27c Merge branch 'feature/RM-4083_OrphanedHierarchicalMarks' into 'master' 
Feature/rm 4083 orphaned hierarchical marks

Added functionality to prevent orphaned hierarchical marks.

See merge request !644
 2016-11-21 12:05:26 +00:00
Tuna Aksoy
316b21ae8c RM-4394 (Add RM REST API Explorer project to Records Management Repo) 2016-11-20 18:30:00 +00:00
Roxana Lucanu-Ghetu
a2c5c11de4 Merge branch 'origin/feature/RM-3347_checkExclusiveClearanceHierarchicalMarks' into master 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/rm-query-context.xml
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/EnterpriseRecordsManagementQueryDAOImpl.java
 2016-11-18 15:15:45 +02:00
Ana Bozianu
fd0de476d1 Merge branch 'feature/RM-4357_and_RM_4373' into 'master' 
Feature/rm 4357 and rm 4373

Merge branch for RM-4357 and RM-4373. Original merge requests:
- RM-4357 : https://gitlab.alfresco.com/records-management/records-management/merge_requests/624
- RM-4373 : https://gitlab.alfresco.com/records-management/records-management/merge_requests/631

this merge contains conflict fixes and test fixes for both RM-4357 and RM-4373

See merge request !641
 2016-11-18 12:18:03 +00:00
Ana Bozianu
b045c512a3 RM-4375 - extended the exception mapper from core to map our custom exceptions to HTTP error codes 2016-11-18 11:58:24 +02:00
Ana Bozianu
28026941c3 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +02:00
Ana Bozianu
c8f6bfe333 RM-4357 - updated test for fileplan create operation check 2016-11-17 13:01:25 +02:00
Ana Bozianu
d10fcea5fa RM-4357 - delete unused methods after merge 2016-11-17 11:38:17 +02:00
Ana Bozianu
3bb40fb88c Merge master into feature/RM-4357_and_RM_4373 2016-11-17 11:37:04 +02:00
Silviu Dinuta
9f7d772ac5 Merge remote-tracking branch 'origin/master' into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 11:10:28 +02:00
Silviu Dinuta
b660169e6a Merge master into feature/RM-4293_RM_special_containers_can_be_deleted 2016-11-17 10:53:25 +02:00
Ana Bozianu
54717418e1 Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'" 
This reverts commit ab93e7b9c0, reversing
changes made to 0e74642b32.
 2016-11-17 10:52:40 +02:00
Ana Bozianu
ba9807118c Revert "Merge branch 'feature/RM-4357_AllowableOperations' into 'master'" 
This reverts commit ba4c99bbb5, reversing
changes made to 618fb9d4a0.
 2016-11-17 10:52:00 +02:00
Silviu Dinuta
774b9bb00a RM-4293: review updates 2016-11-17 10:45:58 +02:00
Ana Bozianu
6551b12c67 Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 10:35:46 +02:00
Ana Bozianu
ba4c99bbb5 Merge branch 'feature/RM-4357_AllowableOperations' into 'master' 
Feature/rm 4357 allowable operations

trivial fix for allowable operation bug

See merge request !638
 2016-11-17 08:31:43 +00:00
Ana Bozianu
0938d8ad4d RM-4357 - allow create children for fileplan 2016-11-17 10:26:58 +02:00
Oana Nechiforescu
618fb9d4a0 Merge branch 'merge/Merge231ReleaseToMaster' into 'master' 
Merge/merge231 release to master

See merge request !635
 2016-11-17 08:09:12 +00:00
Ana Bozianu
5045dd69fa Merge master into feature/RM-4373_SpecialContainersEditable 2016-11-17 09:44:50 +02:00
Ana Bozianu
ab93e7b9c0 Merge branch 'feature/RM-4357_AllowableOperations' into 'master' 
Feature/rm 4357 allowable operations

RM-4357 - fileplanComponent's allowable actions don't reflect RM security

RM's capabilities overrides core's security so it is enough to test the capabilities. Please see the table from the issue's comment.

See merge request !624
 2016-11-17 07:33:42 +00:00
Ana Bozianu
891f67782a RM-4373 - make transfers non editable because the rule inheritance is disabled on transfer container 2016-11-16 17:40:48 +02:00
Oana Nechiforescu
70ba4da0af Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge231ReleaseToMaster 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
 2016-11-16 17:33:33 +02:00
Silviu Dinuta
5202fd8fd6 RM-4293: after discussion with Ana for delete we need filing condition 2016-11-16 17:14:00 +02:00
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
2248e99b67 RM-4357 - updated unit tests 2016-11-16 16:19:16 +02:00
Silviu Dinuta
b192bd6d3f RM-4293: added integration test for testing special containers through 
java api
 2016-11-16 15:40:37 +02:00
Ana Bozianu
f441ab71dd RM-4357 - updated allowable operations to reflect the edit permissions changes for special containers made in RM-4373 2016-11-16 15:33:11 +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