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
6,007 Commits 324 Branches 2,170 Tags
dcc20cbfb49b79f15255f30ff2ba978a014dd55c
Commit Graph

6007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rodica Sutu
847c6d3d66 Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-28 11:32:05 +02:00
Rodica Sutu
d97b8c3785 update the maven.enforcer.plugin 2019-03-28 11:19:32 +02:00
Rodica Sutu
8c70dbce5b change back alfresco-maven-plugin 
comment out thejava version from the maven-enforcer-plugin
 2019-03-28 09:48:45 +02:00
Rodica Sutu
a891f75568 fix compilation error 2019-03-28 09:44:43 +02:00
cagache
aa84113c6d changed formatter used in tests because DateTimeFormatter.ISO_INSTANT outputs 9 nanoseconds and POST request to http://localhost:8080/alfresco/service/api/rma/actions/ExecutionQueue returns 500 2019-03-27 13:19:09 +02:00
cagache
8c88ef2883 Revert "call super.checkServerHealth" 
This reverts commit e00e10aa
 2019-03-26 16:19:15 +02:00
cagache
e00e10aa9d call super.checkServerHealth 2019-03-26 15:35:05 +02:00
Rodica Sutu
cbda231e9a Merge remote-tracking branch 'remotes/origin/feature/RM-6790_OpenJDK11Compatibility' into feature/RM-6722_OpenJDKCOmpatibility 2019-03-26 13:51:40 +02:00
Rodica Sutu
fe56544235 update the maven javadoc, maven war and alfresco-maven plugin to be compatible with OpenJDK 11 
add javax libraries
 2019-03-26 13:50:09 +02:00
cagache
a6f1019cc6 RM-6790 Make RM automation module compatible with OpenJDK 11 2019-03-26 10:39:57 +02:00
Ross Gale
b0f2f0e841 Merge branch 'merge/RM-6788_DeclareArchivedContent' into 'master' 
Resolve RM-6788 "Merge/ declarearchivedcontent"

Closes RM-6788

See merge request records-management/records-management!1137
 2019-03-22 13:52:17 +00:00
Ross Gale
14b135f46c Merge branch 'release/V3.0' into merge/RM-6788_DeclareArchivedContent 2019-03-18 13:11:36 +00:00
Ross Gale
6cf5344989 Merge branch 'feature-3.0.1/RM-6788_ArchiveClassifyDeclareFix' into 'release/V3.0' 
RM-6788 adding change to 3.0.1 branch

See merge request records-management/records-management!1133
 2019-03-18 13:07:58 +00:00
cagache
7f1f4b8041 Merge branch 'release/V3.0' into merge/RM-6786_FileCantBeDeclaredAsRecord 2019-03-15 15:31:41 +02:00
Rodica Sutu
bfb13c4fca Merge branch 'merge/RM-6785_JacksonLibraryUpdate' into 'master' 
RM-6785 Update Jackson Library on master

Closes RM-6785

See merge request records-management/records-management!1136
 2019-03-15 13:23:26 +00:00
cagache
73c8c23766 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/RM-6786_FileCan'tBeDeclaredAsRecord 2019-03-15 10:00:48 +02:00
Claudia Agache
ecb8127d5a Merge branch 'feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no' into 'release/V2.7' 
RM-6786 Declare file as record when file already has version declared as record

See merge request records-management/records-management!1134
 2019-03-15 07:06:55 +00:00
Roxana Lucanu
42241d7796 Merge branch 'feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into 'release/V2.7' 
RM-6786 Added check for records

See merge request records-management/records-management!1135
 2019-03-15 07:03:50 +00:00
Rodica Sutu
d1dee0a79b Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/RM-6785_JacksonLibraryUpdate 2019-03-15 09:00:51 +02:00
cagache
7056c2904e Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no 2019-03-14 16:34:48 +02:00
rlucanu
86ae0f726a RM-6786 another fix 2019-03-14 16:24:50 +02:00
cagache
5c0d05d798 Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no 2019-03-14 09:55:10 +02:00
rlucanu
2f15cc786e RM-6786 Added check for records 2019-03-14 09:46:29 +02:00
cagache
09de772516 code review comments 2019-03-14 09:19:23 +02:00
cagache
86a954f36e added cleanup method 2019-03-13 15:54:15 +02:00
Ross Gale
8d97d12f88 RM-6788 adding change to 3.0.1 branch 2019-03-13 12:04:10 +00:00
cagache
02fd1c6e5e RM-6786 Create test to check that a file that has a record version can be declared as record 2019-03-13 12:23:25 +02:00
Rodica Sutu
8b835a0c63 Merge branch 'feature-3.0/RM_UpdateJacksonLibrary' into 'release/V3.0' 
Feature 3.0/ RM-6785 update jackson library

