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,525 Commits 324 Branches 2,170 Tags
2239b23e40b0dc62efb51a5b47d2fed2ea059cfe
Commit Graph

4525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alfresco-build
7aaec18509 [maven-release-plugin] prepare for next development iteration 2018-06-13 11:12:54 +01:00
alfresco-build
ea001123a5 [maven-release-plugin] prepare release V2.5.4 2018-06-13 11:12:52 +01:00
alfresco-build
d655d895a6 [maven-release-plugin] prepare for next development iteration 2018-06-13 10:20:56 +01:00
alfresco-build
a746dc77a8 [maven-release-plugin] prepare release V2.5.4 2018-06-13 10:20:54 +01:00
cagache
6717a32b9c Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/MNT-18558_PermissionIssue 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/record/DeclareInPlaceRecords.java
 2018-06-11 14:49:24 +03:00
Ross Gale
6c5813bc46 MNT-19442 merging up fix for 2.5.4 2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
8883ce2777 MNT-18558 Fix permission issue 2018-06-05 17:22:47 +03:00
Ross Gale
0acddd3802 MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider 2018-06-04 14:48:39 +01:00
Rodica Sutu
dc2dcb87e7 Merge branch 'merge-2.6/FixesFrom2.5' into 'release/V2.6' 
RM-6069 : Merge from 2.5 to 2.6

See merge request records-management/records-management!864
 2018-02-27 15:13:21 +00:00
Rodica Sutu
751430ac4a Merge remote-tracking branch 'origin/release/V2.5' into merge-2.6/FixesFrom2.5 2018-02-27 08:46:23 +02:00
Rodica Sutu
d151a7f0d6 Update version to 2.5.3.1-SNAPSHOT 2018-02-26 17:39:11 +02:00
alfresco-build
c4a87a0ac4 [maven-release-plugin] prepare for next development iteration 2018-02-26 15:02:28 +00:00
alfresco-build
d7df9e0981 [maven-release-plugin] prepare release V2.5.3 2018-02-26 15:02:26 +00:00
Rodica Sutu
5a0313e779 Merge branch 'release/V2.5' into merge-2.6/FixesFrom2.5 
# Conflicts:
#	rm-automation/pom.xml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/disposition_schedule/DispositionScheduleLinkedRecords.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/DeleteFolderInUnfiledRecordsAndFilePlan.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/ClassifyRecord.java
#	rm-automation/rm-automation-ui/src/test/resources/smokeTests.xml
#	rm-automation/src/test/resources/classificationTests.xml
#	rm-automation/src/test/resources/level2Tests.xml
 2018-02-26 14:09:40 +02:00
Rodica Sutu
863fbfb115 Merge branch 'feature-2.5/RM-6093_FixTestExecutionOrder' into 'release/V2.5' 
RM-6093 fix for running the method on test classes in a succession instead of interleaved

See merge request records-management/records-management!855
 2018-02-26 07:44:32 +00:00
Rodica Sutu
297af07a32 Merge remote-tracking branch 'remotes/origin/release/V2.5' into merge-2.6/FixesFrom2.5 
# Conflicts:
#	rm-automation/pom.xml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/DataPrepHelper.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CreateRMSite.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/classification/SecurityMarksOnContent.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/SearchClassifiedRecords.java
#	rm-automation/src/test/java/org/alfresco/apiTesting/BaseApi.java
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
#	rm-enterprise/pom.xml
 2018-02-24 21:48:16 +02:00
Rodica Sutu
2e63a743c5 another attempt to fix running the test execution order 2018-02-22 23:20:27 +02:00
Rodica Sutu
fc5f3df281 Merge branch 'release/V2.5' of git.alfresco.com:records-management/records-management into feature-2.5/RM-6093_FixTestExecutionOrder 
# Conflicts:
#	rm-automation/src/test/java/org/alfresco/test/community/smoke/InplaceRecordSearch.java
 2018-02-22 10:12:01 +02:00
Rodica Sutu
fdb76f4bcf attempt (2) to fix running the test methods in different classes interleaved 2018-02-21 22:57:16 +02:00
Rodica Sutu
a6a6f3dd42 Merge branch 'feature-2.5/MNT-19114_TestForCreateWikiPage' into 'release/V2.5' 
MNT-19114 Test

