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
5,405 Commits 324 Branches 2,170 Tags
eeb23b51e1b8ca61e9b9ffdee381934ef094c31f
Commit Graph

800 Commits

Author SHA1 Message Date
cagache
047bec40ad Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/Merge_MNT-19967_From2.6 2018-10-03 10:10:12 +03:00
cagache
6e54380abf Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/Merge_MNT-19967_From2.6 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/service/DispositionScheduleService.java
 2018-10-02 14:51:13 +03:00
cagache
47d3f91abc MNT-19967 Get record disposition schedule from first parent category which has one 2018-09-27 12:40:04 +03:00
Rodica Sutu
7fbeccadbe Merge branch 'release/V2.7' of https://git.alfresco.com/records-management/records-management into release/V2.7 2018-09-10 12:50:01 +03:00
cagache
72918feef6 Merge changes from 2.6.1 release to 3.0 2018-08-31 17:27:59 +03:00
Rodica Sutu
df19e3749e Merge origin/release/V2.6' into merge-2-7/MNT-19080_RM-6504_MergeFrom2.6 
* remotes/origin/release/V2.6:
  fixed tests because exception changed
  use fileFolderService instead of contentService
  MNT-18806 create a new content URL for the copy only if it has content
  MNT-18806 create a new content bin for the copy on copy complete behavior
  MNT-18806 Add REST test for deleting copy of record.
  MNT-18806 Remove some raw Exceptions from REST test framework.
 2018-08-27 20:01:26 +03:00
cagache
ea40d03c80 use fileFolderService instead of contentService 2018-08-24 17:26:25 +03:00
cagache
d764fef7a5 MNT-18806 create a new content URL for the copy only if it has content 2018-08-24 16:25:20 +03:00
cagache
6691a4966c Merge remote-tracking branch 'remotes/origin/release/V2.6' into feature-2.6/MNT-18806_DeleteCopy_fp 2018-08-24 13:33:59 +03:00
cagache
770ee1047b MNT-18806 create a new content bin for the copy on copy complete behavior 2018-08-24 13:25:45 +03:00
Rodica Sutu
caa79346e6 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2-7/MNT-19080 2018-08-23 14:48:06 +03:00
Claudia Agache
3eb7f62f27 Merge branch 'feature-2.6/RM-6504_ChangeACSVersion' into 'release/V2.6' 
RM-6504 Changed ACS version

See merge request records-management/records-management!1098
 2018-08-21 14:17:20 +01:00
Rodica Sutu
df280e176d update the ElementInfo() according to REPO-2983 2018-08-20 12:21:44 +03:00
Rodica Sutu
b7f2afb0de remove custom record search converter 2018-08-16 19:11:57 +03:00
Sara Aspery
8fba7aa3f9 RM-6355 Fix null pointer 
(cherry picked from commit d22fc1f6ad7d0761e47931056328570e17a46f54)
 2018-07-27 17:13:45 +03:00
Rodica Sutu
55a3fb2acd compare the new version of module currently being installed with the one installed 
(cherry picked from commit b6562142d1)
 2018-07-26 13:00:10 +03:00
Rodica Sutu
b6562142d1 compare the new version of module currently being installed with the one installed 2018-07-26 11:13:26 +03:00
Tom Page
e3c06a6a4e Merge master into RM-5859_AnyMarksStaging. 2018-06-29 11:30:14 +01:00
Rodica Sutu
7e81bd4f6e fix the date-time string not changed to a simple date 2018-06-20 17:52:28 +03:00
Rodica Sutu
3411800240 revert the change for truncating the date with time 2018-06-19 08:44:10 +03:00
Rodica Sutu
895fca9455 review changes and fix for converting string with time to date using a LocalDateDeserializer 2018-06-18 10:58:48 +03:00
Rodica Sutu
9b16443987 java docs updates and fix the deserialisation for the LocalDate from topics 2018-06-15 14:30:33 +03:00
Rodica Sutu
5266d1f7ce -fix de/serialization of joda type by: 
using of jackson joda date type to deserialize local date
using a custom serializer for joda date types
 2018-06-15 13:09:53 +03:00
