Tom Page
|
ff31236cd5
|
Merge branch 'feature/RM-5420_RefactorRestAPIModel_cg' into 'master'
Feature/rm 5420 refactor rest api model cg
See merge request !391
|
2017-07-24 18:23:03 +01:00 |
|
Tom Page
|
cb31194cb1
|
RM-5420 Code review fixes including move toIndentedString into a helper method.
|
2017-07-24 15:53:35 +01:00 |
|
Andy Healey
|
ebf3e67921
|
Merge branch 'feature/UAreview_2.6_newstrings' into 'master'
Feature/uareview 2.6 newstrings
See merge request !386
|
2017-07-13 10:55:48 +01:00 |
|
Andy Healey
|
2fa6760a26
|
Update action-service.properties
|
2017-07-13 09:31:56 +01:00 |
|
Andy Healey
|
96e5b3bb8f
|
DOCS-3531 - Update records-management-service.properties
|
2017-07-12 14:35:09 +01:00 |
|
Andy Healey
|
e8591d0cfb
|
DOCS-3531 - Update action-service.properties
|
2017-07-12 14:33:22 +01:00 |
|
Tuna Aksoy
|
76d0c19bde
|
(Record only) Merge branch 'release/V2.5'
# Conflicts:
# pom.xml
# rm-automation/pom.xml
# rm-community/pom.xml
# rm-community/rm-community-repo/pom.xml
# rm-community/rm-community-share/pom.xml
# rm-enterprise/pom.xml
# rm-enterprise/rm-enterprise-repo/pom.xml
# rm-enterprise/rm-enterprise-share/pom.xml
|
2017-07-10 16:56:11 +01:00 |
|
Tuna Aksoy
|
402ea0ca9a
|
RM-5345: Fixed review comments (cherry picked from commit f86440b)
RM-5346: Null pointers should not be dereferenced (cherry picked from commit 8130305)
|
2017-07-10 16:47:44 +01:00 |
|
alfresco-build
|
e46b3eae0f
|
[maven-release-plugin] prepare for next development iteration
|
2017-07-10 14:21:19 +01:00 |
|
alfresco-build
|
a81c2eb8d8
|
[maven-release-plugin] prepare release V2.5.2
ags-2.5.2
|
2017-07-10 14:21:16 +01:00 |
|
Tuna Aksoy
|
a5c4eb88c5
|
Merge branch 'merge/RM25_20170709' into 'master'
Merge/rm25 20170709
See merge request !384
|
2017-07-10 13:36:13 +01:00 |
|
Tuna Aksoy
|
5cfc0b3b1b
|
Merge branch 'feature-2.5/RM-5359_integration_test' into merge/RM25_20170709
# Conflicts:
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-authorities-SqlMap.xml
# rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/org.hibernate.dialect.Dialect/rm-common-SqlMap.xml
|
2017-07-09 18:41:25 +01:00 |
|
Tuna Aksoy
|
3c822e95cb
|
RM-5359 (An admin user can't declare as record a secured file)
|
2017-06-30 17:22:38 +01:00 |
|
Tuna Aksoy
|
1ce62e0434
|
Merge branch 'feature/RM-5345_Fix_security_issues' into 'master'
Feature/rm 5345 fix security issues
See merge request !374
|
2017-06-30 15:45:29 +01:00 |
|
Tuna Aksoy
|
e35065cfc0
|
Merge branch 'merge/RM_25_2017_07_28' into 'master'
Merge/rm 25 2017 07 28
See merge request !376
|
2017-06-28 17:28:17 +01:00 |
|
Tuna Aksoy
|
f86440be72
|
RM-5345: Fixed review comments
|
2017-06-28 16:03:38 +01:00 |
|
Tuna Aksoy
|
6ad0698360
|
Merge branch 'release/V2.5' into merge/RM_25_2017_07_28
|
2017-06-28 14:36:45 +01:00 |
|
Sara Aspery
|
76ef3bd465
|
Merge branch 'feature/RM-4431_LatestCompleteRecordChanges' into 'master'
Feature/rm 4431 latest complete record changes
See merge request !371
|
2017-06-28 14:08:16 +01:00 |
|
Tuna Aksoy
|
0ff080f305
|
RM-5347: Resources should be closed
|
2017-06-27 16:52:51 +01:00 |
|
Tuna Aksoy
|
813030506e
|
RM-5346: Null pointers should not be dereferenced
|
2017-06-27 16:35:51 +01:00 |
|
Sara Aspery
|
29517c366c
|
final change after review - replace logger method
|
2017-06-27 15:12:22 +01:00 |
|
Sara Aspery
|
cbabf8e545
|
updated serialId in new RecordMissingMetadataException
|
2017-06-27 12:48:59 +01:00 |
|
Sara Aspery
|
7269b33c65
|
changes following review
|
2017-06-26 12:41:02 +01:00 |
|
Sara Aspery
|
5d02384f24
|
tidy up
|
2017-06-25 11:01:11 +01:00 |
|
Sara Aspery
|
fb215876b8
|
fixing IDE whitespaces
|
2017-06-24 22:49:27 +01:00 |
|
Sara Aspery
|
822f046e0d
|
changes following review
|
2017-06-23 18:16:38 +01:00 |
|
Sara Aspery
|
80434ce57e
|
Merge branch 'master' of git.alfresco.com:records-management/records-management into RM-4431_CompleteRecordActionRestAPI
|
2017-06-23 16:40:00 +01:00 |
|
Sara Aspery
|
bf06f075d4
|
corrected comment
|
2017-06-23 16:24:47 +01:00 |
|
Silviu Dinuta
|
5ef418d4b7
|
Merge branch 'feature-2.5/RM-5033_excludeAlsoDestroyedNonElectronicRecords' into 'release/V2.5'
RM-5033: used aspect rma:ghosted to exclude destroyed records with kept
See merge request !365
|
2017-06-23 14:48:23 +01:00 |
|
Sara Aspery
|
1400d3f657
|
tidied up REST tests
|
2017-06-23 11:54:40 +01:00 |
|
Silviu Dinuta
|
5dd5d27867
|
RM-5033: used aspect rma:ghosted to exclude destroyed records with kept
metadata
|
2017-06-23 13:01:40 +03:00 |
|
Richard Smith
|
6cccc25f8f
|
Merge branch 'feature/RM-5311_Fix_Swagger_Caching' into 'master'
RM-5311 - Fix the caching of swagger files
See merge request !363
|
2017-06-22 10:38:55 +01:00 |
|
Silviu Dinuta
|
42bf4f6ad5
|
Merge branch 'feature-2.5/RM-5033_ReviewNotificationEmailSentForDestroyedRecordWithMetadata' into 'release/V2.5'
RM-5033: excluded destroyed records with metadata from search query
See merge request !364
|
2017-06-22 10:11:20 +01:00 |
|
Silviu Dinuta
|
6349f27056
|
RM-5033: excluded destroyed records with metadata from search query
|
2017-06-22 11:43:08 +03:00 |
|
Richard Smith
|
85db28d4ff
|
RM-5311 - Fix the caching of swagger files
|
2017-06-22 09:26:33 +01:00 |
|
alfresco-build
|
a3bf6676d4
|
[maven-release-plugin] prepare for next development iteration
|
2017-06-21 21:43:06 +01:00 |
|
alfresco-build
|
cfc88fbcd2
|
[maven-release-plugin] prepare release V2.6.a
ags-2.6.a
|
2017-06-21 21:43:03 +01:00 |
|
Tuna Aksoy
|
7fb5e4fc6d
|
Merge branch 'feature/UA_API_review2' into 'master'
Update gs-core-api.yaml
See merge request !362
|
2017-06-21 16:45:11 +01:00 |
|
Tuna Aksoy
|
39802faa65
|
Update gs-core-api.yaml
|
2017-06-21 16:44:42 +01:00 |
|
Tuna Aksoy
|
228cd2cff8
|
Update gs-core-api.yaml
|
2017-06-21 16:43:34 +01:00 |
|
Tuna Aksoy
|
89dc4f1101
|
Update gs-core-api.yaml
|
2017-06-21 16:39:00 +01:00 |
|
Andy Healey
|
7c71da72d1
|
Update gs-core-api.yaml
|
2017-06-21 16:09:37 +01:00 |
|
Sara Aspery
|
f9c4ef0f41
|
fixing tests
|
2017-06-21 15:34:00 +01:00 |
|
alfresco-build
|
ef2d053d75
|
[maven-release-plugin] prepare for next development iteration
|
2017-06-21 13:36:58 +01:00 |
|
alfresco-build
|
4f1ebf1b5c
|
[maven-release-plugin] prepare release V2.5.2-EA2
ags-2.5.2-EA2
|
2017-06-21 13:36:54 +01:00 |
|
Tuna Aksoy
|
b161cc041a
|
Merge branch 'merge/20170620_RM25' into 'master'
Merge/20170620 rm25
See merge request !360
|
2017-06-21 10:34:57 +01:00 |
|
Tuna Aksoy
|
ffee5eac1a
|
Merge branch 'release/V2.5' into merge/20170620_RM25
|
2017-06-20 17:43:36 +01:00 |
|
Ramona Popa
|
ea068a3a36
|
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
|
fe44da1abe
|
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
|
2c3dc0698b
|
Merge branch 'release/V2.5' into merge/20170620_RM25
# Conflicts:
# rm-community/pom.xml
|
2017-06-20 16:04:36 +01:00 |
|