Commit Graph

5254 Commits

Author SHA1 Message Date
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
Silviu Dinuta
1f9e91d925 Merge branch feature/RM-4289_Status404ForGETandDELETErmSite into
feature/RM-4311_NPEWhenUsingAllowedOperationsForUserWithoutPermission
2016-11-02 22:01:54 +02:00
Silviu Dinuta
81e66757d0 RM-4289: review updates 2016-11-02 19:56:32 +02:00
Silviu Dinuta
68ee561822 RM-4311: fixed the issue and added an unit test for it 2016-11-02 18:17:15 +02:00
Silviu Dinuta
320413baed RM-4289: finalised the fix 2016-11-02 17:37:21 +02:00
Silviu Dinuta
e5f3cd5f89 RM-4289: added deleteRMSite method instead of overriding deleteSite 2016-11-02 17:07:21 +02:00
Silviu Dinuta
1e8a5182ab RM-4289: fixed also update site 2016-11-02 16:51:32 +02:00
Ana Bozianu
00c7f2a75d Revert "added classifier to amp atrtifacts"
This reverts commit 52da6976b0.
2016-11-02 16:42:05 +02:00
Ana Bozianu
39d4b16ac7 updated scp alfresco installer path 2016-11-02 16:21:55 +02:00
Silviu Dinuta
1f3de50f92 RM-4289: first solution 2016-11-02 16:20:49 +02:00
Ana Bozianu
52da6976b0 added classifier to amp atrtifacts 2016-11-02 15:50:21 +02:00
Ana Bozianu
e06900cb65 updated tag for next development iteration 2016-11-02 15:12:49 +02:00
Roxana Lucanu-Ghetu
ed69ffe7ed Merge branch 'feature-2.3/RM-4280_UpdateDispositionWhenLinking&Unlinking' into 'release/V2.3.1.x'
Feature 2.3/rm 4280 update disposition when linking&unlinking

This should also fix RM-4292.

See merge request !589
2016-11-02 12:36:46 +00:00
Ana Bozianu
a9f3229783 added original fetch amps back 2016-11-02 14:31:51 +02:00
Ana Bozianu
725f2280f3 temporary removed fetch amps 2016-11-02 13:42:49 +02:00