inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,269 Commits 330 Branches 2,178 Tags
06de12a10cdee972aef9f7ad4ea5cd5e10c752cc
Commit Graph

6269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claudia Agache
b9aaf86aed Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7149_Fix_SCM_no 2020-04-15 12:55:54 +03:00
ehardon
840082bea8 RM-6645: Added javadoc for unit test 2020-04-15 10:16:42 +03:00
Claudia Agache
6d647a6d99 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7149_Fix_SCM_no 2020-04-15 09:38:06 +03:00
Claudia Agache
a39e61d0bf Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-7149_Fix_SCM_no 2020-04-14 20:18:50 +03:00
ehardon
116f076194 Merge remote-tracking branch 'origin/master' into feature/RM-6645_ArchiveAndRestoreActionsInexistentInRMSite 2020-04-14 17:49:16 +03:00
Claudia Agache
5309b2089a Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7149_Fix_SCM_no 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-automation/rm-automation-community-rest-api/pom.xml
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
#	rm-automation/rm-automation-ui/pom.xml
#	rm-benchmark/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-rest-api-explorer/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-rest-api-explorer/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
 2020-04-14 17:48:56 +03:00
Claudia Agache
cf90b012de Record only merge of version change. 2020-04-14 17:35:36 +03:00
Claudia Agache
f193ffa3f5 Update version to 2.6.3.1-SNAPSHOT 2020-04-14 17:33:47 +03:00
ehardon
e94591d3b6 RM-6645: Added unit test for getRmActionDefinitions webscript when whitelisted actions are present 2020-04-14 17:22:33 +03:00
alfresco-build
b4fa0bcfab [maven-release-plugin] prepare for next development iteration 2020-04-14 15:13:47 +01:00
alfresco-build
2390e1097e [maven-release-plugin] prepare release V2.6.3 2020-04-14 15:13:36 +01:00
Claudia Agache
84ef359543 Record only merge 2020-04-14 17:12:00 +03:00
Claudia Agache
f03a993774 Record only merge 2020-04-14 17:10:06 +03:00
Claudia Agache
7541e46ac4 Change SCM URLs in order to switch to SSH authentication with 2FA for Github 2020-04-14 16:53:41 +03:00
Claudia Agache
166d6a7afa Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7154UnitTests_no 2020-04-14 13:22:15 +03:00
Claudia Agache
4a8c5c337d Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7154UnitTests_no 2020-04-14 11:36:46 +03:00
Claudia Agache
3e2998784e Merge remote-tracking branch 'origin/release/V3.0' into release/V3.0 2020-04-14 11:17:31 +03:00
Claudia Agache
26a96c9645 Mock search language to afts 
(cherry picked from commit b8acf45b53)
 2020-04-14 09:22:00 +03:00
Claudia Agache
da063ffa3c Revert "Deleting tests because there's no version of ACS community that supports this yet" 
This reverts commit c7a55840

(cherry picked from commit 3e5d9d6ba3)
 2020-04-14 09:21:57 +03:00
Claudia Agache
a06c3fec1b Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge/RM-7148_RM-7145 2020-04-13 16:26:26 +03:00
Claudia Agache
b8acf45b53 Mock search language to afts 2020-04-13 15:31:23 +03:00
Claudia Agache
3e5d9d6ba3 Revert "Deleting tests because there's no version of ACS community that supports this yet" 
This reverts commit c7a55840
 2020-04-12 19:13:09 +03:00
Claudia Agache
0642d52afc Revert "Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests, disabled test for now" 
This reverts commit 2c334298
 2020-04-12 19:12:32 +03:00
Claudia Agache
daa8e97684 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/RM-7148_RM-7145 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/CmisQueryTests.java
 2020-04-12 19:10:31 +03:00
