Commit Graph

1439 Commits

Author SHA1 Message Date
cagache
047bec40ad Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/Merge_MNT-19967_From2.6 2018-10-03 10:10:12 +03:00
cagache
6e54380abf Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/Merge_MNT-19967_From2.6
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/DispositionScheduleService.java
2018-10-02 14:51:13 +03:00
cagache
47d3f91abc MNT-19967 Get record disposition schedule from first parent category which has one 2018-09-27 12:40:04 +03:00
Rodica Sutu
7fbeccadbe Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2018-09-10 12:50:01 +03:00
alfresco-build
d78bf82b32 [maven-release-plugin] prepare for next development iteration 2018-09-06 07:19:43 +01:00
alfresco-build
4ae51587f2 [maven-release-plugin] prepare release V2.7.1 2018-09-06 07:19:39 +01:00
cagache
873470ec26 Merge changes from 2.6.1 release to master 2018-09-03 09:54:56 +03:00
cagache
72918feef6 Merge changes from 2.6.1 release to 3.0 2018-08-31 17:27:59 +03:00
alfresco-build
4798cf7ecf [maven-release-plugin] prepare for next development iteration 2018-08-30 09:59:18 +01:00
alfresco-build
3eed3fb63e [maven-release-plugin] prepare release V2.6.1 2018-08-30 09:59:13 +01:00
Rodica Sutu
df19e3749e Merge origin/release/V2.6' into merge-2-7/MNT-19080_RM-6504_MergeFrom2.6
* remotes/origin/release/V2.6:
  fixed tests because exception changed
  use fileFolderService instead of contentService
  MNT-18806 create a new content URL for the copy only if it has content
  MNT-18806 create a new content bin for the copy on copy complete behavior
  MNT-18806 Add REST test for deleting copy of record.
  MNT-18806 Remove some raw Exceptions from REST test framework.
2018-08-27 20:01:26 +03:00
cagache
ea40d03c80 use fileFolderService instead of contentService 2018-08-24 17:26:25 +03:00
cagache
d764fef7a5 MNT-18806 create a new content URL for the copy only if it has content 2018-08-24 16:25:20 +03:00
cagache
6691a4966c Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/MNT-18806_DeleteCopy_fp 2018-08-24 13:33:59 +03:00
cagache
770ee1047b MNT-18806 create a new content bin for the copy on copy complete behavior 2018-08-24 13:25:45 +03:00
Rodica Sutu
caa79346e6 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2-7/MNT-19080 2018-08-23 14:48:06 +03:00
Claudia Agache
3eb7f62f27 Merge branch 'feature-2.6/RM-6504_ChangeACSVersion' into 'release/V2.6'
RM-6504 Changed ACS version

