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,327 Commits 324 Branches 2,170 Tags
e67cbec64ea55cc6d13bbdfcd39dfbf776d74c94
Commit Graph

3327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Ana Bozianu
d4668b19b2 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
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
Tuna Aksoy
c55a2634c0 Added existsRMSite method to RMSiteAPI 2016-11-17 20:57:17 +00:00
Tuna Aksoy
05313ff05b 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
0a1c6340e2 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
Tuna Aksoy
fba1676c85 Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 2016-11-17 12:58:18 +00:00
Tuna Aksoy
7fece7a20c Fixed compilation issue due to licence header changes in RM Community REST API Automation project 2016-11-17 12:51:09 +00:00
Ana Bozianu
28026941c3 RM-4357 - return null when allowableOperations is empty 2016-11-17 14:50:17 +02:00
Tuna Aksoy
65cbccb630 Merge branch 'master' into feature/RM-4382_Integrate_Community_REST_API_into_UI_Automation 
Conflicts:
	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/TestData.java
 2016-11-17 12:31:37 +00:00
Tuna Aksoy
c9bc69c843 Merge branch 'feature/RM-4347_Add_License_Header' into 'master' 
Feature/rm 4347 add license header

See merge request !636
 2016-11-17 12:22:46 +00:00
Tuna Aksoy
55b4b0b070 Merge branch 'feature/RM_4347_Restructure_RM_Projects' into 'master' 
Feature/rm 4347 restructure rm projects

See merge request !637
 2016-11-17 12:22:31 +00:00
Tuna Aksoy
b2ee0adb7e Integrate RM Community REST API Automation into RM UI Automation 2016-11-17 12:21:52 +00:00
Ana Bozianu
d42dc63664 RM-4357 - fixed allowable operations automation test 2016-11-17 13:50:09 +02:00
Mihai Cozma
328cc842c7 Merge branch 'feature-2.5/MergeV2.5_to_master' into 'master' 
Feature 2.5/merge v2.5 to master

See merge request !634
 2016-11-17 11:44:18 +00:00
Ana Bozianu
c8f6bfe333 RM-4357 - updated test for fileplan create operation check 2016-11-17 13:01:25 +02:00
Rodica Sutu
aca34250f2 Merge branch 'feature/RM-4367_RecordCategoryAcceptOnly' into 'master' 
Feature/rm 4367 record category accept only

Test created to  cover the issue https://issues.alfresco.com/jira/browse/RM-4367

See merge request !640
 2016-11-17 09:43:58 +00: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
Kristijan Conkas
daf84543f1 Merge branch 'feature/RM-4023_UnfiledRecordFolderAPITests' into 'master' 
Feature/rm 4023 unfiled record folder api tests

Unfiled records folder API tests.

See merge request !630
 2016-11-17 09:30:36 +00:00
Rodica Sutu
8c2519c95a Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-4367_RecordCategoryAcceptOnly 2016-11-17 11:30:14 +02:00
Kristijan Conkas
1a2fa548fe Merge remote-tracking branch 'origin/master' into feature/RM-4023_UnfiledRecordFolderAPITests 2016-11-17 09:29:57 +00:00
Rodica Sutu
bf19433949 add the bug id 2016-11-17 11:29:47 +02:00
Silviu Dinuta
135c4e04e0 Merge branch 'feature/RM-4293_RM_special_containers_can_be_deleted' into 'master' 
Feature/rm 4293 rm special containers can be deleted

See merge request !628
 2016-11-17 09:26:47 +00:00
Kristijan Conkas
c5560f24db RM-4023: fixed CI findings 2016-11-17 09:23:35 +00:00
Ana Bozianu
c22a5243c7 Merge feature/RM-4373_SpecialContainersEditable into feature/RM-4357_and_RM_4373 2016-11-17 11:13:48 +02:00