Claudia Agache
12b4d949ed small fix 2020-04-10 19:49:17 +03:00
Claudia Agache
e12612eee0 small fix 2020-04-10 19:25:06 +03:00
Claudia Agache
1b5ff187db Merge remote-tracking branch 'remotes/origin/release/V3.1' into merge-3.2/RM-7148_RM-7145 2020-04-10 19:21:02 +03:00
Claudia Agache
cda030cd80 wait for solr indexing 2020-04-10 14:53:45 +03:00
Claudia Agache
08b833b677 assignUserPermissionsOnCategoryAndRMRole method has been moved to RoleService 2020-04-10 08:58:22 +03:00
Roxana Lucanu
12d014d8d5 Merge branch 'release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-10 08:26:14 +03:00
rlucanu
f1af7e12d1 Merge pull request #1123 from Alfresco/merge-3.0/MNT-20822_CMIS_tests 
Merge 3.0/mnt 20822 cmis tests
 2020-04-10 08:11:47 +03:00
Roxana Lucanu
2c334298b0 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests, disabled test for now 2020-04-09 19:01:44 +03:00
Roxana Lucanu
dad0d17fb1 Merge branch 'release/V2.7' into merge-3.0/MNT-20822_CMIS_tests 2020-04-09 16:40:08 +03:00
rlucanu
074f799274 Merge pull request #1122 from Alfresco/merge-2.7/MNT-20822_CMIS_tests 
Merge 2.7/mnt 20822 cmis tests
 2020-04-09 12:20:31 +03:00
ehardon
8705f27222 RM-6645: Created WhitelistedDMActions for RM site 
- added whitelisted actions into the rm rule actions
 2020-04-09 12:16:33 +03:00
Claudia Agache
bf77bf7997 fix the parameter 2020-04-08 19:07:33 +03:00
Claudia Agache
e1b2a626cb Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-20822_CMIS_tests 2020-04-08 18:52:37 +03:00
Claudia Agache
a2a60a50ac Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/RM-7148_And_RM-7145 2020-04-08 18:50:29 +03:00
Claudia Agache
c7a558405a Deleting tests because there's no version of ACS community that supports this yet 2020-04-08 15:26:29 +03:00
Claudia Agache
8008ace24e Merge branch 'release/V2.7' into merge-3.0/RM-7148_And_RM-7145 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/CmisQueryTests.java
#	rm-enterprise/pom.xml
 2020-04-08 15:14:00 +03:00
rlucanu
55d037edd1 Merge pull request #1120 from Alfresco/feature-2.6/MNT-20822_CMIS_tests 
Feature 2.6/mnt 20822 cmis tests
 2020-04-08 14:43:37 +03:00
Roxana Lucanu
07c6e56704 RM-7145 Code review changes 2020-04-08 14:32:22 +03:00
Tom Page
dc229e34d2 Merge pull request #1118 from Alfresco/feature/ThreadSafeInstanceOfCache 
Fix cache in NodeTypeUtility to be thread safe.
 2020-04-08 12:03:10 +01:00
Roxana Lucanu
5bc81482a4 RM-7145 Addressed code review comments 2020-04-08 13:43:51 +03:00
Roxana Lucanu
eb2e085dd6 RM-7145 Addressed code review comments 2020-04-07 18:27:58 +03:00
ehardon
9ef1db7005 RM-6645: Added DelegateAction beans for archive and restore glacier actions 
- added actions in the rules page
- added actions definitions and title
 2020-04-07 17:53:29 +03:00
Roxana Lucanu
235a2bc248 RM-7145 Added test for AFTS query 2020-04-06 17:10:56 +03:00
Roxana Lucanu
6daf69afde Merge branch 'release/V2.6' into feature-2.6/MNT-20822_CMIS_tests 2020-04-06 14:13:30 +03:00
Claudia Agache
4c4b41bfb8 fix the parameter 2020-04-03 16:26:03 +03:00
Claudia Agache
d222954e15 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/RM-7148_UpdateACSVersion 
# Conflicts:
#	rm-enterprise/pom.xml
 2020-04-03 16:21:40 +03:00