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
3,212 Commits 324 Branches 2,170 Tags
f49cd946e188a8421fc999346717a3323cb1538b
Commit Graph

3212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
13689a8b2a RM-4676 The patch version number should not be localised. 
Delete localisation files and exclude version.properties from future
translation bundles.
 2017-02-14 10:05:25 +00:00
Tom Page
bcafd847d2 RM-4234 When marking a node then also mark all renditions of it. 
The same applies to clearing marks from a node.

This involved adding the rendition service to the base service (which I'm
a bit concerned about, because it looked like this should already have
been present).
 2017-02-10 12:10:48 +00:00
Roy Wetherall
c1daf25912 Revert module properties changes 2017-02-06 15:03:35 +11:00
Roy Wetherall
418b46c7c6 Purge cache when group is deleted 2017-02-01 15:48:33 +11:00
dbilligmaier
3dddbb7188 ALL LANG: Updated localized files as per Revision 2017-01-26 2017-01-27 13:53:30 +00:00
Oana Nechiforescu
c86d428316 Merge branch 'release/V2.4' of https://git.alfresco.com/records-management/records-management into merge-2.5/Merge24To25RM-4520 2017-01-25 18:18:17 +02:00
Tom Page
ad656729c9 MNT-16881 Add CreateChild permission to the write group. 
Note that the RM permission code in RecordsManagementPermissionPostProcessor
is not navigating the permission group hierarchy correctly. This is a simple
fix to solve the issue referenced, but the full fix will go into master.
 2017-01-24 11:21:35 +00:00
David Webster
e35773af7a Merge branch 'feature-2.5/RM-3854_Add_isLocked_security_context' into 'release/V2.5' 
RM-3854: Add access control mapping for LockService.isLocked method

Add mapping for LockService.isLocked method. JIRa refers to two new mapping required, but I've only added one as the other was added in RM-4259.

See merge request !10
 2017-01-16 15:31:16 +00:00
David Webster
408956976b RM-3854: Add access control mapping for LockService.isLocked method 2017-01-13 11:26:19 +00:00
Tuna Aksoy
8466952c05 Merge branch 'release/V2.4' into release/V2.5 2017-01-04 14:21:34 +00:00
Tuna Aksoy
860b262431 Merge branch 'release/V2.3' into release/V2.4 2017-01-04 14:13:35 +00:00
Tuna Aksoy
526d6982be Merge branch 'release/V2.3.0.x' into release/V2.3 2017-01-04 13:58:14 +00:00
Tuna Aksoy
c22b815bfa Updated version number to 2.3.0.10-SNAPSHOT 2017-01-04 13:54:12 +00:00
Tuna Aksoy
29de36a563 Release RM 2.3.0.9 2017-01-04 12:40:14 +00:00
Tuna Aksoy
f5e711a746 Merge branch 'release/V2.4' into release/V2.5 2017-01-02 19:49:20 +00:00
Tuna Aksoy
7a7986bfcd RM-4570 (Update license headers) 2017-01-02 19:45:32 +00:00
Tuna Aksoy
058e3803fe RM-4570 (Update license headers) 2017-01-02 19:21:21 +00:00
Tuna Aksoy
ae75398db1 Merge branch 'release/V2.4' into release/V2.5 2016-12-30 08:13:34 +00:00
Tuna Aksoy
a61f833c8f Merge branch 'release/V2.3' into release/V2.4 2016-12-28 20:34:52 +00:00
Tuna Aksoy
0f9576bb82 Merge branch 'release/V2.3.0.x' into release/V2.3 2016-12-27 20:38:30 +00:00
Tuna Aksoy
dc3ecec202 Copied the ui-automation code from release/v2.3 2016-12-20 11:04:18 +00:00
Mihai Cozma
f8041c0f8a 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
4e239abd1a Fixed Alfresco installer download config 2016-12-19 21:24:29 +00:00
Tuna Aksoy
86ad1304c2 Set renditionService property for filePlanComponent bean definition 2016-12-19 20:41:11 +00:00
Tuna Aksoy
70776d5240 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
4630c5ba9a MNT 16971 Unable to set an read only alfresco rm 
- remove commented code
 2016-12-19 16:01:52 +02:00
Mihai Cozma
38fa3baab7 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
0ceba1359b 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
dda822f90f 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
cd082da61e BDE-837 Allow to specify URL of Alfresco installer in functional tests 2016-12-06 12:16:23 +00:00
Tom Page
a85d9f5290 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
bcbf365875 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
ce0a9d8b2f RM-4320 Remove alfresco min rm version 2016-11-26 09:09:30 +02:00
Mihai Cozma
952148a0ca Revert "Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'"" 
This reverts commit 1f5c5c0c19.
 2016-11-25 17:17:55 +02:00
Mihai Cozma
1f5c5c0c19 Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'" 
This reverts commit 21b0ad9eff, reversing
changes made to d90c19522e8844ef8a11d2af3f84891bbe1bf71a.
 2016-11-25 16:11:24 +02:00
Mihai Cozma
21b0ad9eff 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
3b3decf41c 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
c07bb9e75f 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
58c22467bb Set Alfresco community version to 5.1.g 2016-11-22 14:23:09 +02:00
Tom Page
d55deb6947 For the V2.5 builds we want to default to the released artifacts. 2016-11-22 10:41:51 +00:00
Tuna Aksoy
b0fb8b8d67 Fixed Alfresco installer host 
(cherry picked from commit 3070866e2c)
 2016-11-22 10:40:05 +00:00
Mihai Cozma
78f344da10 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
66332f624f 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
010e79be05 RM-4320 Upgrade RM 2.5.1 to Alf 5.2 2016-11-16 16:53:15 +02:00
Oana Nechiforescu
cba57bc0bb 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
66873aa7e6 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
dbf806c275 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
3f7a3e2be1 RM-4320 Upgrade RM 2.5.1 dependency to Alfresco 5.2_SNAPSHOT 2016-11-14 17:33:34 +02:00
Oana Nechiforescu
6323c97f26 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
ee41095e1b 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