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,908 Commits 324 Branches 2,170 Tags
988f3d51a2fe73c12a73e19e2ece9a6b7c16144c
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ana Bozianu
3d62c62e7a Merge branch 'feature/RM-4359_CreateElectronicRecordsApi' into 'master' 
Feature/rm 4359 create electronic records api

The creation/upload of an electronic record was already implemented in the category rest api. For this issue I added methods to the edit/update the content property.

See merge request !674
 2016-11-30 08:25:07 +00:00
Ana Bozianu
3b1c13b626 RM-4359 - added mandatory check and javadoc 2016-11-29 17:44:44 +02:00
Tom Page
4a0d7d6de1 RM-4456 Record-only merge of commit '3b3decf' into master. 2016-11-29 14:56:25 +00:00
Rodica Sutu
e1d05c6b89 Merge branch 'feature/RM-4396_UseModelInsteadJsonObject' into 'master' 
Feature/rm 4396 use model instead json object

- Create a utility class with the toJson() method to convert models to JSON string
- update the tests accordingly

See merge request !672
 2016-11-29 10:38:51 +00:00
Tuna Aksoy
a0cd7c1627 Merge remote-tracking branch 'origin/feature/RM-4396_UseModelInsteadJsonObject' into feature/RM-4396_Lombok_UseModelInsteadJsonObject 
Conflicts:
	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponent.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/FilePlanTests.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordCategoryTest.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java
	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/UnfiledRecordsFolderTests.java
 2016-11-28 21:46:48 +00:00
Tuna Aksoy
d968624c2f RM-4396: Experiment using lombok to remove boiler plate code 2016-11-28 21:20:11 +00:00
Rodica Sutu
5ad5512c3e review updates (1) 2016-11-28 17:35:41 +02:00
Rodica Sutu
2c00b1aa22 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
6482c51703 remove the hasRetentionSchedule check 2016-11-28 15:15:31 +02:00
Rodica Sutu
42dac04cd2 tidy up code, add java docs 2016-11-28 14:34:58 +02:00
Kristijan Conkas
d7338fd991 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
0b51871096 Merge branch 'feature/UpdateTASDependency' into 'master' 
Feature/update tas dependency

See merge request !666
 2016-11-28 09:05:04 +00:00
Rodica Sutu
866568c806 add the ReviewPeriodSerializer.java 2016-11-28 10:27:48 +02:00
Rodica Sutu
e67cbec64e minor updates 2016-11-28 10:20:01 +02:00
Rodica Sutu
e87df92099 - 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
bcbf365875 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
ce0a9d8b2f RM-4320 Remove alfresco min rm version 2016-11-26 09:09:30 +02:00
Tuna Aksoy
af1ba799f8 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
a0df516f09 Updated TAS REST API dependency version 2016-11-25 21:57:26 +00: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
74b8e0ac18 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
13702858db 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
69020a8d3c Update to use TAS release rather than the old SNAPSHOT. 2016-11-24 09:56:14 +00:00
Tom Page
8674064b2e 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
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
Tom Page
67aad86924 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
4b14d8f06c RM-4456 Merge release/V2.5 into master. 2016-11-23 08:38:40 +00:00
Tom Page
c07bb9e75f 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
58c22467bb Set Alfresco community version to 5.1.g 2016-11-22 14:23:09 +02:00
Tom Page
d55deb6947 For the V2.5 builds we want to default to the released artifacts. 2016-11-22 10:41:51 +00:00
Tuna Aksoy
b0fb8b8d67 Fixed Alfresco installer host 
(cherry picked from commit 3070866e2c)
 2016-11-22 10:40:05 +00: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
Tuna Aksoy
384b2ba06f 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
bee6a244e5 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
74b9066155 RM-4369 - removed statement as there are no existing aspects when creating a node 2016-11-21 22:03:54 +02:00
Ana Bozianu
5ef2c54e0d 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
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
Mihai Cozma
66332f624f 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
3f12848bb3 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
8230d543ec RM-4394 (Add RM REST API Explorer project into Records Management Repo) 2016-11-21 10:03:16 +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
178fd688fd Merge master into feature/RM-4357_and_RM_4373 2016-11-18 14:15:53 +02:00