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

1065 Commits

Author SHA1 Message Date
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
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
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
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
1cda9176a5 Updating license header to 2018 2018-01-16 12:21:10 +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
Tom Page
eae9ffcec6 Merge release/V2.5 into release/V2.6. 2017-12-11 15:27:28 +00:00
cagache
a63c74fd39 Merge remote-tracking branch 'origin/release/v2.4' into merge-2.5/RM-5882_ShareLiveSearch 2017-12-11 16:01:28 +02:00
Tom Page
86411f825f RM-5878 Move live-search.lib.js to the correct place. 2017-12-11 13:35:39 +00:00
Ross Gale
f21bed1e01 Merge branch 'release/V2.5' into merge-2.6 2017-12-11 10:49:30 +00:00
Tom Page
eadb2745c3 Merge release/V2.4 into release/V2.5. 2017-12-11 10:44:14 +00:00
Sara Aspery
eca2c62f9d MNT-18771 Publish Job Upgrade Error 2017-12-08 22:10:16 +00:00
Tom Page
0c5c9a081a Fix h2scripts version using same method as on master. 
Without this change we can no longer start RM using the maven command.
 2017-12-08 16:30:05 +00:00
Ross Gale
89e9032a14 RM-5883 adding updated schema number to ensure patch runs in later upgrades, including break command to ensure patch will only run once 2017-12-08 14:49:47 +00:00
Ross Gale
caa99535a1 Merge branch 'release/V2.4' into merge2.5 2017-12-06 11:29:10 +00:00
Ross Gale
f70ad4df3e RM-5878 mnt changes added to a 2.4 branch 2017-12-05 16:21:07 +00:00
Ana Bozianu
d8da2251e6 Merge remote-tracking branch 'origin/merge-2.5/MNT-18793_to_2.5.x' into merge-2.6/MNT-18793 2017-11-27 15:15:03 +02:00
Ana Bozianu
895e863f11 Merge MNT-18793 from release/V2.5.0.x into release/V2.5 2017-11-27 15:09:13 +02:00
alfresco-build
e0c66b4265 [maven-release-plugin] prepare for next development iteration 2017-11-27 10:37:48 +00:00
alfresco-build
905ea903e4 [maven-release-plugin] prepare release V2.5.0.5 2017-11-27 10:37:45 +00:00
Ana Bozianu
0f62fbe006 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-24 14:27:03 +00:00
Rodica Sutu
1f6e2c1c6f Merge remote-tracking branch 'remotes/origin/hotfix-2.5/MNT-18793_EligibleActionsNotExecuted' into merge-2.5/MNT-18793_to_2.5.x 2017-11-24 09:51:59 +02:00
Ana Bozianu
0fbe36eaa3 MNT-18793 - added paginated navigation in the disposition action executer 2017-11-23 22:21:51 +02:00
Tom Page
c97ab15d10 RM-5875 Manage the version of guava from the root pom. 
We'll need to use the regression tests to check that upgrading guava like this
doesn't break anything in the application, but it fixes the unit tests.
 2017-11-22 09:10:44 +00:00
Sara Aspery
31b7c57afb RM-5875 review changes 2017-11-20 07:39:37 +00:00
Sara Aspery
52bcb28446 RM-5875 add license header 2017-11-17 16:40:07 +00:00
Sara Aspery
d1b66723fc Merge branch 'release/V2.6' into feature-2.6/RM-5875_YamlFileUnitTest_no 2017-11-16 16:35:08 +00:00
alfresco-build
87e9859853 [maven-release-plugin] prepare for next development iteration 2017-11-16 15:39:00 +00:00
alfresco-build
3f91364d4d [maven-release-plugin] prepare release V2.6.0 2017-11-16 15:38:57 +00:00
Sara Aspery
5e3692ff60 RM-5875 add Swagger version to exception message 2017-11-16 09:51:13 +00:00
Sara Aspery
2ffb75aa06 RM-5875 fix path and add yaml name to exception 2017-11-15 16:36:13 +00:00
Sara Aspery
c2b068b4d0 Yaml unit test - split community and enterprise tests 2017-11-14 09:24:48 +00:00
Tom Page
617ef979c3 Merge branch 'xperimental/RM-5806_TechnicalDocOverview' into 'master' 
RM-5806 Document overview of design patterns in RM.

See merge request !673
 2017-11-13 15:54:10 +00:00
Tom Page
297974accd RM-5806 Rename documentation index to README.md. 2017-11-13 15:45:06 +00:00
Sara Aspery
87c2929c88 Yaml unit test 2017-11-13 15:01:13 +00:00
Roxana Lucanu-Ghetu
bdfc843820 RM-5839 Fixed permission denied error and added integration test for the fix. 2017-11-13 10:57:12 +02:00
Sara Aspery
5d38eb3da7 Yaml unit test 2017-11-09 11:14:32 +00:00
Tom Page
34c6d0a07e RM-5806 Fix title of page. 2017-11-09 10:51:13 +00:00
Tom Page
b95766e736 RM-5806 Add links to the technical documentation. 2017-11-09 10:45:43 +00:00