inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,254 Commits 325 Branches 2,188 Tags
ce60d3e89f9bf41ea45793f9ff9f0a9a6fd2903a
Commit Graph

5254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tuna Aksoy
9f155b50b8 RM-4396: Experiment using lombok to remove boiler plate code 2016-11-28 21:20:11 +00:00
Rodica Sutu
7bf7f72066 review updates (1) 2016-11-28 17:35:41 +02:00
Rodica Sutu
75910c0d81 Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-4396_UseModelInsteadJsonObject 2016-11-28 17:19:16 +02:00
Rodica Sutu
8189ab5faf remove the hasRetentionSchedule check 2016-11-28 15:15:31 +02:00
Rodica Sutu
93df9283b8 tidy up code, add java docs 2016-11-28 14:34:58 +02:00
Kristijan Conkas
7fd07c781b Merge branch 'feature/RM-4309_Refactor_Property_Handling' into 'master' 
Feature/rm 4309 refactor property handling

See merge request !670
 2016-11-28 11:59:52 +00:00
Tuna Aksoy
3e1c53cb61 Merge branch 'feature/UpdateTASDependency' into 'master' 
Feature/update tas dependency

See merge request !666
 2016-11-28 09:05:04 +00:00
Rodica Sutu
41373be4b9 add the ReviewPeriodSerializer.java 2016-11-28 10:27:48 +02:00
Rodica Sutu
0eeb9aaef1 minor updates 2016-11-28 10:20:01 +02:00
Rodica Sutu
1040fceacc - Create a utility class with the toJson() method to convert models to json object 
- update the test to use models
 2016-11-28 10:11:01 +02:00
Mihai Cozma
1aebd832cc Merge branch 'feature-2.5/RM4320_Compatibility_issues' into 'release/V2.5' 
Feature 2.5/rm4320 compatibility issues

See merge request !665
 2016-11-26 12:06:03 +00:00
Mihai Cozma
1988533145 RM-4320 Remove alfresco min rm version 2016-11-26 09:09:30 +02:00
Tuna Aksoy
429f34f90d RM-4309 (Investigate an alternative option for the default.properties in RM REST API Automation project) 2016-11-25 23:32:32 +00:00
Tuna Aksoy
695e380ec6 Updated TAS REST API dependency version 2016-11-25 21:57:26 +00:00
Ana Bozianu
c13cbfaed0 RM-4359 - added records endpoint with get/update content requests 2016-11-25 17:36:29 +02:00
Mihai Cozma
0611866018 Revert "Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'"" 
This reverts commit 46ebbbf9fc.
 2016-11-25 17:17:55 +02:00
Mihai Cozma
46ebbbf9fc Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'" 
This reverts commit e6f55df382, reversing
changes made to d90c19522e8844ef8a11d2af3f84891bbe1bf71a.
 2016-11-25 16:11:24 +02:00
Mihai Cozma
e6f55df382 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
80b2fcdd90 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
fb44e68999 Merge branch 'feature/RM-4399_Update_Alfresco_dependency_for_RM_Community_to_5.2.b' into 'master' 
Feature/rm 4399 update alfresco dependency for rm community to 5.2.b

See merge request !657
 2016-11-24 13:56:25 +00:00
Tom Page
dae293a76b Merge branch 'feature/TASVersionUpdate' into 'master' 
Feature/tas version update

The TAS releases can be seen here: https://gitlab.alfresco.com/tas/alfresco-tas-restapi-test/network/master

v1.0.0 is aimed at compatibility with Alfresco 5.1.1, and v2.0.0 is for Alfresco 5.2.N.

See merge request !659
 2016-11-24 12:43:02 +00:00
Tom Page
73d00e5ed9 Update to use TAS release rather than the old SNAPSHOT. 2016-11-24 09:56:14 +00:00
Tom Page
cddd51607e Merge branch 'merge/RM-4456_BuildConfigFor2.5' into 'master' 
Merge/rm 4456 build config for2.5

RM-4456 Record only merge of changes to build on V2.5.

See merge request !658
 2016-11-24 08:28:03 +00:00
Tuna Aksoy
39642b39a8 RM-4399 (Update Alfresco dependency for RM Community to 5.2.b) 2016-11-23 19:43:25 +00:00
Ana Bozianu
5b055daff3 RM-4360 - added documentation and fixed an error code 2016-11-23 17:31:39 +02:00
Tom Page
4ac0e370b8 RM-4456 Master is meant to use the nightly 5.2-SNAPSHOT build by default. 2016-11-23 14:56:20 +00:00
Tom Page
fd0af1db2b RM-4456 Merge release/V2.5 into master. 2016-11-23 08:38:40 +00:00
Tom Page
0d54de1f8d RM-4456 Fix cherry-picked properties. 
We only want one properties entry in the pom file.
 2016-11-22 14:08:47 +00:00
