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
3,908 Commits 324 Branches 2,170 Tags
988f3d51a2fe73c12a73e19e2ece9a6b7c16144c
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Page
efbe7ab8c1 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
2e48e3207f RM-4247 Fix typo. 2016-11-07 16:09:35 +00:00
Ana Bozianu
5ad8cbde8d Merge release/V2.5.0.x to release/V2.5 2016-11-07 17:18:23 +02:00
Silviu Dinuta
93b312a12e 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
e06b50f1f9 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
d3c03b9f76 [maven-release-plugin] prepare for next development iteration 2016-11-07 12:46:02 +00:00
alfresco-build
20e505e50b [maven-release-plugin] prepare release V2.5.0.1 2016-11-07 12:45:59 +00:00
Tom Page
dcdef19025 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
a63da9551e 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
046b242cc2 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
670511aa87 RM-4312: added comments to unit tests 2016-11-07 10:47:10 +02:00
Ana Bozianu
f19ece3538 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
90b76a762c RM-4312: review updates 2016-11-04 18:40:04 +02:00
Silviu Dinuta
730f9ca3dd RM-4312: rewind changes on ServiceBaseImpl 2016-11-04 18:15:49 +02:00
Silviu Dinuta
a4feae7485 RM-4312: changed implementation after review 2016-11-04 18:05:05 +02:00
Ana Bozianu
c6810b33dd fixed audit unit tests 
(cherry picked from commit 7a33945dff)
 2016-11-04 15:38:24 +00:00
Ana Bozianu
d457a67cf6 Revert "updated tag for next development iteration" 
This reverts commit 8ce501035b.
 2016-11-04 17:26:32 +02:00
roxana
373439822c Revert changes and removed cache check. 2016-11-04 17:08:09 +02:00
Silviu Dinuta
ab59884d72 Merge master into 
feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers
 2016-11-04 15:42:37 +02:00
Ana Bozianu
2ba84c3c79 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
793bdd64da RM-4296 - removed redundant parent type checked 2016-11-04 15:36:55 +02:00
Ana Bozianu
5d52f38222 RM-4296 - centralized validation 2016-11-04 15:14:11 +02:00
Ana Bozianu
d05b7a71e0 RM-4296 - whitelisted the accepted types, added unit tests 2016-11-04 14:15:11 +02:00
Silviu Dinuta
6a6eec8963 Merge master into 
feature/RM-4312_ConstraintForCreatingRecordFolderInSpecialContainers
 2016-11-04 13:11:14 +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
753605d299 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
59c6fcca39 RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 4b76fb838f)
 2016-11-04 10:51:27 +00:00
Ana Bozianu
0dab61199e RM-4319 - remove value for the removed setter 2016-11-04 11:28:25 +02: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
Silviu Dinuta
970298bfed RM-4312: added unit tests for the new restriction 2016-11-04 10:04:00 +02:00
Ana Bozianu
43287c1035 fixed audit unit tests 
(cherry picked from commit 7a33945dff)
 2016-11-04 09:46:29 +02:00
Silviu Dinuta
26ba43752d 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
92eec5aefc RM-4312: made the fix for hold container and transfer container 2016-11-03 16:10:05 +02:00
Ana Bozianu
23a3e9af5d RM-4249 - workaround : replaced maxEntries with a positive value 
(cherry picked from commit 4b76fb838f)
 2016-11-03 15:30:21 +02:00
Silviu Dinuta
0ec428c20e 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
512fda3071 RM-4311: extracted some of the common code in private methods 2016-11-03 13:19:29 +02:00
Silviu Dinuta
e4fd4606d7 Merge master into 
feature/RM-4311_NPEWhenUsingAllowedOperationsForUserWithoutPermission
 2016-11-03 11:22:03 +02:00
Silviu Dinuta
4123ca264b 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
1919536cd7 RM-4289: solved the caching problem only after delete 2016-11-03 11:07:32 +02:00
Silviu Dinuta
be9808c68b Merge branch feature/RM-4289_Status404ForGETandDELETErmSite into 
feature/RM-4311_NPEWhenUsingAllowedOperationsForUserWithoutPermission
 2016-11-02 22:01:54 +02:00
Silviu Dinuta
7139f55054 RM-4289: review updates 2016-11-02 19:56:32 +02:00
Silviu Dinuta
d79fde42c6 RM-4311: fixed the issue and added an unit test for it 2016-11-02 18:17:15 +02:00
Silviu Dinuta
a596f929b3 RM-4289: finalised the fix 2016-11-02 17:37:21 +02:00
Silviu Dinuta
c2c2cb2fbc RM-4289: added deleteRMSite method instead of overriding deleteSite 2016-11-02 17:07:21 +02:00
Silviu Dinuta
78ff5bba59 RM-4289: fixed also update site 2016-11-02 16:51:32 +02:00
Ana Bozianu
4a542c78a4 Revert "added classifier to amp atrtifacts" 
This reverts commit c27ac5cd6a.
 2016-11-02 16:42:05 +02:00
Ana Bozianu
49d5d9cb88 updated scp alfresco installer path 2016-11-02 16:21:55 +02:00
Silviu Dinuta
2bf30cf706 RM-4289: first solution 2016-11-02 16:20:49 +02:00