Neil McErlean 6b9b686cf5 Merge from V3.4 to HEAD ...

r. 23793 Merge from V3.3-BUG-FIX to V3.4
    r. 23791 Fix for failing test cases SiteServiceTest and InviteServiceTest.
             I have used susbsystem bean overriding to turn off emails on the MailActionExecuter bean.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2010-11-19 12:55:01 +00:00

..

action

Fixed ALF-4682: ActionTrackingService uses cluster-unsafe cache

2010-09-10 11:58:15 +00:00

activities

Updated files to LGPL

2010-03-02 18:33:11 +00:00

audit

ALF-4106: AuditService and audit DAO refactor

2010-09-15 15:06:06 +00:00

bean

Merged V3.3-BUG-FIX to HEAD

2010-09-27 12:47:35 +00:00

blog

Updated files to LGPL

2010-03-02 18:33:11 +00:00

comment

Updated files to LGPL

2010-03-02 18:33:11 +00:00

config

Updated files to LGPL

2010-03-02 18:33:11 +00:00

content

When listing the transformers for a given mimetype via the /mimetypes webscript, detect and report if a proxy transformer uses openoffice

2010-10-13 14:05:05 +00:00

dictionary

SAIL-219 : Supporting data dictionary webscripts

2010-03-24 19:46:47 +00:00

discussion

Updated files to LGPL

2010-03-02 18:33:11 +00:00

facebook

Updated files to LGPL

2010-03-02 18:33:11 +00:00

forms

Updated files to LGPL

2010-03-02 18:33:11 +00:00

groups

Build fix

2010-03-11 09:58:47 +00:00

invitation

ALF-1568 Expanded the JSON returned by the api/sites/{siteName}/invitations webscript and various other related webscripts. The JSOn now includes an "invitee" object with a structure

2010-04-29 11:14:15 +00:00

invite

Merged V3.2 to HEAD

2010-03-12 17:06:36 +00:00

metadata

Very minor formatting

2010-08-20 10:41:09 +00:00

person

Merged V3.3 to HEAD

2010-06-09 14:01:07 +00:00

portlet

Updated files to LGPL

2010-03-02 18:33:11 +00:00

preference

Updated files to LGPL

2010-03-02 18:33:11 +00:00

rating

Rating Service. Now limited to one rating scheme per user per node.

2010-08-04 07:44:07 +00:00

rendition/patch

Merging DEV_TEMPORARY to HEAD (RenditionService)

2010-03-05 20:02:52 +00:00

replication

ALF-4704 - Filter out deleted nodes in the replication model builder, otherwise the freemarker for the replication webscripts chokes on deleted ones. Includes new unit test.

2010-09-10 10:08:14 +00:00

rule

Fix to broken unit test

2010-03-19 17:31:29 +00:00

search

Updated files to LGPL

2010-03-02 18:33:11 +00:00

servlet

Merged V3.3-BUG-FIX to HEAD

2010-07-11 14:22:26 +00:00

site

Merge from V3.4 to HEAD

2010-11-19 12:55:01 +00:00

tagging

Updated files to LGPL

2010-03-02 18:33:11 +00:00

thumbnail

Package up the Web Script tests into a suite

2010-03-11 16:37:13 +00:00

transfer

ALF-4936 - implementing transfer lock timeout.

2010-10-15 14:59:14 +00:00

wcm

Merged V3.3 to HEAD

2010-06-09 14:53:24 +00:00

workflow

Fixed ALF-4803: Anyone can cancel a workflow: Service version

2010-09-27 08:55:55 +00:00

AlfrescoRhinoScriptDebugger.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

BaseWebScriptTest.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

FileTypeImageUtils.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

LoginTest.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepositoryContainer.java

Merged V3.3-BUG-FIX to HEAD

2010-10-18 09:07:11 +00:00

RepositoryContainerTest.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepositoryImageResolver.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepositoryScriptProcessor.java

Merged V3.2 to HEAD

2010-03-11 12:31:51 +00:00

RepositoryScriptProcessorFactory.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepositoryServerModel.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepositoryTemplateProcessor.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepositoryTemplateProcessorFactory.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

RepoStore.java

Updated files to LGPL

2010-03-02 18:33:11 +00:00

TestWebScriptRepoServer.java

Merged V3.3-BUG-FIX to HEAD

2010-07-11 14:22:26 +00:00

WebScriptTestSuite.java

Merged BRANCHES/V3.4 to HEAD:

2010-11-19 09:02:32 +00:00