See merge request records-management/records-management!1131
 2019-03-12 09:02:47 +00:00
Rodica Sutu
8e57522429 Update Jackson version library 2019-03-07 13:19:28 +02:00
Ross Gale
72bce9cd25 Merge branch 'feature/PR-7_wossabi' into 'master' 
Resolve PR-7 "Feature/ wossabi"

Closes PR-7

See merge request records-management/records-management!1130
 2019-03-01 14:15:06 +00:00
GitHub
64fbb369c4 Update CONTRIBUTING.md 
Adding in details of issues tab

Mirrored from community commit ba9468a98bb56e781144fc95cf03e8bdc3aa814a
 2019-02-26 09:11:29 +00:00
GitHub
66090d658d Update CONTRIBUTING.md 
removing reference to ALF project

Mirrored from community commit 2b62b5d592de5f86c118e661ac91c5fe91d117fa
 2019-02-26 09:05:55 +00:00
cagache
b8cda7e78c Record only merge of version change. 2019-02-26 09:27:49 +02:00
cagache
137f4ee007 Record only merge of version change. 2019-02-26 09:19:16 +02:00
Rodica Sutu
e8e3d4301a Merge branch 'merge/MNT_20145_RM_6758_ChangesFrom2_6' into 'master' 
Merge/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1127
 2019-02-26 07:07:22 +00:00
Rodica Sutu
183e1e8e6a Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 23:31:20 +02:00
Rodica Sutu
ba0c8a0e10 Merge branch 'merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6' into 'release/V3.0' 
Merge 3.0/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1126
 2019-02-25 21:29:18 +00:00
cagache
98a57e7840 Record only merge of version change. 2019-02-25 16:29:44 +02:00
cagache
95213cca87 Record only merge of version change. 2019-02-25 16:19:49 +02:00
cagache
335de04816 Update version to 2.6.2.1-SNAPSHOT 2019-02-25 16:07:47 +02:00
Rodica Sutu
eafe3ebf30 Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 16:03:08 +02:00
Rodica Sutu
f7851583c9 Merge branch 'merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6' into 'release/V2.7' 
Merge 2.7/mnt 20145 rm 6758 changes from2 6

See merge request records-management/records-management!1125
 2019-02-25 13:59:39 +00:00
alfresco-build
f16f36c87a [maven-release-plugin] prepare for next development iteration 2019-02-25 13:44:27 +00:00
alfresco-build
e9394d086a [maven-release-plugin] prepare release V2.6.2 2019-02-25 13:44:23 +00:00
Rodica Sutu
475164672e Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT_20145_RM_6758_ChangesFrom2_6 2019-02-25 09:19:23 +02:00
Rodica Sutu
ad39e3c4a8 Merge branch 'feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies' into 'release/V2.6' 
MNT-20145

See merge request records-management/records-management!1119
 2019-02-19 13:50:25 +00:00
Rodica Sutu
a9751fb660 Merge branch 'feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies' of https://git.alfresco.com/records-management/records-management into feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies 2019-02-19 12:15:51 +02:00
Rodica Sutu
effb972c08 Merge branch 'release/V2.6' of https://git.alfresco.com/records-management/records-management into feature-2.6/MNT-20145_DeleteRecordsClassifyFileWhenHavingCopies 2019-02-19 12:06:34 +02:00
Claudia Agache
7be2d462b5 Merge branch 'feature-2.6/DuplicateBinForNodesWithCopies' into 'release/V2.6' 
MNT-20145 Duplicate bin for nodes with copies

See merge request records-management/records-management!1123
 2019-02-19 08:12:05 +00:00
cagache
33570a80da addressed code review comments 2019-02-19 09:37:36 +02:00