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
2,521 Commits 324 Branches 2,170 Tags
d8ac78ee451bef1055df04dca20a6f801d5581fd
Commit Graph

107 Commits

Author SHA1 Message Date
Tom Page
d8ac78ee45 Merge merge-2.4/MNT-16852_HF_2.2.0.2_Merge into release/V2.4. 2016-10-28 09:31:09 +01:00
David Webster
ba2fab69b0 MNT-16852: Add unit tests for postProcessor permissions configuration 2016-10-27 11:31:03 +01:00
Tom Page
47e87e5ecb Fix very minor issue with Javadoc strings. 2016-10-25 16:09:48 +01:00
David Webster
859afafee9 Merge 7289572a5dc380bab5dc53e09b802ad413869a58 from V2.3 to V2.4 w/ refactor for permissions post processor 2016-10-24 17:32:37 +01:00
roxana
8f8b0268f2 I've tweaked the tests a bit to handle daylight savings. 
(cherry picked from commit 4aa3909035df63537ea17b101117394250225960)
 2016-10-24 14:40:08 +01:00
roxana
ad995fe263 Added null check 
(cherry picked from commit 72dec6f5ef58ab5d64e49e2c2e7d00a1b198354a)
 2016-10-24 14:39:32 +01:00
roxana
4a912391df When the last step of the current disposition is completed, no more calculation is needed. 
(cherry picked from commit 606e91545c0725b5523770b1c3cb1cffd38c0ce0)
 2016-10-24 14:39:27 +01:00
roxana
67ad6b4214 Checking if disposition as of date was changed manually. 
(cherry picked from commit fd6fcd8e1442102a446971f691e78780cd576674)
 2016-10-24 14:39:22 +01:00
Tom Page
fc569df0dc RM-3386 Merge commit '4cb38d2' into merge-2.4/RM-2526_BlendedDispositionSchedules. 2016-10-21 11:03:36 +01: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
Tuna Aksoy
2dc520e898 Merge branch 'release/V2.3' into merge-2.4/MergeV23ToV24_101016_2 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
#	rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java
#	rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get.html.ftl
#	rm-server/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
#	rm-server/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java
 2016-10-10 20:49:13 +01:00
Tuna Aksoy
f28ab68609 Merge branch 'feature-2.3/RM-4162_MergeToV2.3' into release/V2.3 
# Conflicts:
#	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
#	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java
 2016-10-04 22:56:45 +01:00
Tom Page
b08d4a788e Let git handle line endings for us. 2016-09-21 14:55:10 +01:00
Ana Bozianu
a4030ba15d Merge release/V2.3 into release/2.4 2016-09-21 11:58:40 +03:00
Roy Wetherall
8ada1e3245 Merge 4.2.0.1 to 2.4.1 2016-08-12 08:51:14 +10:00
Roxana Lucanu-Ghetu
c0c0c225c0 Created a property for AlfrescoRuntimeException instead ot the message. 2016-08-04 11:09:15 +10:00
Roxana Lucanu-Ghetu
32bd60328f Moved check for content to be done on commit. 2016-08-04 11:08:53 +10:00
Roxana Lucanu-Ghetu
649cb7fc3f Added check to allow creating only records inside a record folder. 2016-08-04 11:08:36 +10:00
Roy Wetherall
425e1d8d4c MNT-16535: non admin users can't file email records via outlook integration 2016-08-04 10:47:20 +10:00
Roxana Lucanu-Ghetu
a81616d857 sync release/V2.4 into feature-2.4/RM-3450_SFDCIntegration 2016-07-05 11:54:19 +03:00
Roy Wetherall
d5ae13a829 Merge RM-3227 from V2.3 to V2.4 2016-06-29 10:15:13 +10:00
Roxana Lucanu-Ghetu
a75fe88eb9 Unit and integration test for RM-3450 2016-06-27 10:58:01 +03:00
Roxana Lucanu-Ghetu
d175c8590c Merge branch 'feature-2.4/RM-3300' into 'release/V2.4' 
Feature 2.4/rm 3300

See merge request !271
 2016-06-24 15:46:34 +01:00
Roxana Lucanu-Ghetu
07db0973c4 no message 2016-06-24 17:43:52 +03:00
Mihai Cozma
ca533f0023 Merge branch 'feature-2.4/RM-3293_Audit_not_log_default_scheduled' into 'release/V2.4' 
Feature 2.4/rm 3293 audit not log default scheduled

See merge request !242
 2016-06-24 15:24:52 +01:00
