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
4,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alfresco-build
6cdf37e9ac [maven-release-plugin] prepare for next development iteration 2017-06-21 13:36:58 +01:00
alfresco-build
ad9208fe5f [maven-release-plugin] prepare release V2.5.2-EA2 2017-06-21 13:36:54 +01:00
Tuna Aksoy
ec1a2432e8 Merge branch 'merge/20170620_RM25' into 'master' 
Merge/20170620 rm25

See merge request !360
 2017-06-21 10:34:57 +01:00
Tuna Aksoy
f325ed136d Merge branch 'release/V2.5' into merge/20170620_RM25 2017-06-20 17:43:36 +01:00
Ramona Popa
64f0490af1 Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into 'release/V2.5' 
RM-5309 - Remove shared link if exists when a record is declared

See merge request !350
 2017-06-20 17:31:14 +01:00
Tuna Aksoy
651554b49b Merge branch 'feature-2.5/RM-5309_SharedFilesCannotBeClasified' into merge/20170620_RM25 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java
 2017-06-20 16:07:26 +01:00
Tuna Aksoy
c7ca779f69 Merge branch 'release/V2.5' into merge/20170620_RM25 
# Conflicts:
#	rm-community/pom.xml
 2017-06-20 16:04:36 +01:00
Sara Aspery
14cb548edd correct message for Share 2017-06-20 15:48:25 +01:00
Sara Aspery
16e23633f4 refactor complete record Rest API 2017-06-20 13:58:19 +01:00
Ramona Popa
f8644cb9d0 Merge branch 'release/V2.5' into feature-2.5/RM-5309_SharedFilesCannotBeClasified 2017-06-20 14:36:55 +03:00
Ramona Popa
af033364bd RM-5309 - typo 2017-06-20 14:34:47 +03:00
Ramona Popa
39541038e1 RM-5309 - fix after review 2017-06-20 14:33:28 +03:00
Sara Aspery
953d7b32f4 include_declare_record_refactoring_in_Rest 2017-06-20 11:12:22 +01:00
Tuna Aksoy
21866f4904 Merge branch 'feature-2.5/Update_community_dependency' into 'release/V2.5' 
Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer …

See merge request !358
 2017-06-20 10:11:31 +01:00
Sara Aspery
997ddd49b4 Revert "Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI" 
This reverts commit 8762162552, reversing
changes made to e9ba89f7bf.
 2017-06-20 08:27:09 +01:00
Tuna Aksoy
1221656c14 Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer for Repo/Share 5.1.g combination. 2017-06-19 22:08:25 +01:00
Sara Aspery
8762162552 Merge branch 'feature/refactor_declare_record_action' into RM-4431_CompleteRecordActionRestAPI 2017-06-19 18:56:53 +01:00
Sara Aspery
e9ba89f7bf Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-19 18:08:16 +01:00
Sara Aspery
6db7ca6ebe more_declare_record_refactoring 2017-06-19 18:06:34 +01:00
Ramona Popa
4e38904e6e RM-5309 - Added integration test for the case: when a record is declared, the shared link is removed 2017-06-19 17:46:34 +03:00
Ramona Popa
aa235007d5 RM-5309 - Remove shared link if exists when a record is declared 2017-06-16 18:44:14 +03:00
Silviu Dinuta
41afdc7381 Merge branch 'feature/RM-5237_InfiniteLoopIfOneDeclareInPlaceRecordEventFails' into 'master' 
RM-5237: fixed issue in benchmark project

See merge request !345
 2017-06-16 09:08:57 +01:00
Silviu Dinuta
a673ab0b73 RM-5237: fixed issue in benchmark project, added a commented test to 
reproduce the issue in rest api tests
 2017-06-15 19:33:07 +03:00
Sara Aspery
f02b41a137 updated from master 2017-06-15 11:04:23 +01:00
Tuna Aksoy
6e223c1f96 Move the code for completing a record from DeclareRecordAction to RecordServiceImpl 2017-06-14 19:38:45 +01:00
Sara Aspery
0e8b41aca6 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-14 13:05:53 +01:00
Tuna Aksoy
1c1e6b1b4e Merge branch 'merge/RM-2370_RM-4689_RM-5175' into 'master' 
Merge/rm 2370 rm 4689 rm 5175

See merge request !338
 2017-06-13 06:49:30 +01:00
