Tuna Aksoy
9f5c1f9215
Merge branch 'release/V2.3' into release/V2.4
2016-12-28 20:34:52 +00:00
Tuna Aksoy
868766c586
Merge branch 'release/V2.3.0.x' into release/V2.3
2016-12-27 20:38:30 +00:00
Tuna Aksoy
e7133bd5c6
Copied the ui-automation code from release/v2.3
2016-12-20 11:04:18 +00:00
Mihai Cozma
21b281bf53
Merge branch 'feature-2.5/MNT-16971_Unable_to_set_an_ReadOnly_AlfrescoRM' into release/V2.5
2016-12-20 10:40:33 +02:00
Tuna Aksoy
b9c4defdb9
Fixed Alfresco installer download config
2016-12-19 21:24:29 +00:00
Tuna Aksoy
ee2455d7c6
Set renditionService property for filePlanComponent bean definition
2016-12-19 20:41:11 +00:00
Tuna Aksoy
9c7ee3acd2
Added a check to see if the aspect hasn't been removed in the same
...
transaction.
2016-12-19 18:45:17 +00:00
Mihai Cozma
0a1812ef4f
MNT 16971 Unable to set an read only alfresco rm
...
- remove commented code
2016-12-19 16:01:52 +02:00
Mihai Cozma
7bb51b1522
MNT-16971 Unable to set read only using property server.allowWrite=false
...
-fix transactions permission
-fix document library view
2016-12-19 15:52:26 +02:00
Tuna Aksoy
2fd7720db5
MNT-17241 (Access denied exception thrown during preview of certain content by non-admin/non-site member users)
2016-12-19 13:45:52 +00:00
Samuel Langlois
a285f024ed
Merge branch 'release/V2.5' into 'release/V2.5'
...
Specify full URL for Alfresco installers in 2.5
Similar to Merge Request !680 based on release/2.5 branch
The modification allows to specify the full URL (rather than pieces of it) to download the Alfresco One installer used by functional tests. It is cleaner, and also allows more flexibility.
The goal is to be able to download installers stored on S3, making it much more efficient and hopefully Automation builds will stop breaking randomly on elastic Bamboo agents - see https://issues.alfresco.com/jira/browse/BDE-837
See merge request !681
2016-12-06 14:14:13 +00:00
Samuel Langlois
6523f5f183
BDE-837 Allow to specify URL of Alfresco installer in functional tests
2016-12-06 12:16:23 +00:00
Tom Page
ca9412e1ff
RM-4493 Add javax.servlet-api "provided" dependency to community.
...
This is required to build the community code against Alfresco 5.2-EA, which
we do as part of the enterprise release build.
2016-12-01 09:55:33 +00:00
Mihai Cozma
1aebd832cc
Merge branch 'feature-2.5/RM4320_Compatibility_issues' into 'release/V2.5'
...
Feature 2.5/rm4320 compatibility issues
See merge request !665
2016-11-26 12:06:03 +00:00
Mihai Cozma
1988533145
RM-4320 Remove alfresco min rm version
2016-11-26 09:09:30 +02:00
Mihai Cozma
0611866018
Revert "Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'""
...
This reverts commit 46ebbbf9fc
2016-11-25 17:17:55 +02:00
Mihai Cozma
46ebbbf9fc
Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'"
...
This reverts commit e6f55df382
2016-11-25 16:11:24 +02:00
Mihai Cozma
e6f55df382
Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'
...
Feature 2.5/merge rm4320 to v2.5
See merge request !651
2016-11-25 09:25:09 +00:00
Tom Page
80b2fcdd90
RM-4456 Make unit tests work against Alfresco 5.2.b and 5.1.1.
2016-11-24 16:01:06 +00:00
Tom Page
0d54de1f8d
RM-4456 Fix cherry-picked properties.
...
We only want one properties entry in the pom file.
2016-11-22 14:08:47 +00:00
Mihai Cozma
fa56fca9f6
Set Alfresco community version to 5.1.g
2016-11-22 14:23:09 +02:00
Tom Page
85e486639d
For the V2.5 builds we want to default to the released artifacts.
2016-11-22 10:41:51 +00:00
Tuna Aksoy
0ceb96b073
Fixed Alfresco installer host
...
(cherry picked from commit 61f6c2a0d1
2016-11-22 10:40:05 +00:00
Mihai Cozma
73a84031ae
Merge branch 'feature-2.5/RM-4320_Upgrade_RM_2.5.1_Dependency_to_Alf5.2' into feature/Merge_RM4320_to_V2.5
2016-11-22 11:19:57 +02:00
Mihai Cozma
92ea428423
RM 4320 Min Alfresco Repo Version should be 5.1.1 not
...
5.2.(alfresco.version)
2016-11-21 13:27:46 +02:00
Mihai Cozma
ea968cf07f
RM-4320 Upgrade RM 2.5.1 to Alf 5.2
2016-11-16 16:53:15 +02:00
Oana Nechiforescu
b1874a363b
Merge branch 'merge-2.5/Merge231ReleaseIn25' into 'release/V2.5'
...
Merge 2.5/merge231 release in25
See merge request !629
2016-11-16 14:05:52 +00:00
Oana Nechiforescu
a40fb40951
Merge remote-tracking branch 'origin/release/V2.4' into merge-2.5/Merge231ReleaseIn25
...
# Conflicts:
# rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
# rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
# rm-automation/src/main/java/org/alfresco/po/rm/details/category/DispositionBlock.java
# rm-automation/src/main/java/org/alfresco/po/rm/details/record/RecordActionsPanel.java
# rm-automation/src/main/java/org/alfresco/po/rm/dialog/AuthoritySelectDialog.java
# rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/DeleteRelationshipPrompt.java
# rm-automation/src/main/java/org/alfresco/po/rm/dialog/addrelationship/SelectRecordDialog.java
# rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
# rm-automation/src/main/java/org/alfresco/po/share/page/Message.java
# rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
# rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
# rm-automation/src/test/java/org/alfresco/test/BaseTest.java
# rm-automation/src/test/java/org/alfresco/test/TestData.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/BrowseClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/ClassifyRecord.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/EditClassification.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedDocuments.java
# rm-automation/src/test/java/org/alfresco/test/integration/classify/SearchClassifiedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
2016-11-15 18:04:48 +02:00
Oana Nechiforescu
9819160b0c
Merge branch 'merge-2.4/Merge231AfterReleaseIn24' into 'release/V2.4'
...
Merge 2.4/merge231 after release in24
See merge request !627
2016-11-15 10:44:07 +00:00
Mihai Cozma
0b0094af84
RM-4320 Upgrade RM 2.5.1 dependency to Alfresco 5.2_SNAPSHOT
2016-11-14 17:33:34 +02:00
Oana Nechiforescu
28b213a1ec
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/Merge231AfterReleaseIn24
...
# Conflicts:
# rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java
# rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java
# rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java
# rm-automation/src/test/java/org/alfresco/test/TestData.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/addRelationship/AddRelationship.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/audit/AuditAccess.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/disposition_schedule/FoldersDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/node_browser/NodeBrowser.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/CopyToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/LinkToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/MoveToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/level2/versions/RecordVersions.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/BasicRulesIntegration.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateCategories.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateElectronicRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateFolders.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateNonElectronicRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareInPlaceRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareVersionAsRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/FileUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionScheduleWithGhosting.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RejectRecord.java
# rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/SearchRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/FoldersDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/node_browser/NodeBrowser.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/CopyToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/LinkToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/MoveToRuleOnFolders.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/RulesAppliedOnWholeFilePlan.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/SetPropertyValueCollSiteAndFilePlan.java
# rm-automation/src/test/java/org/alfresco/test/integration/level2/userDashboard/AdminDashboardMyDocumentsFilter.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/CreateCategories.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareVersionAsRecord.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionScheduleWithGhosting.java
# rm-automation/src/test/java/org/alfresco/test/integration/smoke/RejectRecord.java
# rm-automation/src/test/resources/coreTests.xml
# rm-automation/src/test/resources/testng.xml
2016-11-14 17:17:45 +02:00
Oana Nechiforescu
1dbf09f994
Merge branch 'merge-2.3/Merge231ReleaseIn23' into 'release/V2.3'
...
Merge 2.3/merge231 release in23
Merging 2.3.1 in 2.3
See merge request !623
2016-11-11 15:45:18 +00:00
Tom Page
26e245b3f2
Merge release/V2.3.1.x into merge-2.3/Merge231ReleaseIn23.
2016-11-11 15:40:47 +00:00
Tom Page
46230c1181
Remove spurious temp file.
2016-11-11 15:39:37 +00:00
Mihai Cozma
1bb8521f60
Merge branch 'release/V2.5' of gitlab.alfresco.com:records-management/records-management into release/V2.5
2016-11-11 14:46:24 +02:00
Oana Nechiforescu
071e1b3214
Merge commit 'c03c6da96' into merge-2.3/Merge231ReleaseIn23
...
# Conflicts:
# pom.xml
# rm-automation/pom.xml
# rm-server/pom.xml
# rm-share/pom.xml
2016-11-11 14:40:57 +02:00
Ana Bozianu
6160e413e0
read only merge release/V2.5.0.x into release/V2.5.
...
2.5.0.x changes have been commited in 55fd1ec
2016-11-11 12:32:10 +02:00
Mihai Cozma
2377d8e520
Merge branch 'feature/RM-4329_Alfreco_Search_in_colaboration_site_doesn't_work' into 'master'
...
Feature/rm 4329 alfreco search in colaboration site doesn't work
See merge request !616
2016-11-11 09:50:21 +02:00
Tom Page
141927d001
Merge branch 'merge-2.5/RM-4264_RelationshipDialog' into 'release/V2.5'
...
Merge 2.5/rm 4264 relationship dialog
RM-2526, RM-4264 Merge release/V2.4 into release/V2.5.
See merge request !620
2016-11-10 13:58:09 +00:00
Tom Page
4e6eae75a3
RM-2526, RM-4264 Merge release/V2.4 into release/V2.5.
2016-11-10 10:52:59 +00:00
Tom Page
1ab4168f05
RM-2526, RM-4264 Merge changes from release/V2.3 to release/V2.4.
2016-11-10 08:17:12 +00:00
Tom Page
1476e389d6
Update version to 2.3.1.1-SNAPSHOT.
2016-11-09 13:48:25 +00:00
Tom Page
0a423f1660
Update version to 2.3.1.
2016-11-09 13:17:00 +00:00
Ana Bozianu
55fd1ec3c6
Merge merge-2.5/2.5.0.x_to_2.5 into release/V2.5
2016-11-09 14:41:13 +02:00
Tom Page
9d6bbe9cd2
Merge branch 'merge-2.5/RM-4247_UpdateDispositionProperty' into 'release/V2.5'
...
Merge 2.5/rm 4247 update disposition property
RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.
See merge request !609
2016-11-09 08:09:45 +00:00
Roxana Lucanu-Ghetu
0cb9a8420c
Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526
2016-11-08 17:35:25 +02:00
Tom Page
76ca5df8a8
RM-4247 Merge release/V2.4 into release/V2.5.
2016-11-08 13:25:45 +00:00
Tom Page
bbf074b434
Merge branch 'merge-2.4/RM-4247_UpdateDispositionProperty' into 'release/V2.4'
...
Merge 2.4/rm 4247 update disposition property
RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.
See merge request !606
2016-11-08 13:21:55 +00:00
roxana
8dd2e277cf
Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3
2016-11-08 15:02:01 +02:00
Oana Nechiforescu
2eca420b59
Merge branch 'feature-2.3/RM-4313_UpdateDispositionNextActionDateWhenCurrentDateIsInThePast' into 'release/V2.3.1.x'
...
Feature 2.3/rm 4313 update disposition next action date when current date is in the past
Update record disposition action as of date if it changed.
See merge request !598
2016-11-07 21:12:53 +00:00