Roxana Lucanu-Ghetu
88963c210d Merge branch 'feature-2.4/RM-3300' into 'release/V2.4' 
Feature 2.4/rm 3300

Run code as system

See merge request !265
 2016-06-24 14:46:38 +01:00
Roxana Lucanu-Ghetu
d711ae1c1d Run the code as system, as some users may not have the rights to add the aspect. 2016-06-24 12:08:41 +03:00
Mihai Cozma
cdf9807aec RM-3293 RM Audit History does not log 2016-06-23 12:10:06 +03:00
Roxana Dina
f06ac4772f Merge remote-tracking branch 'origin/feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into release/V2.4 2016-06-17 17:28:17 +03:00
Roxana Dina
b9f6e58990 Change capability condition name. Add comments and version number. 2016-06-17 16:32:43 +03:00
Roxana Lucanu-Ghetu
6f99d94357 Changed check to throw exception when we try to create records from different types other than cm:folder 2016-06-17 12:25:22 +03:00
Roxana Lucanu-Ghetu
d97a6e3aa1 Merge branch 'feature-2.4/RM-3286' into 'release/V2.4' 
Feature 2.4/rm 3286

Changed behavior:is not possible to create a record folder inside another record folder from IMAP client.
When adding emails with attachments from Outlook client a hidden folder is created inside the record folder, to store the attachments.

See merge request !214
 2016-06-17 10:06:43 +01:00
Roxana Lucanu-Ghetu
a431e84f8e Created a property for AlfrescoRuntimeException instead ot the message. 2016-06-17 12:05:19 +03:00
Roxana Lucanu-Ghetu
7345f55384 Merge branch 'feature-2.4/RM-3060' into 'release/V2.4' 
Feature 2.4/rm 3060 - Record linked to folder with the same disposition schedule couldn't be cut off

Added search by name for current disposition action; when the record has multiple disposition schedules the current disposition action may not be found by id.

See merge request !157
 2016-06-17 08:25:27 +01:00
Roxana Lucanu-Ghetu
85b965dea9 Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. 2016-06-16 15:50:35 +03:00
Roxana Dina
9fda616251 rm-3265 Add new capability condition to deal with displaying the "Move" action. 2016-06-16 14:00:28 +03:00
Mihai Cozma
60d2a00644 RM-3293 RM Audit History does not log Cutoff 2016-06-15 15:42:11 +03:00
Roxana Lucanu-Ghetu
09beb08332 Merge branch 'feature-2.4/RM-3300' into 'release/V2.4' 
Feature 2.4/rm 3300

On versioning, document can be declared as record if adding record and version aspect is done running as System.
I noticed that the aspect is added only like this in other places where it is used; and the method for creating new recorded version, where the aspect is added, is not used in other places such that changing behavior elsewhere.

See merge request !152
 2016-06-15 10:19:48 +01:00
Roxana Lucanu-Ghetu
9964b70b52 Throw exception when trying to create records from different types other than cm:content 2016-06-14 12:27:17 +03:00
Roy Wetherall
563cae7555 Changes to integration to better reflect the scenario to be tested 2016-06-09 13:53:07 +10:00
Mihai Cozma
a5b59b4356 RM-3341 - Outlook Integrations:Emails can be added to the Holds 
/Transfers from Outlook Integration
 2016-06-06 11:21:51 +03:00
Roxana Lucanu-Ghetu
3d74c81abc Moved check for content to be done on commit. 2016-06-06 10:25:46 +03:00
Roxana Lucanu-Ghetu
c6c9edf306 Added check to allow creating only records inside a record folder. 2016-06-03 11:10:18 +03:00
Roxana Lucanu-Ghetu
e9bb18f9f5 Changed test class and commented initial fix. 2016-06-01 17:41:36 +03:00
Mihai Cozma
ac0a7e7016 Create Hold and Transfer container exception 2016-05-31 18:16:32 +03:00
Roxana Lucanu
d2b348b9d0 Added unit test 2016-05-17 12:13:42 +03:00
Roxana Lucanu
a7428c134f RM-3060 - making cut Off action available for record linked to folder with the same disposition schedule 2016-04-26 18:06:11 +03:00
Roxana Lucanu
cc5b9ee32d RM-3300 - on versioning, document can be declared as record if adding record and version aspect is run as System 2016-04-25 11:55:53 +03:00
Ana Bozianu
32bb544bfc RM-3310 - added null check 2016-04-20 14:27:07 +03:00