See merge request records-management/records-management!856
 2018-02-21 17:21:25 +00:00
Rodica Sutu
4e22ad7fe4 upgrade the dataPrep dependency 
add a simple test to cover create wiki page issue (MNT-19117)
 2018-02-20 22:52:34 +02:00
Elena Hardon
8ad2f373b7 MNT-19114 - Made review changes 2018-02-19 13:40:52 +02:00
Elena Hardon
d8612fe1fd MNT-19114: Removed unused comments 2018-02-16 16:08:18 +02:00
Elena Hardon
6a3e742c5a MNT-19114 - Added integration test which shows that wiki pages can now be created as immediate folder type children under RM site 2018-02-16 16:07:18 +02:00
Elena Hardon
be3bb1e2f9 RM-19114: Removed the condition on creating only 2 folder-types from root and modified the unit test that was checking this 
(cherry picked from commit af108af09125ed3da3e6ff6673434c3b045469a2)

# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java
 2018-02-15 20:47:38 +02:00
Tom Page
98765ca22c Updating license header to 2018 2018-01-16 12:31:06 +00:00
Tom Page
0acdf8f060 Record-only merge V2.6.0.x into V2.6 2018-01-16 12:26:25 +00:00
Tom Page
b431447c68 Updating license header to 2018 2018-01-16 12:26:10 +00:00
Tom Page
8dc17d6bde Record-only merge V2.5 into V2.6 2018-01-16 12:21:25 +00:00
Tom Page
1cda9176a5 Updating license header to 2018 2018-01-16 12:21:10 +00:00
Tom Page
f4aefe8c33 Record-only merge V2.5.2.x into V2.5 2018-01-16 12:17:24 +00:00
Tom Page
33b879c071 Updating license header to 2018 2018-01-16 12:17:11 +00:00
Tom Page
8db9884b64 Record-only merge V2.5.1.x into V2.5 2018-01-16 12:13:26 +00:00
Tom Page
b1b9e2cf7b Updating license header to 2018 2018-01-16 12:13:12 +00:00
Tom Page
4da7eca576 Record-only merge V2.5.0.x into V2.5 2018-01-16 12:09:35 +00:00
Tom Page
491b1236bb Updating license header to 2018 2018-01-16 12:09:20 +00:00
Tom Page
ca23231913 Record-only merge V2.4 into V2.5 2018-01-16 12:05:53 +00:00
Tom Page
69ea393e63 Updating license header to 2018 2018-01-16 12:05:38 +00:00
Tom Page
50008360b5 Record-only merge V2.4.0.x into V2.4 2018-01-16 12:02:53 +00:00
Tom Page
8cdd6861db Updating license header to 2018 2018-01-16 12:02:40 +00:00
Tom Page
dd613e9492 Merge release/V2.5 into release/V2.6. 2017-12-19 10:26:22 +00:00
Tom Page
8c150529ca Merge release/V2.5.2.x into release/V2.5. 2017-12-19 10:20:48 +00:00
alfresco-build
0888913598 [maven-release-plugin] prepare for next development iteration 2017-12-15 16:59:26 +00:00
alfresco-build
4f6855da72 [maven-release-plugin] prepare release V2.5.2.1 2017-12-15 16:59:24 +00:00
Sara Aspery
5497066619 Merge branch 'hotfix-2.5/MNT-18771­PublishJobUpgradeError' into 'release/V2.5.2.x' 
MNT-18771 Publish Job Upgrade Error

See merge request records-management/records-management!745
 2017-12-14 14:24:03 +00:00
cagache
6195140890 Merge remote-tracking branch 'origin/release/v2.5' into release/V2.6 2017-12-13 09:53:02 +02:00
cagache
323d11872a updated header 2017-12-12 09:46:06 +02:00
cagache
4e0030b702 automated AC for MNT-15575, regarding share live search for words from RM Saved Searches 
(cherry picked from commit a33cb6e)
 2017-12-12 09:32:07 +02:00
Tom Page
eae9ffcec6 Merge release/V2.5 into release/V2.6. 2017-12-11 15:27:28 +00:00
Ross Gale
f4e1ebb114 Merge branch 'merge-2.6/2.3.2' into 'release/V2.6' 
merging from 2.5

See merge request records-management/records-management!736
 2017-12-11 15:02:42 +00:00