inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,117 Commits 325 Branches 2,188 Tags
ff31236cd5263f23dda3707fc6496fc49e9b6e8c
Commit Graph

4117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roxana Lucanu-Ghetu
0cb9a8420c Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/RM-2526 2016-11-08 17:35:25 +02:00
Silviu Dinuta
a4aac053a8 RM-4326: allow creation in transfer container only from 
TransferServiceImpl
 2016-11-08 17:26:07 +02:00
Tom Page
76ca5df8a8 RM-4247 Merge release/V2.4 into release/V2.5. 2016-11-08 13:25:45 +00:00
Tom Page
bbf074b434 Merge branch 'merge-2.4/RM-4247_UpdateDispositionProperty' into 'release/V2.4' 
Merge 2.4/rm 4247 update disposition property

RM-4247 Ensure that changes to the disposition property cause the "as of" date to be recalculated.

See merge request !606
 2016-11-08 13:21:55 +00:00
roxana
8dd2e277cf Merge commit RM-2526_LinkingMakesRecordPropertiesUnavailable into release/V2.3 2016-11-08 15:02:01 +02:00
Silviu Dinuta
2d502aef35 RM-4326: restricted permission for post request on Transfer Container, 
Transfer Folder type and Hold folder type and added unit tests for the
changes
 2016-11-08 14:16:15 +02:00
Silviu Dinuta
a8de1269d5 RM-4326: added restriction for types that are accepted to be create in 
unfiled record folder
 2016-11-08 11:42:58 +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
Tom Page
a631ebfaf3 RM-4247 Merge release/V2.3 into release/V2.4. 2016-11-07 16:12:20 +00:00
Tom Page
49e2754d55 Merge branch 'feature-2.3/RM-4247_UpdateDispositionProperty' into 'release/V2.3' 
Feature 2.3/rm 4247 update disposition property

RM-4247 Recalculate the "disposition as of" date if the period property changes.

See merge request !564
 2016-11-07 16:10:16 +00:00
Tom Page
6cf3411fe2 RM-4247 Fix typo. 2016-11-07 16:09:35 +00:00
Ana Bozianu
4851c13c3c Merge release/V2.5.0.x to release/V2.5 2016-11-07 17:18:23 +02:00
Silviu Dinuta
964cdf006a Merge branch 'feature/RM-4306_SomeCommentsForWhenUpgradingFrom5_2_a_EA' into 'master' 
Feature/rm 4306 some comments for when upgrading from5 2 a ea

See merge request !603
 2016-11-07 14:40:43 +00:00
Silviu Dinuta
7112a6918c RM-4312: fixed some integration tests 2016-11-07 16:05:19 +02:00
Rodica Sutu
138319917e Update gitignore to ignore test-output folder 2016-11-07 14:51:17 +02:00
alfresco-build
c6541e6d2f [maven-release-plugin] prepare for next development iteration 2016-11-07 12:46:02 +00:00
alfresco-build
2d8bc8f596 [maven-release-plugin] prepare release V2.5.0.1 ags-2.5.0.1 2016-11-07 12:45:59 +00:00
Tom Page
ff27c94e25 Merge branch 'feature-2.3/RM-4307_AuditFix' into 'release/V2.3.1.x' 
Feature 2.3/rm 4307 audit fix

RM-4307 Cherry-pick fix from master.

See merge request !600
 2016-11-07 12:30:45 +00:00
Silviu Dinuta
1a1e7def6a RM-4306: added some comments to the methods that need to be removed when 
we'll use latest core SitesIml implementation
 2016-11-07 14:17:17 +02:00
Silviu Dinuta
e78b55f866 Merge branch 'feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers' into 'master' 
Feature/rm 4312 constraint for creating record folder in special containers

See merge request !596
 2016-11-07 08:50:40 +00:00
Silviu Dinuta
4ddac21418 RM-4312: added comments to unit tests 2016-11-07 10:47:10 +02:00
Ana Bozianu
54d673c176 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

We also updated the automation tests

See merge request !602
 2016-11-04 16:40:30 +00:00
Silviu Dinuta
567b98b848 RM-4312: review updates 2016-11-04 18:40:04 +02:00
Silviu Dinuta
af1cbfe3ff RM-4312: rewind changes on ServiceBaseImpl 2016-11-04 18:15:49 +02:00
Silviu Dinuta
7077ec96c5 RM-4312: changed implementation after review 2016-11-04 18:05:05 +02:00
Ana Bozianu
4d511bd0af fixed audit unit tests 
(cherry picked from commit e686da88de)
 2016-11-04 15:38:24 +00:00