cagache
bb558e3ac4 Merge remote-tracking branch 'remotes/origin/release/V2.6' into merge-2.7/MNT-18558_PermissionIssue 2018-06-12 16:03:42 +03:00
cagache
155d118672 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
6f671e7aeb Merging up from 2.5.4 2018-06-06 10:06:07 +01:00
Ross Gale
993b4f5846 MNT-19442 merging up fix for 2.5.4 2018-06-06 09:31:42 +01:00
Roxana Lucanu-Ghetu
ef1f8311be MNT-18558 Fix permission issue 2018-06-05 17:22:47 +03:00
Elena Hardon
864789861d Merge branch 'feature/RM-6382_FixCommunityRestAPI_Regressions' into 'master' 
RM-6382 Fix regressions caused by Jackson upgrade

See merge request records-management/records-management!1025
 2018-06-05 08:47:19 +01:00
Ross Gale
783bccb925 MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider 2018-06-04 14:48:39 +01:00
Rodica Sutu
49510b15a3 fix the regressions spotted by community rest api after Jackson upgrade 2018-06-01 17:55:13 +03:00
Roxana Lucanu-Ghetu
7f5ba7a7f2 RM-6337 Code review changes 2018-05-31 16:11:34 +03:00
Roxana Lucanu-Ghetu
4659a93e71 RM-6337 Code review changes 2018-05-31 16:11:21 +03:00
Roxana Lucanu-Ghetu
6961f0aa18 RM-6337 Fix failing tests 2018-05-31 16:10:58 +03:00
Roxana Lucanu-Ghetu
1f6853b2ad RM-6337 Fix visibility conditions for accession step. 2018-05-31 16:10:43 +03:00
Rodica Sutu
d937c5e093 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-31 10:49:11 +03:00
Roxana Lucanu-Ghetu
9cd2357ddc RM-6337 Code review changes 2018-05-30 09:38:25 +03:00
Roxana Lucanu-Ghetu
0c1c347d28 RM-6337 Code review changes 2018-05-29 15:21:59 +03:00
Rodica Sutu
9500e00f09 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-29 11:56:21 +03:00
Roxana Lucanu-Ghetu
e09d5adcc1 RM-6337 Fix failing tests 2018-05-28 23:53:59 +03:00
Roxana Lucanu-Ghetu
1cae8ed778 RM-6337 Fix visibility conditions for accession step. 2018-05-28 22:48:57 +03:00
Rodica Sutu
c0e697a7b2 use the core implementation for creating the path element 2018-05-25 16:30:21 +03:00
Sara Aspery
d4721683f6 Merge branch 'feature/RM-6318_SearchUpdatesForCert' into 'release/V2.7.0.x' 
RM-6318 SearchDerivedByJavaAPI

See merge request records-management/records-management!996
 2018-05-22 13:26:30 +01:00
Roxana Lucanu-Ghetu
8251588fd1 RM-6320 Code review changes. 2018-05-16 15:35:43 +03:00
Roxana Lucanu-Ghetu
5dd2640674 RM-6320 Added Declassification Review properties in records search 2018-05-16 11:03:32 +03:00
Ross Gale
c68ce588bb RM-6318 code review changes 2018-05-15 10:12:03 +01:00
Rodica Sutu
98441a1a3c replace spring social exception with InvalidArgumentException 
update the ElementInfo() according to REPO-2983
 2018-05-14 09:27:43 +03:00
Ross Gale
2345e871e1 RM-6302 code review comments addressed 2018-05-09 15:52:01 +01:00
Ross Gale
081dcddbea Merge branch 'master' into feature/RM-6302_EditDispositionSchedule 2018-05-09 14:33:33 +01:00
Ross Gale
888157199d search fields added 2018-05-09 14:29:12 +01:00