Commit Graph

3433 Commits

Author SHA1 Message Date
Tom Page
aceca1fca2 Merge release/V2.5 into merge-2.5/MNT-18082_HotFixV2.5.0.4. 2017-07-19 09:00:28 +01:00
Tom Page
a473316d3d Merge branch 'merge-2.5/MNT-18083_SearchPerformance' into 'release/V2.5'
Merge 2.5/mnt 18083 search performance

See merge request !373
2017-07-19 08:39:44 +01:00
Tom Page
da4a1d2e85 Merge release/V2.5.0.x into release/V2.5.
Record-only merge of changes to get UI tests to pass (actually this makes
one small change to remove an unused import).
2017-07-18 13:51:32 +01:00
Tom Page
019490744f Merge release/V2.5.0.x into release/V2.5.
Merge changes needed for release of V2.5.0.4.
2017-07-18 13:31:45 +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
Oana Nechiforescu
412d9df2ce Merge branch 'hotfix-2.5/RM-5369FixInviteUsersTestMethod' into 'release/V2.5.0.x'
Hotfix 2.5/rm 5369 fix invite users test method

See merge request !382
2017-07-10 08:30:10 +01:00
Rodica Sutu
36239e9ebf Merge branch 'feature-2.4/RM-4835_UpdateInviteUsersMethod' into 'release/V2.4'
Feature 2.4/rm 4835 update invite users method

See merge request !117
2017-07-07 15:50:20 +03:00
alfresco-build
c9afdcaba1 [maven-release-plugin] prepare for next development iteration 2017-07-03 12:15:19 +01:00
alfresco-build
5cca06909b [maven-release-plugin] prepare release V2.5.0.4 ags-2.5.0.4 2017-07-03 12:15:16 +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
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
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
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
rwetherall
90cd720c42 Search browse performance improvements
(cherry picked from commit 089df63e27b03efbfb97c369faad80c8e8c9885c)
2017-06-26 07:47:50 +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
Silviu Dinuta
5dd5d27867 RM-5033: used aspect rma:ghosted to exclude destroyed records with kept
metadata
2017-06-23 13:01:40 +03: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
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
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
Ramona Popa
51746da088 Merge branch 'release/V2.5' into feature-2.5/RM-5309_SharedFilesCannotBeClasified 2017-06-20 14:36:55 +03:00
Ramona Popa
5e906d878c RM-5309 - typo 2017-06-20 14:34:47 +03:00
Ramona Popa
8214f6d23e RM-5309 - fix after review 2017-06-20 14:33:28 +03:00
Tuna Aksoy
9a9c6936d5 Merge branch 'feature-2.5/Update_community_dependency' into 'release/V2.5'
Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer …

See merge request !358
2017-06-20 10:11:31 +01:00
Tuna Aksoy
e3cecf0f89 Changed the Share dependency from 5.1.g to 5.1.f as we do not have an installer for Repo/Share 5.1.g combination. 2017-06-19 22:08:25 +01:00
Ramona Popa
15e308a547 RM-5309 - Added integration test for the case: when a record is declared, the shared link is removed 2017-06-19 17:46:34 +03:00
Ramona Popa
37d1b200a2 RM-5309 - Remove shared link if exists when a record is declared 2017-06-16 18:44:14 +03:00
Tuna Aksoy
f479000e61 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
aba2a0e80a 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
ae2f491d78 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
09e3766230 RM-5175_Complete_record_with_missing_metadata changes after review 2017-06-12 16:42:05 +01:00
Tuna Aksoy
06a48d73cd Merged release/V2.5 and addressed review comments 2017-06-12 16:41:30 +01:00
Tuna Aksoy
1712bac995 RM-4689 (Can delete all RM site content through Repository browser)
Manually backported following changes:

RM-4293
734c1b2a82

RM-4326
a4aac053a8
c6ca74ab26
2017-06-12 16:17:24 +01:00
Sara Aspery
d98d3e9c69 RM-5175_Complete_record_with_missing_metadata 2017-06-10 23:50:15 +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
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
Sara Aspery
11f9c6c3e7 RM-5175_Complete_record_with_missing_metadata 2017-06-06 16:49:56 +01:00