Ana Bozianu
d7e35f1a5f Revert "updated tag for next development iteration" 
This reverts commit e06900cb65.
 2016-11-04 17:26:32 +02:00
roxana
71917d6d17 Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Silviu Dinuta
075109970b Merge master into 
feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers
 2016-11-04 15:42:37 +02:00
Ana Bozianu
49185bd499 Merge branch 'feature/RM-4296_IllegalChildrenInFileplanRoot' into 'master' 
Feature/rm 4296 illegal children in fileplan root

RM-4296 - Create special containers as File Plan works

You could create children of any node type in fileplan root except for content and record folder because we were blacklisting the denied types.
Whitelisted the accepted types dividing them in 2 categories: types that are accepted only once and types that are accepted multiple types

See merge request !601
 2016-11-04 13:39:46 +00:00
Ana Bozianu
c6995351d9 RM-4296 - removed redundant parent type checked 2016-11-04 15:36:55 +02:00
Ana Bozianu
312c3e14f7 RM-4296 - centralized validation 2016-11-04 15:14:11 +02:00
Ana Bozianu
3f0e6709fe RM-4296 - whitelisted the accepted types, added unit tests 2016-11-04 14:15:11 +02:00
Silviu Dinuta
b18ee914d2 Merge master into 
feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers
 2016-11-04 13:11:14 +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
da007399ce Merge branch 'feature/RM-4319_securityBeanOverridesCoreBean' into 'master' 
Feature/rm 4319 security bean overrides core bean

ACLEntryAfterInvocationProvider had a setter removed on Alfresco 5.2 after being deprecated on Alfresco 3.0. I removed the setter from our bean.

The setter has been deprecated in this commit: https://fisheye.alfresco.com/changelog/alfresco-enterprise?cs=12109

The setter has been removed in this commit: https://fisheye.alfresco.com/changelog/alfresco-enterprise?cs=132100

The bean afterAcl shouldn't be fully overriden. This is a temporary fix

See merge request !599
 2016-11-04 11:03:08 +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
Ana Bozianu
939737ffe4 RM-4319 - remove value for the removed setter 2016-11-04 11:28:25 +02: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
Silviu Dinuta
644c62e918 RM-4312: added unit tests for the new restriction 2016-11-04 10:04:00 +02:00
Ana Bozianu
55e15e1dca fixed audit unit tests 
(cherry picked from commit e686da88de)
 2016-11-04 09:46:29 +02:00
Silviu Dinuta
c7f8d3e757 RM-4312: restrained record folder creation in unfiled records container 2016-11-03 16:51:52 +02:00
Kristijan Conkas
52e49c384e Merge branch 'feature/Code_Refactor' into 'master' 
Feature/code refactor

See merge request !9
 2016-11-03 14:26:36 +00:00
Silviu Dinuta
84bf2f6158 RM-4312: made the fix for hold container and transfer container 2016-11-03 16:10:05 +02:00
Ana Bozianu
ab85906adc RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 995448081e)
 2016-11-03 15:30:21 +02:00
Silviu Dinuta
aaab44aaa8 Merge branch 'feature/RM-4311_NPEWhenUsingAllowedOperationsForUserWithoutPermission' into 'master' 
Feature/rm 4311 npe when using allowed operations for user without permission

See merge request !594
 2016-11-03 12:06:41 +00:00
Silviu Dinuta
a92dfe0d48 RM-4311: extracted some of the common code in private methods 2016-11-03 13:19:29 +02:00
Silviu Dinuta
c1da2fb138 Merge master into 
feature/RM-4311_NPEWhenUsingAllowedOperationsForUserWithoutPermission
 2016-11-03 11:22:03 +02:00
Silviu Dinuta
7258ca7c18 Merge branch 'feature/RM-4289_Status404ForGETandDELETErmSite' into 'master' 
Feature/rm 4289 status404 for ge tand delet erm site

See merge request !593
 2016-11-03 09:15:29 +00:00
Silviu Dinuta
41d9e0aeb6 RM-4289: solved the caching problem only after delete 2016-11-03 11:07:32 +02:00