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,132 Commits 324 Branches 2,170 Tags
2d06bda9b51ec0b0e3362015c1c391a66a68784d
Commit Graph

4132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Smith
2d06bda9b5 Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-25 09:07:18 +01:00
Tom Page
55b0268166 Merge branch 'merge/MNT-18083_SearchPerformance' into 'master' 
Merge/mnt 18083 search performance

See merge request !398
 2017-07-25 08:12:52 +01:00
Tom Page
7e1b33dad7 MNT-18083 Merge release/V2.5 into master. 2017-07-24 18:45:44 +01:00
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
Richard Smith
bbf7fb877c Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-11 10:06:39 +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
Richard Smith
185f719c57 Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-07-10 14:28:31 +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
Richard Smith
52d5ede777 RM-4613 Further updates 2017-07-10 10:38:42 +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
Tom Page
9e750f7f2b MNT-18083 Merge release/V2.5.0.x into release/V2.5. 2017-06-27 16:24:40 +01:00
alfresco-build
674864c48a [maven-release-plugin] prepare for next development iteration 2017-06-27 16:01:03 +01:00
alfresco-build
1afeabb314 [maven-release-plugin] prepare release V2.5.0.3 ags-2.5.0.3 2017-06-27 16:01:00 +01:00
Sara Aspery
29517c366c final change after review - replace logger method 2017-06-27 15:12:22 +01:00
Ross Gale
ba50983f19 Merge branch 'hotfix-2.5/MNT-18083-SearchPerf250x' into 'release/V2.5.0.x' 
Hotfix 2.5/mnt 18083 search perf250x

See merge request !370
 2017-06-27 14:52:25 +01:00
Sara Aspery
cbabf8e545 updated serialId in new RecordMissingMetadataException 2017-06-27 12:48:59 +01:00
rwetherall
db19519dc7 Use the bean id in the cache key to prevent actions and identifiers clashing 2017-06-27 21:42:08 +10:00
rwetherall
fcab3c3bdf Fix BaseEvaluator cache. Name missing from key. 2017-06-27 16:11:25 +10:00
rwetherall
1a13253d57 By pass public services to reduce bottle necks where appropriate 2017-06-27 13:38:01 +10:00
rwetherall
d030ede377 Transaction cache on BaseEvaluator.evaluate method 2017-06-27 13:13:25 +10:00
Sara Aspery
7269b33c65 changes following review 2017-06-26 12:41:02 +01:00
rwetherall
90cd720c42 Search browse performance improvements 
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
 2017-06-26 07:47:50 +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