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
1,844 Commits 324 Branches 2,170 Tags
f76a52d4b96e7b10cd79c2c451e534c5c5e2123c
Commit Graph

947 Commits

Author SHA1 Message Date
Ross Gale
f76a52d4b9 Update RMv23SavedSearchesPatch.java 2017-11-30 09:28:53 +00:00
Ross Gale
8ce3dd6126 RM-5878 code review changes 2017-11-29 14:05:39 +00:00
Ross Gale
379b3a2257 RM-5878 adding config so patch will run on start up, fixing issue caused by missing maven dependancy for jcommander 1.66 2017-11-28 10:05:36 +00:00
Ross Gale
885ef4faaa RM-5878 add fix and patch for saved search mnt (MNT-15575) 2017-11-23 11:29:23 +00:00
Tom Page
619b0a1ea6 RM-5013 Merge release/V2.3.1.x into release/V2.3. 2017-04-12 16:19:51 +01:00
Ana Bozianu
1822c418f7 RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" 
Hotfix 2.5/mnt 17007 solr query

2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue
MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed
RM-4249 - RM Audit doesn't work with alfresco 5.2

See merge request !602

Nb. This does not copy across the updates to the automation tests.

(cherry picked from commit f19ece3538)
 2017-04-12 13:02:10 +01:00
Oana Nechiforescu
0caedb4589 Merge commit 'c03c6da96' into merge-2.3/Merge231ReleaseIn23 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-server/pom.xml
#	rm-share/pom.xml
 2016-11-11 14:40:57 +02:00
roxana
0282e1af68 Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3 2016-11-08 15:02:01 +02:00
Oana Nechiforescu
884947b0e6 Merge branch 'feature-2.3/RM-4313_UpdateDispositionNextActionDateWhenCurrentDateIsInThePast' into 'release/V2.3.1.x' 
Feature 2.3/rm 4313 update disposition next action date when current date is in the past

Update record disposition action as of date if it changed.

See merge request !598
 2016-11-07 21:12:53 +00:00
roxana
373439822c Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Tom Page
43b8f3eba1 RM-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty. 2016-11-04 11:09:17 +00:00
Ana Bozianu
59c6fcca39 RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 4b76fb838f)
 2016-11-04 10:51:27 +00:00
roxana
cb11d527d4 Update record disposition action as of date if it changed, to have the same value as next disposition action as of date. 2016-11-04 10:19:24 +02:00
roxana
07d010b164 Added null check. 2016-10-31 15:53:17 +02:00
roxana
0a79d24def Renamed method for calculating next disposition step and added null check. 2016-10-31 14:41:58 +02:00
roxana
adc144e971 Update disposition schedule action for a record when linking or unlinking it. 2016-10-31 12:18:34 +02:00
roxana
20d2bfb7d6 Run as system when getting disposition schedule for a record. 2016-10-25 15:51:39 +03:00
roxana
cb3357080d I've tweaked the tests a bit to handle daylight savings. 2016-10-24 15:30:37 +03:00
roxana
4abeb19938 Added null check 2016-10-24 11:09:32 +03:00
roxana
9e7ae77cd5 When the last step of the current disposition is completed, no more calculation is needed. 2016-10-24 10:16:58 +03:00
roxana
7d82844048 Checking if disposition as of date was changed manually. 2016-10-21 11:13:51 +03:00
Tom Page
699e29bb28 Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3. 2016-10-20 15:20:00 +01:00
Tom Page
48a65f5067 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
David Webster
5077b83ddc Merge branch 'release/V2.2' into merge-2.3/HF-2.2.0.2-merge 2016-10-18 16:40:14 +01:00
David Webster
063479a0c0 Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2016-10-18 16:36:10 +01:00
roxana
d82c27e6a4 Fixed unit test for linking. 2016-10-18 11:49:15 +03:00
roxana
1dea4c9d2d Modified validation for link conditions to compare the original disposition of the record with the target one. 2016-10-18 10:57:08 +03:00
Tom Page
891ea35956 RM-2526 Fix copy/paste error. 2016-10-17 16:47:43 +01:00
roxana
c827e843ed Added check for adding disposition lifecycle aspect. 2016-10-17 17:50:12 +03:00
Tom Page
531f10c458 RM-2526 Treat null as the largest date possible. 
If a disposition step has an "as of" date of null then it requires human
interaction. Consequently there is no length of time we can wait before the
step triggers - so we treat it as the latest step if there are multiple
disposition schedules.
 2016-10-17 15:27:43 +01:00
roxana
3ea86fa148 Fixed tests (for disposition schedules with event based actions). 2016-10-17 11:01:22 +03:00
Tom Page
c8577fe90c RM-3386 Persist the fact that an "as of" date has been manually set. 
If a "disposition as of" date is manually set using "Edit Retention Date"
then don't update it when changing the disposition schedule steps. Use a
new property to store the fact that the "disposition as of" date has been
manually set.
 2016-10-14 16:15:16 +01:00
Tom Page
8d9a47e3ac RM-4247 Recalculate the "disposition as of" date if the period property changes. 2016-10-14 14:28:04 +01:00
David Webster
14b3e8e212 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
David Webster
eca62dfc83 MNT-16852: Add comment explaining reason behind extracting mapping to properties file 2016-10-12 15:31:12 +01:00
David Webster
60c2cb693b MNT-16852: Remove unnecessary imports 2016-10-12 15:25:06 +01:00
David Webster
9ed162ae2f MNT-16852: First pass at extracting permission mapping to properties file. 2016-10-12 15:08:17 +01:00
David Webster
f9dd2df5a1 MNT-16852: Fix issue reading properties in Outlook Integration 2016-10-12 09:22:14 +01:00
roxana
fa042c81ae Changed calculating as of date 2016-10-12 02:13:53 +03:00
David Webster
5cfcd584a5 MNT-16852: Refactor hasPermission method for readability 2016-10-11 12:57:38 +01:00
David Webster
66c9ffe848 MNT-16852: Give write properties permission to file records 2016-10-11 12:51:25 +01:00
roxana
d9bb9b2e00 I've changed the method that calculates the as of date to take in consideration the record creation date instead of the action creation date. 2016-10-11 12:28:07 +03:00
Tom Page
f55111fe6c RM-2526 Fix NPE found by integration tests. 2016-10-10 14:45:06 +01:00
Tom Page
b80bff48aa Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule. 2016-10-10 14:34:36 +01:00
Tom Page
4d58308d9a Merge feature-2.3/RM-3386_DispositionCreatedDate into release/V2.3. 
RM-3386 Ensure that we always use the same method when calculating the "disposition as of" date for the next disposition step.
 2016-10-10 14:20:57 +01:00
roxana
f0370a443b Addresed code review comments. 2016-10-09 20:50:28 +03:00
Tom Page
9a9600c782 RM-3386 Fix the logger to be private static final. 2016-10-07 15:14:36 +01:00
roxana
6b916b977f Changed a bit the methods to be more readable. 2016-10-07 10:45:49 +03:00
Mihai Cozma
fc1e4a5710 Merge branch 'feature-2.3/RM-2368_Initial_version_record_does_not_inherit_document' into release/V2.3 2016-10-07 09:36:59 +03:00
David Webster
1605c715db MNT-16852: First pass at Write Properties permission handling 2016-10-06 21:59:11 +01:00