See merge request records-management/records-management!1098
2018-08-21 14:17:20 +01:00
cagache
c570793fa8 Merged with master 2018-08-21 10:30:50 +03:00
cagache
d16884a692 Revert "RM-6269 Changed the module folder names on enterprise"
This reverts commit 6c52e58
2018-08-20 20:13:03 +03:00
Rashmi Itagi
6c52e5891d RM-6269 Changed the module folder names on enterprise 2018-08-20 16:38:11 +01:00
Rashmi Itagi
b83b3e7631 RM-6269 Changed the rm to governance-services in the names of the amp files in Dockerfiles 2018-08-20 11:55:03 +01:00
Rodica Sutu
f269e7a209 update the alfresco api explorer to the latest version of 5.2.N 2018-08-20 12:22:42 +03:00
Rodica Sutu
df280e176d update the ElementInfo() according to REPO-2983 2018-08-20 12:21:44 +03:00
Rodica Sutu
81e81451fe update the community version dependencies to 5.2.4 as the changes for renaming the bean simpleMappingExceptionResolver into simpleMappingExceptionResolverParent is not in any 5.2 community version 2018-08-20 12:20:30 +03:00
Rodica Sutu
2a330bdf68 rename the extended bean simpleMappingExceptionResolverParent (core change)
(cherry picked from commit 1dd650d5eb)
2018-08-17 10:42:54 +03:00
Rodica Sutu
b7f2afb0de remove custom record search converter 2018-08-16 19:11:57 +03:00
Tom Page
7358fc5d3f Update version to 3.0.1-SNAPSHOT. 2018-07-30 16:16:29 +01:00
alfresco-build
f51fac42c4 [maven-release-plugin] prepare for next development iteration 2018-07-30 14:01:41 +01:00
alfresco-build
cdb85d5d34 [maven-release-plugin] prepare release V3.0.0 2018-07-30 14:01:38 +01:00
alfresco-build
41800697f6 [maven-release-plugin] prepare for next development iteration 2018-07-30 08:23:37 +01:00
alfresco-build
c409c7b9a2 [maven-release-plugin] prepare release V3.0.a 2018-07-30 08:23:35 +01:00
Sara Aspery
8fba7aa3f9 RM-6355 Fix null pointer
(cherry picked from commit d22fc1f6ad7d0761e47931056328570e17a46f54)
2018-07-27 17:13:45 +03:00
David Webster
e117e16b4e Merge remote-tracking branch 'origin/master' into feature/RM-6269_Rebranding_artifactIds 2018-07-26 16:59:22 +01:00
Rodica Sutu
55a3fb2acd compare the new version of module currently being installed with the one installed
(cherry picked from commit b6562142d1)
2018-07-26 13:00:10 +03:00
Rodica Sutu
b6562142d1 compare the new version of module currently being installed with the one installed 2018-07-26 11:13:26 +03:00
cagache
5b40cb4bdc code review changes 2018-07-26 09:26:57 +03:00
cagache
becac80369 RM-4287 Updated modules name and description 2018-07-25 16:50:46 +03:00
cagache
d27fee791a RM-4287 Updated modules name and description 2018-07-25 11:27:08 +03:00
Rashmi Itagi
2ff92641dc RM-6269 attach-rm-jar to attach-alfresco-governance-services-jar 2018-07-24 17:09:07 +01:00
Rashmi Itagi
f8a1697e34 RM-6269 alfresco-ags to alfresco-governance-services and alfresco.rm.artifactId to ags.artifactId 2018-07-24 17:03:45 +01:00
David Webster
ad93872f85 Merge branch 'Xperimental/gs-entity-relationships' into 'master'
Updates to GS entitiy relationships, add packages, flesh out metadeta, esp Disposition

See merge request records-management/records-management!1043
2018-07-12 15:08:39 +01:00
Elena Hardon
abcf1b40be Merge branch 'feature/RM-6427-RenameAGSImages' into 'master'
Renamed docker images in poms and yaml files as it follows:

See merge request records-management/records-management!1080
2018-07-12 08:27:39 +01:00
Elena Hardon
0b6b9c4d2c Renamed docker images in poms and yaml files as it follows:
ags-repo-enterprise -> alfresco-governance-repository-enterprise
ags-share-enterprise -> alfresco-governance-share-enterprise
ags-repo-community -> alfresco-governance-repository-community
ags-share-community -> alfresco-governance-share-community
2018-07-10 17:45:32 +03:00
Elena Hardon
e415278316 Merge branch 'feature/RM-5859_AnyMarksStaging' into 'master'
RM-5859 : Any Marks work

See merge request records-management/records-management!1070
2018-07-10 12:29:59 +01:00
Elena Hardon
612de6c148 Revert "[maven-release-plugin] prepare release V3.0.0-TestCoRC5"
This reverts commit ce583c5
2018-07-09 18:08:54 +03:00
alfresco-build
ce583c5822 [maven-release-plugin] prepare release V3.0.0-TestCoRC5 2018-07-09 16:01:32 +01:00
alfresco-build
66a6a4bc0a [maven-release-plugin] prepare for next development iteration 2018-07-09 14:45:09 +01:00
alfresco-build
e921c7521b [maven-release-plugin] prepare release V3.0.0-TestCoRC5 2018-07-09 14:45:07 +01:00
alfresco-build
ce06e6dcf8 [maven-release-plugin] prepare for next development iteration 2018-07-09 13:29:54 +01:00
alfresco-build
2557df7a75 [maven-release-plugin] prepare release V3.0.0-TestEnRC5 2018-07-09 13:29:51 +01:00