inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-29 15:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,855 Commits 341 Branches 2,262 Tags
18c954f4d45830b678573e303e8aa72e759cf5c5
Commit Graph

943 Commits

Author SHA1 Message Date
Ross Gale
0f5b72599f Update RMv23SavedSearchesPatch.java 2017-11-30 09:28:53 +00:00
Ross Gale
ffe5429927 RM-5878 code review changes 2017-11-29 14:05:39 +00:00
Ross Gale
097f2d848a 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
3b8f5a4aa9 RM-5878 add fix and patch for saved search mnt (MNT-15575) 2017-11-23 11:29:23 +00:00
Tom Page
e70803c3ba RM-5013 Merge release/V2.3.1.x into release/V2.3. 2017-04-12 16:19:51 +01:00
Ana Bozianu
3d7a93e3ce 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 54d673c176)
 2017-04-12 13:02:10 +01:00
Oana Nechiforescu
071e1b3214 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
8dd2e277cf Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3 2016-11-08 15:02:01 +02:00
Oana Nechiforescu
2eca420b59 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
71917d6d17 Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Tom Page
683892ceb6 RM-4247 Merge release/V2.3 into feature-2.3/RM-4247_UpdateDispositionProperty. 2016-11-04 11:09:17 +00:00
Ana Bozianu
5200597182 RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 995448081e)
 2016-11-04 10:51:27 +00:00
roxana
23493ab550 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
8eba41396b Added null check. 2016-10-31 15:53:17 +02:00
roxana
d22c941fce Renamed method for calculating next disposition step and added null check. 2016-10-31 14:41:58 +02:00
roxana
c649c16345 Update disposition schedule action for a record when linking or unlinking it. 2016-10-31 12:18:34 +02:00
roxana
1d3bfe74a0 Run as system when getting disposition schedule for a record. 2016-10-25 15:51:39 +03:00
roxana
bab20b2dc6 I've tweaked the tests a bit to handle daylight savings. 2016-10-24 15:30:37 +03:00
roxana
1f544e2d12 Added null check 2016-10-24 11:09:32 +03:00
roxana
7529a82c09 When the last step of the current disposition is completed, no more calculation is needed. 2016-10-24 10:16:58 +03:00
roxana
780b0af6ac Checking if disposition as of date was changed manually. 2016-10-21 11:13:51 +03:00
Tom Page
d303282d1c Merge feature-2.3/RM-3386_ManuallySetDate into release/V2.3. 2016-10-20 15:20:00 +01:00
Tom Page
4cb38d2440 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
David Webster
4470f62072 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
e34e41d61d Merge remote-tracking branch 'origin/release/V2.2.0.x' into release/V2.2 2016-10-18 16:36:10 +01:00
roxana
dc62e20d31 Fixed unit test for linking. 2016-10-18 11:49:15 +03:00
roxana
121967ed7e 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
9f30a72785 RM-2526 Fix copy/paste error. 2016-10-17 16:47:43 +01:00
roxana
9ca060330f Added check for adding disposition lifecycle aspect. 2016-10-17 17:50:12 +03:00
Tom Page
a2909b4180 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
3dd736e279 Fixed tests (for disposition schedules with event based actions). 2016-10-17 11:01:22 +03:00
Tom Page
e20aa4bf23 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
ad7caa395a RM-4247 Recalculate the "disposition as of" date if the period property changes. 2016-10-14 14:28:04 +01:00
David Webster
34dfa8a648 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
David Webster
30831aa221 MNT-16852: Add comment explaining reason behind extracting mapping to properties file 2016-10-12 15:31:12 +01:00
David Webster
40135eb34e MNT-16852: Remove unnecessary imports 2016-10-12 15:25:06 +01:00
David Webster
fa2d37f37b MNT-16852: First pass at extracting permission mapping to properties file. 2016-10-12 15:08:17 +01:00
David Webster
0eaa927b38 MNT-16852: Fix issue reading properties in Outlook Integration 2016-10-12 09:22:14 +01:00
roxana
a3586737f0 Changed calculating as of date 2016-10-12 02:13:53 +03:00
David Webster
674f929acf MNT-16852: Refactor hasPermission method for readability 2016-10-11 12:57:38 +01:00
David Webster
60dd571153 MNT-16852: Give write properties permission to file records 2016-10-11 12:51:25 +01:00
roxana
e109482ffc 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
cb77ed71b5 RM-2526 Fix NPE found by integration tests. 2016-10-10 14:45:06 +01:00
Tom Page
2b3577d1c0 Merge release/V2.3 into feature-2.3/RM2526_BlendedDispositionSchedule. 2016-10-10 14:34:36 +01:00
Tom Page
9ed29822ee 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
d98ae92dd5 Addresed code review comments. 2016-10-09 20:50:28 +03:00
Tom Page
b75b546fa6 RM-3386 Fix the logger to be private static final. 2016-10-07 15:14:36 +01:00
roxana
4163851b9d Changed a bit the methods to be more readable. 2016-10-07 10:45:49 +03:00
Mihai Cozma
24ba8c0961 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
60833cb131 MNT-16852: First pass at Write Properties permission handling 2016-10-06 21:59:11 +01:00