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,990 Commits 325 Branches 2,188 Tags
02eec901b3758acba0442712999efe30cd0b43d6
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihai Cozma
aafd4b1ef8 Merge branch 'feature/RM-4329_Alfreco_Search_in_colaboration_site_doesn't_work' into 'master' 
Feature/rm 4329 alfreco search in colaboration site doesn't work

See merge request !616
 2016-11-09 17:02:14 +00:00
Silviu Dinuta
b67a8878a9 RM-4326: renamed rm site type unit test class 2016-11-09 16:52:17 +02:00
Silviu Dinuta
7685a5e36d RM-4326: added unit tests for RmSiteType class 2016-11-09 16:35:51 +02:00
Tom Page
1476e389d6 Update version to 2.3.1.1-SNAPSHOT. 2016-11-09 13:48:25 +00:00
Tom Page
0a423f1660 Update version to 2.3.1. 2016-11-09 13:17:00 +00:00
Silviu Dinuta
c9839ae3c4 Merge remote-tracking branch 'origin/master' into feature/RM-4326 2016-11-09 14:51:25 +02:00
Silviu Dinuta
5e7be6cc5f RM-4326: minor fix 2016-11-09 14:48:49 +02:00
Ana Bozianu
3fec0260d1 read-only merge release/V2.5 into master 2016-11-09 14:45:37 +02:00
Ana Bozianu
55fd1ec3c6 Merge merge-2.5/2.5.0.x_to_2.5 into release/V2.5 2016-11-09 14:41:13 +02:00
Mihai Cozma
955cddbc3c RM-4329 Update rmsearch to the latest core search version 2016-11-09 14:18:53 +02:00
Silviu Dinuta
699021b8e0 RM-4326: extracted non unique types in a constant for RmSyteType create 
association check
 2016-11-09 13:27:33 +02:00
Silviu Dinuta
da408b7459 RM-4326: undo some formatting 2016-11-09 12:53:53 +02:00
Silviu Dinuta
0b656e544a RM-4326: undo some formatting 2016-11-09 12:51:14 +02:00
Silviu Dinuta
94e8664129 RM-4326: removed checkPostPermission method and changed RmSyteType to 
handle allowed created types
 2016-11-09 12:44:19 +02:00
Tom Page
9d6bbe9cd2 Merge branch 'merge-2.5/RM-4247_UpdateDispositionProperty' into 'release/V2.5' 
Merge 2.5/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 !609
 2016-11-09 08:09:45 +00:00
Silviu Dinuta
338ec3f172 RM-4326: undo some formatting 2016-11-08 20:47:10 +02:00
Silviu Dinuta
9746ee9ff3 RM-4326: allow creation under hold type only from HoldServiceImpl 2016-11-08 20:40:51 +02:00
Silviu Dinuta
18e86553de RM-4326: undo some formatting 2016-11-08 18:44:42 +02:00
Silviu Dinuta
e999b68586 RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:41:15 +02:00
Silviu Dinuta
c6ca74ab26 RM-4326: allow creation in transfer only from TransferServiceImpl 2016-11-08 18:38:35 +02:00
Silviu Dinuta
ce367f79a3 RM-4326: adjusted unit test name for transferContainerType 2016-11-08 17:42:06 +02:00
Silviu Dinuta
57203f853a RM-4326: undo some formatting 2016-11-08 17:36:21 +02:00
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