inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,805 Commits 335 Branches 2,191 Tags
40c78dc29865544c2da5b51a48d9c00f24e1229b
Commit Graph

6805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tuna Aksoy
ab02f88245 Updated source code management tags after moving to the new gitlab server 
(cherry picked from commit 8a14116cf2)
 2017-06-08 10:07:53 +01:00
Tuna Aksoy
8486367b77 Add the overlays folder for rm-community-rest-api-explorer and rm-enterprise-rest-api-explorer to gitignore 2017-06-06 18:11:16 +01:00
Sara Aspery
658f064a8d RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:49:56 +01:00
Sara Aspery
662e805f55 RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:21:49 +01:00
Sara Aspery
5467cb02d1 Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-06-01 14:42:02 +01:00
Sara Aspery
051936f5cf RM-4431 CompleteRecordActionRestAPI 2017-06-01 14:08:16 +01:00
Tuna Aksoy
406866c105 Merge branch 'release/V2.5' 
# Conflicts:
#	README.txt
 2017-06-01 09:55:38 +01:00
Tuna Aksoy
83e0da4b2a RM-4978: Updated README file and removed duplicate property. 2017-05-31 17:36:15 +01:00
Ana Bozianu
e886317bf5 RM-5244 - added extra check for efficiency 2017-05-31 17:10:43 +03:00
Ana Bozianu
b2b936b28f RM-5244 - make sure the incomplete node tagger is run after the record aspect is added (workaround) 2017-05-31 16:55:56 +03:00
Tuna Aksoy
e61316be2f RM-4978: Reverted changes in alfresco-global.properties 2017-05-30 18:09:52 +01:00
Tuna Aksoy
04beb179ed RM-4978: Reverted changes in alfresco-global.properties 2017-05-30 18:09:11 +01:00
Tuna Aksoy
e2d1402e65 RM-4978: Reverted changes in alfresco-global.properties 2017-05-30 18:04:59 +01:00
Tuna Aksoy
a8fc136596 RM-4978 (Solr 6 support not working) 2017-05-30 17:59:58 +01:00
Ana Bozianu
60fb7d2051 Merge RM-5180 from 2.5 into master 2017-05-29 13:10:48 +03:00
Ana Bozianu
bdc5e84f1d Merge branch 'feature-2.5/RM-5180_RecordRejectionPolicy' into 'release/V2.5' 
RM-5180 - record rejection implementation and integration test

See merge request !306
 2017-05-29 10:14:56 +01:00
Andy Healey
a4e003157e Merge branch 'UA-API-review' into 'master' 
Update gs-core-api.yaml

See merge request !305
 2017-05-26 10:15:01 +01:00
Tom Page
c7811ab8aa Merge release/V2.5 into master. 2017-05-26 08:49:34 +01:00
Tom Page
bada81771f Record-only merge of release/V2.5.0.x into release/V2.5. 
Everything has already been merged here from release/V2.5.1.x, or was here already and
cherry-picked back.
 2017-05-26 08:41:14 +01:00
Tom Page
2283c4ca88 Merge branch 'feature-2.5/RM-5193_2502BackportBranch' into 'release/V2.5.0.x' 
Feature 2.5/rm 5193 2502 backport branch

See merge request !302
 2017-05-26 08:15:04 +01:00