Tuna Aksoy
3ca87d5d7e Merge branch 'release/V2.5' into merge/RM-2370_RM-4689_RM-5175 2017-06-12 21:52:42 +01:00
Tuna Aksoy
0a83b44d98 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into 'release/V2.5' 
Feature 2.5/rm 5175 complete record missing metadata

See merge request !324
 2017-06-12 21:42:17 +01:00
Tuna Aksoy
7da13c7161 Merge branch 'feature-2.5/RM-4689_Can_delete_RM_site_content_in_browser' into 'release/V2.5' 
RM-4689 (Can delete all RM site content through Repository browser)

See merge request !337
 2017-06-12 21:41:28 +01:00
Tuna Aksoy
37a1be2fea Merge branch 'feature-2.5/RM-4689_Can_delete_RM_site_content_in_browser' into merge/RM_25 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-fileplan-context.xml
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/FilePlanType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/UnfiledRecordContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4293Test.java
	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerTypeUnitTest.java
 2017-06-12 21:03:15 +01:00
Tuna Aksoy
96fdd50b39 Merge branch 'feature-2.5/RM-5175_Complete_record_missing_metadata' into merge/RM_25 
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
 2017-06-12 20:42:51 +01:00
Tuna Aksoy
98875ca8aa Merge branch 'release/V2.5' into feature-2.5/RM-5175_Complete_record_missing_metadata 2017-06-12 17:43:46 +01:00
Sara Aspery
d57ac09c1d RM-5175_Complete_record_with_missing_metadata changes after review 2017-06-12 16:42:05 +01:00
Tuna Aksoy
d94771f216 Merged release/V2.5 and addressed review comments 2017-06-12 16:41:30 +01:00
Tuna Aksoy
b1f84e86c5 RM-4689 (Can delete all RM site content through Repository browser) 
Manually backported following changes:

RM-4293
135c4e04e0

RM-4326
fce705ff72
0836e9682b
 2017-06-12 16:17:24 +01:00
Andy Healey
941127669b Merge branch 'UA_API_Review_110617' into 'master' 
Update gs-core-api.yaml for DOCS-2764 - UA review

See merge request !335
 2017-06-12 11:02:09 +01:00
Andy Healey
ef43a24c56 Update gs-core-api.yaml with Tuna feedback for DOCS-2764 2017-06-12 10:40:35 +01:00
Oana Nechiforescu
178788cb7d Merge branch 'merge/RM-4703_RM-5135_RM-5300' into 'master' 
Merge/rm 4703 rm 5135 rm 5300

See merge request !334
 2017-06-11 11:55:15 +01:00
Andy Healey
2da07f3972 Update gs-core-api.yaml for DOCS-2764 - UA review 2017-06-11 08:23:46 +01:00
Sara Aspery
bc0a9431ce RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +01:00
Tuna Aksoy
7c632e8b5f Merge branch 'release/V2.5' into merge/RM-4703_RM-5135_RM-5300 
# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/upload/UploadDialog.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/securitymarks/UpdateContentSecurityMarksPolicyTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMEnterpriseTestCase.java
 2017-06-10 21:29:50 +01:00
Tuna Aksoy
0b9287c248 Merge branch 'feature/RM-5244_IncompleteAspectLeftBehind' into 'master' 
RM-5244 - make sure the incomplete node tagger is run after the record aspect is added (workaround)

See merge request !317
 2017-06-09 10:16:29 +01:00
Tom Page
e49b40f9ab Record-only merge of release/V2.5.1.x into release/V2.5. 2017-06-09 08:55:18 +01:00
alfresco-build
b1710cfd1b [maven-release-plugin] prepare for next development iteration 2017-06-09 08:36:33 +01:00
alfresco-build
8b400e1545 [maven-release-plugin] prepare release V2.5.1.1 2017-06-09 08:36:30 +01:00
Tom Page
af6d6f481c Record-only merge release/V2.5 into master. 2017-06-08 11:08:20 +01:00
Tom Page
266c7b57b1 Record-only merge release/V2.5.0.x into release/V2.5. 
Changes for hotfix release.
 2017-06-08 11:07:08 +01:00
alfresco-build
8297a8d4f6 [maven-release-plugin] prepare for next development iteration 2017-06-08 10:27:43 +01:00
alfresco-build
d57d748ba7 [maven-release-plugin] prepare release V2.5.0.2 2017-06-08 10:27:39 +01:00