Commit Graph

4087 Commits

Author SHA1 Message Date
Andy Healey
4fb2a32f9d Update gs-core-api.yaml with Tuna feedback for DOCS-2764 2017-06-12 10:40:35 +01:00
Oana Nechiforescu
d66331be3f 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
7b837f9da1 Update gs-core-api.yaml for DOCS-2764 - UA review 2017-06-11 08:23:46 +01:00
Sara Aspery
d98d3e9c69 RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +01:00
Tuna Aksoy
f8fac80933 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
fbd029cd56 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
1db145c228 Record-only merge of release/V2.5.1.x into release/V2.5. 2017-06-09 08:55:18 +01:00
alfresco-build
56bf07c511 [maven-release-plugin] prepare for next development iteration 2017-06-09 08:36:33 +01:00
alfresco-build
a3747f27b1 [maven-release-plugin] prepare release V2.5.1.1 ags-2.5.1.1 2017-06-09 08:36:30 +01:00
Tom Page
79f96c9e20 Record-only merge release/V2.5 into master. 2017-06-08 11:08:20 +01:00
Tom Page
3549995e18 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
939d9a60ff [maven-release-plugin] prepare for next development iteration 2017-06-08 10:27:43 +01:00
alfresco-build
fc6de3bad4 [maven-release-plugin] prepare release V2.5.0.2 ags-2.5.0.2 2017-06-08 10:27:39 +01:00
Tuna Aksoy
d05f1f89e2 Updated source code management tags after moving to the new gitlab server
(cherry picked from commit 42489cda9e)
2017-06-08 10:07:53 +01:00
Tuna Aksoy
c290e0db59 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
11f9c6c3e7 RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:49:56 +01:00
Sara Aspery
a7fddef34b RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:21:49 +01:00
Sara Aspery
e579b51cf9 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
8665ddafb9 RM-4431 CompleteRecordActionRestAPI 2017-06-01 14:08:16 +01:00
Tuna Aksoy
d7b31c46b0 Merge branch 'release/V2.5'
# Conflicts:
#	README.txt
2017-06-01 09:55:38 +01:00
Tuna Aksoy
74c40cd445 RM-4978: Updated README file and removed duplicate property. 2017-05-31 17:36:15 +01:00
Ana Bozianu
953a5c3d96 RM-5244 - added extra check for efficiency 2017-05-31 17:10:43 +03:00
Ana Bozianu
4139f2514b 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
6a1808eef1 RM-4978: Reverted changes in alfresco-global.properties 2017-05-30 18:09:52 +01:00
Tuna Aksoy
d67d541473 RM-4978: Reverted changes in alfresco-global.properties 2017-05-30 18:09:11 +01:00
Tuna Aksoy
1aa32f81e5 RM-4978: Reverted changes in alfresco-global.properties 2017-05-30 18:04:59 +01:00
Tuna Aksoy
f42679d046 RM-4978 (Solr 6 support not working) 2017-05-30 17:59:58 +01:00
Ana Bozianu
18c7b07d8b Merge RM-5180 from 2.5 into master 2017-05-29 13:10:48 +03:00
Ana Bozianu
1fe33fd6af 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
bb205f123a 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
b6bff5f5a1 Merge release/V2.5 into master. 2017-05-26 08:49:34 +01:00
Tom Page
e01323bc23 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
1c17e4b7fa 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
Ana Bozianu
fe11ba2df7 RM-5180 - record rejection implementation and integration test 2017-05-25 18:53:15 +03:00
Andy Healey
e2640eb177 Update gs-core-api.yaml 2017-05-25 15:25:43 +01:00
Tom Page
ef26804c82 Cherry-pick RM-4234 into release/V2.5.0.x (2.5.1 performance improvements).
(cherry picked from commit f428a5c32b)
2017-05-24 09:53:24 +01:00
Oana Nechiforescu
84983c322f Using the alfresco download and install from 2.5.1.x, that installer path seems to be wrong to me (pbam01.alfresco.com is the default host. I don't know why). 2017-05-24 00:16:42 +03:00
Oana Nechiforescu
d426969899 Changing the alfresco versions 2017-05-23 17:37:19 +03:00
Ana Bozianu
9efc13617d Merge branch 'feature/RM-5012_recordIdentifier' into 'master'
RM-5012 - run on add record policy as system

See merge request !300
2017-05-23 09:13:33 +01:00
Ana Bozianu
921c2d00d8 RM-5012 - run on add record policy as system 2017-05-23 11:02:08 +03:00
Tom Page
fa1e703428 Update copyright header. 2017-05-23 08:55:10 +01:00
Ramona Popa
6bd631a4d2 Merge branch 'feature/RM-5147_Autorename_on_upload' into 'master'
RM-5148 - added support for autoRename for uploadRecord too

See merge request !298
2017-05-23 07:24:27 +01:00
Ramona Popa
be442afda6 RM-5148 - added support for autoRename for uploadRecord too 2017-05-22 18:27:04 +03:00
Ana Bozianu
6a7313ac1d Merge branch 'feature/RM-5012_recordIdentifier' into 'master'
RM-5223 - can't get rid of record identifier

See merge request !292
2017-05-21 17:17:02 +01:00
Sara Aspery
b6df631e4e Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI 2017-05-20 19:31:10 +01:00
Ramona Popa
961e190edb Merge branch 'feature/RM-5148_CreateFolderAndRecordsAutoRename' into 'master'
Feature/rm 5148 create folder and records using auto rename

See merge request !282
2017-05-19 18:14:38 +01:00
Ramona Popa
240d1349df Feature/rm 5148 create folder and records using auto rename 2017-05-19 18:14:38 +01:00
Sara Aspery
a7f6ae427e RM-4431 Complete Record Action REST API 2017-05-19 14:45:02 +01:00
Ana Bozianu
774a700716 RM-5012 - fix "can't get rid of the identifier" 2017-05-19 15:37:36 +03:00
Ramona Popa
72b81bcaaa Merge branch 'feature/RM-5087_UpdateNotesForGETEndpoints' into 'master'
RM-5087 - Updated yaml file for include parameter

See merge request !254
2017-05-19 08:38:39 +01:00