Commit Graph

940 Commits

Author SHA1 Message Date
Rodica Sutu
086faa7a19 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
88a17d7007 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
ea6ad35b65 update the ElementInfo() according to REPO-2983 2018-08-20 12:21:44 +03:00
Rodica Sutu
d04ea4b657 remove custom record search converter 2018-08-16 19:11:57 +03:00
Sara Aspery
56c1038774 RM-6355 Fix null pointer
(cherry picked from commit d22fc1f6ad7d0761e47931056328570e17a46f54)
2018-07-27 17:13:45 +03:00
Rodica Sutu
0bbdb08ccd compare the new version of module currently being installed with the one installed
(cherry picked from commit 4211d4bd8a)
2018-07-26 13:00:10 +03:00
Rodica Sutu
4211d4bd8a compare the new version of module currently being installed with the one installed 2018-07-26 11:13:26 +03:00
Tom Page
43ffc8aaee Merge master into RM-5859_AnyMarksStaging. 2018-06-29 11:30:14 +01:00
Rodica Sutu
8061d5a354 fix the date-time string not changed to a simple date 2018-06-20 17:52:28 +03:00
Rodica Sutu
95f6f7174e revert the change for truncating the date with time 2018-06-19 08:44:10 +03:00
Rodica Sutu
c87aff832a review changes and fix for converting string with time to date using a LocalDateDeserializer 2018-06-18 10:58:48 +03:00
Rodica Sutu
365badd32e java docs updates and fix the deserialisation for the LocalDate from topics 2018-06-15 14:30:33 +03:00
Rodica Sutu
6320a0fe8c -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
b9e816c9ee 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
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
1eb00a2be1 Merging up from 2.5.4 2018-06-06 10:06:07 +01: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
Elena Hardon
8b917dd693 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
0acddd3802 MNT-19442 adding total number to result set in other cases in RMAfterInvocationProvider 2018-06-04 14:48:39 +01:00
Rodica Sutu
f9a4b5c9db fix the regressions spotted by community rest api after Jackson upgrade 2018-06-01 17:55:13 +03:00
Roxana Lucanu-Ghetu
d87861b199 RM-6337 Code review changes 2018-05-31 16:11:34 +03:00
Roxana Lucanu-Ghetu
5b74521999 RM-6337 Code review changes 2018-05-31 16:11:21 +03:00
Roxana Lucanu-Ghetu
66bbd743cf RM-6337 Fix failing tests 2018-05-31 16:10:58 +03:00
Roxana Lucanu-Ghetu
be7f4b919c RM-6337 Fix visibility conditions for accession step. 2018-05-31 16:10:43 +03:00
Rodica Sutu
a69970b144 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-31 10:49:11 +03:00
Roxana Lucanu-Ghetu
1ece45f834 RM-6337 Code review changes 2018-05-30 09:38:25 +03:00
Roxana Lucanu-Ghetu
758ae020bd RM-6337 Code review changes 2018-05-29 15:21:59 +03:00
Rodica Sutu
1ed99b5cf4 Merge remote-tracking branch 'remotes/origin/master' into xperimental/RM-6313UpgradeRMSchedulers_remote 2018-05-29 11:56:21 +03:00
Roxana Lucanu-Ghetu
125614fe18 RM-6337 Fix failing tests 2018-05-28 23:53:59 +03:00
Roxana Lucanu-Ghetu
4f3aef35bf RM-6337 Fix visibility conditions for accession step. 2018-05-28 22:48:57 +03:00
Rodica Sutu
8749a21ea8 use the core implementation for creating the path element 2018-05-25 16:30:21 +03:00
Sara Aspery
e2b1761747 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
6ce336d32e RM-6320 Code review changes. 2018-05-16 15:35:43 +03:00
Roxana Lucanu-Ghetu
57201319d1 RM-6320 Added Declassification Review properties in records search 2018-05-16 11:03:32 +03:00
Ross Gale
2575dc64ad RM-6318 code review changes 2018-05-15 10:12:03 +01:00
Rodica Sutu
fe444ad77c replace spring social exception with InvalidArgumentException
update the ElementInfo() according to REPO-2983
2018-05-14 09:27:43 +03:00
Ross Gale
75574d140e RM-6302 code review comments addressed 2018-05-09 15:52:01 +01:00
Ross Gale
d73edcb00e Merge branch 'master' into feature/RM-6302_EditDispositionSchedule 2018-05-09 14:33:33 +01:00
Ross Gale
e9d42bfeef search fields added 2018-05-09 14:29:12 +01:00
Ross Gale
e11bef00bb Search changes, adding support for search by reason key and 'other source' names 2018-05-04 15:46:30 +01:00
Rodica Sutu
e48374395a Merge remote-tracking branch 'remotes/origin/feature/RM-6302_EditDispositionSchedule' 2018-05-04 14:57:14 +03:00
Ross Gale
cab68e87de RM-6302 adding the java work to edit disposition schedule 2018-05-02 21:52:08 +01:00
Ross Gale
4c878d2095 JITC prevent accession disposition action being offered if there is an incomplete event 2018-05-01 17:51:13 +01:00
Roxana Lucanu-Ghetu
49291704f4 RM-5234 Minor refactor. 2018-04-30 21:00:40 +03:00
Ross Gale
cd43975345 WIP edit disposition capability 2018-04-30 11:52:47 +01:00
Roxana Lucanu-Ghetu
527a79acf2 RM-5234 Fix Login filter 2018-04-30 10:08:19 +03:00
Tom Page
15dee7f2bf RM-5236 Refactor common code when getting node name. 2018-04-26 15:49:07 +01:00
Tom Page
e83824993f RM-5236 Audit event for removing group members.
Also tidy up title of audit events so that the user group display
label is used if it exists.
2018-04-25 12:22:23 +01:00
Tom Page
e53c6de2fc RM-5236 Audit event for adding member to user group. 2018-04-25 10:54:01 +01:00