Mihai Cozma
fa56fca9f6 Set Alfresco community version to 5.1.g 2016-11-22 14:23:09 +02:00
Tom Page
85e486639d For the V2.5 builds we want to default to the released artifacts. 2016-11-22 10:41:51 +00:00
Tuna Aksoy
0ceb96b073 Fixed Alfresco installer host 
(cherry picked from commit 61f6c2a0d1)
 2016-11-22 10:40:05 +00:00
Mihai Cozma
73a84031ae 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
Tuna Aksoy
bd6c29f688 Merge branch 'feature/RM-4369_LackOfApiSpecificationOnCreate' into 'master' 
Feature/rm 4369 lack of api specification on create

- added information about how to use properties and relative path in RM
- added how to set aspects but didn't provided examples as I don't think we should encourage the user to set aspects directly
- removed association, secondaryChildren and target from the documentation because I couldn't think of a scenario where we could use them in RM

please advise!

See merge request !649
 2016-11-21 21:00:43 +00:00
Tuna Aksoy
8e33f15dd4 Merge branch 'feature/RM-4376_relativePath' into 'master' 
Feature/rm 4376 relative path

RM-4376 - The categories specified in the relativePath that do not exist are not created before the record folder is created.

Override createNode and create the RM path before calling the core method. after the RM path is created the core method is called with the last element of the created path

See merge request !647
 2016-11-21 21:00:39 +00:00
Ana Bozianu
40b9a706f1 RM-4369 - removed statement as there are no existing aspects when creating a node 2016-11-21 22:03:54 +02:00
Ana Bozianu
592acfc15a RM-4369 - added information about aspects, properties and relative path and removed association, secondaryChildren and targets 2016-11-21 21:54:03 +02:00
Ana Bozianu
9fc4a32454 RM-4376 - create RM relative path + unit tests 2016-11-21 17:11:37 +02:00
Roxana Lucanu-Ghetu
a4622c46fe 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
Mihai Cozma
92ea428423 RM 4320 Min Alfresco Repo Version should be 5.1.1 not 
5.2.(alfresco.version)
 2016-11-21 13:27:46 +02:00
Tuna Aksoy
c58a106815 Merge branch 'feature/RM-4394_Add_RM_REST_API_Explorer_to_RM_Repo' into 'master' 
Feature/rm 4394 add rm rest api explorer to rm repo

See merge request !646
 2016-11-21 10:06:27 +00:00
Tuna Aksoy
171489d389 RM-4394 (Add RM REST API Explorer project into Records Management Repo) 2016-11-21 10:03:16 +00:00
Tuna Aksoy
98121398bb RM-4394 (Add RM REST API Explorer project to Records Management Repo) 2016-11-20 18:30:00 +00:00
Roxana Lucanu-Ghetu
4a7154dbfb 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
194234956a 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
50896cc6e8 Merge master into feature/RM-4357_and_RM_4373 2016-11-18 14:15:53 +02:00
Ana Bozianu
2130acec01 Merge branch 'feature/RM-4375_WrongErrorForDuplicateRMIdentifier' into 'master' 
Feature/rm 4375 wrong error for duplicate rm identifier

RM-4375 - Handling duplicate "rma:identifier" values in POST /fileplan-components/{fileplanComponentId}/children

DuplicateAttributeException was not mapped to an error code in core. I extended the exception mapper so we ca add our custom mapping.

See merge request !643
 2016-11-18 10:26:41 +00:00
Ana Bozianu
7e809b55cd 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
Tuna Aksoy
119236a0d9 Added existsRMSite method to RMSiteAPI 2016-11-17 20:57:17 +00:00
Tuna Aksoy
5a10944ae4 Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 
Conflicts:
	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/requests/RMSiteAPI.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/base/BaseRestTest.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/fileplancomponents/FilePlanTests.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/site/RMSiteTests.java
 2016-11-17 20:41:02 +00:00
Tuna Aksoy
2fd95c79f7 Changed package name org.alfresco.rest.rm to org.alfresco.rest.rm.community for RM Community REST API Automation project 2016-11-17 19:51:37 +00:00