Commit Graph

3050 Commits

Author SHA1 Message Date
Tom Page
6c65ba572e RM-4127 Backport UI tests to V2.3. 2016-10-19 13:29:05 +01:00
Tom Page
4cb38d2440 Merge release/V2.3 into RM-3386_ManauallySetDate. 2016-10-19 08:31:13 +01:00
Mihai Cozma
0cf49bfce9 Fix version with more digits. modified: pom.xml 2016-10-19 08:58:32 +03:00
Silviu Dinuta
6eb062d4a3 Merge feature/RM-4012_Category_REST_API into
feature/RM-4199_RM_REST_API_IMPL
2016-10-18 21:53:12 +03:00
Silviu Dinuta
a76a13db46 Merge remote-tracking branch feature/RM-4007_SupportAlliasesOnPut into
feature/RM-4012_Category_REST_API
2016-10-18 21:49:21 +03: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
Ana Bozianu
e686da88de fixed audit unit tests 2016-10-18 18:28:29 +03:00
David Webster
fbb55126d7 Set up 2.2.0.x HF branch ready for next release 2016-10-18 16:23:46 +01:00
Mihai Cozma
6c65fa5c7e Merge commit '2745b7' into release/V2.4 2016-10-18 17:39:09 +03:00
Silviu Dinuta
9f3f82e290 RM-4007: Support alliases on update 2016-10-18 15:42:12 +03:00
Tom Page
a0e5ed3693 RM-2526 Fix license headers. 2016-10-18 11:29:10 +01:00
Tom Page
9ce117f814 Merge RM-2526 Blended disposition schedule into release/V2.4. 2016-10-18 10:54:43 +01:00
Tom Page
8309e75b12 Merge feature-2.3/RM2526_BlendedDispositionSchedule into release/V2.3. 2016-10-18 10:36:47 +01:00
Silviu Dinuta
ee07a75d67 RM-4199: create rm site rest api impl 2016-10-18 12:21:42 +03: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
David Webster
2df396a7e1 MNT-16852: HF 2.2.0.2 release, remove snapshot version number 2016-10-17 22:01:17 +01: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
Mihai Cozma
78a8885954 Merge branch 'feature-2.3/RM-4250_fileplan_creation_freeze' into release/V2.3 2016-10-17 16:02:21 +03:00
Mihai Cozma
75a8477d0e Fix resource filtering 2016-10-17 13:45:25 +03:00
David Webster
e769910674 Merge remote-tracking branch 'origin/feature/PR-1_davidcognite' 2016-10-17 11:13:11 +01:00
roxana
3dd736e279 Fixed tests (for disposition schedules with event based actions). 2016-10-17 11:01:22 +03:00
Ana Bozianu
995448081e RM-4249 - workaround : replaced maxEntries with a positive value 2016-10-14 18:41:00 +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
Mihai Cozma
b6b903c88b Merge branch 'feature-2.3/RM-4245_update_module_version' into release/V2.3 2016-10-14 11:38:51 +03:00
Mihai Cozma
df373db229 add symetrical build-helper-maven-plugin for both rm-share and rm-server 2016-10-14 11:18:28 +03:00
Mihai Cozma
a757cec753 Fixed to handle more digits 2016-10-13 17:08:59 +03:00
Silviu Dinuta
6c8ba994aa RM-4007 fixed some formatting 2016-10-13 16:02:00 +03:00
Silviu Dinuta
c259d6f34a Merge remote-tracking branch 'origin/feature/RM-4007_PosibillityToUploadContent' into feature/RM-4012_Category_REST_API 2016-10-13 15:57:38 +03:00
Mihai Cozma
cc2046f31a RM-4245_update_module_version 2016-10-13 15:37:54 +03:00
Ana Bozianu
3f75ea5d1d fixed "get pending reviews" solr query 2016-10-13 15:29:12 +03:00
David Webster
c9fdd7f050 MNT-16852: Fix typo in XML 2016-10-13 11:36:47 +01:00
David Webster
34dfa8a648 MNT-16852: Optimise list conversion as per code review comment 2016-10-13 11:06:11 +01:00
Silviu Dinuta
99bb68c0dc RM-4007: implemented method for uploading content 2016-10-13 10:50:16 +03: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
Tuna Aksoy
4ba9e64824 Merge branch 'master' into feature/RM-4012_Category_REST_API 2016-10-12 08:45:08 +01:00
roxana
a3586737f0 Changed calculating as of date 2016-10-12 02:13:53 +03:00
Tuna Aksoy
d95c83df5a Merge branch 'release/V2.5' into merge/MergeV25ToMaster_111016 2016-10-11 20:21:21 +01:00
Tuna Aksoy
0597d60f94 Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25_111016
Conflicts:
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionService.java
	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
2016-10-11 17:00:35 +01: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
cetra3
7eeb32f30b Check to see whether repository models are initliased
Mirrored from community commit c81600dbfe2006e6ae6531c52704f12d497e4398
2016-10-11 01:37:22 +01:00
Ana Bozianu
8a839a279f RM-4012 - added specific types, deleted duplicated code and use a core node 2016-10-10 23:44:49 +03:00