Neil McErlean ba6d532d55 Merged BRANCHES/DEV/SWIFT to HEAD: ...

r28607 Fixing a spring configuration error. I had injected the activityPostService instead of the activityService into some webscript controllers.



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

2011-06-27 11:24:52 +00:00

..

action

Merged BRANCHES/V3.4 to HEAD:

2010-11-23 11:32:19 +00:00

activities

Activities Dashlet: made activities filter work

2011-06-25 19:23:56 +00:00

admin

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

archive

Rename PagingDetails to ScriptPagingDetails in preparation for merging with PagingRequest. (JS object name is unchanged, which is the main use)

2011-06-09 14:27:08 +00:00

audit

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

bean

Swift – SE.S21 Share - DM Remote Store:

2011-06-17 13:26:00 +00:00

blogs

Merged BRANCHES/DEV/SWIFT to HEAD:

2011-06-27 11:24:52 +00:00

comment

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

config

Updated files to LGPL

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

content

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

datalist

Data List export as Excel and CSV webscript

2011-05-23 22:09:23 +00:00

dictionary

Merged DEV/SWIFT to HEAD

2011-06-02 11:01:26 +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

Merged DEV/SWIFT to HEAD

2011-06-10 00:21:55 +00:00

groups

Merged V3.4 to HEAD

2011-04-11 14:24:38 +00:00

invitation

Merged V3.4 to HEAD

2011-04-11 14:24:38 +00:00

invite

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

metadata

Very minor formatting

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

nodelocator

Merged DEV/SWIFT to HEAD

2011-06-09 12:08:12 +00:00

person

Data List export as Excel and CSV webscript

2011-05-23 22:09:23 +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

publishing

Publishing:

2011-06-24 14:40:10 +00:00

rating

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

rendition/patch

Merging DEV_TEMPORARY to HEAD (RenditionService)

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

replication

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

rule

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

search

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

servlet

Merged DEV/SWIFT to HEAD

2011-05-28 21:31:19 +00:00

site

Merged DEV/SWIFT to HEAD

2011-06-09 22:40:27 +00:00

solr

Checkin for RSOLR 031: "Remote API to get and compare models"

2011-06-20 09:28:02 +00:00

subscriptions

Completed subscriptions REST API and added a bit more UI logic

2011-06-20 18:08:36 +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

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

wcm

Merged V3.3 to HEAD

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

workflow

ACTVT 93: Refactored /api/workflow-instances/{id}/diagram REST API to extend StreamContent and use temporary file (ALF-8634)

2011-06-22 08:30:09 +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

DeclarativeSpreadsheetWebScript.java

Data List export as Excel and CSV webscript

2011-05-23 22:09:23 +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

RepoClassPathStore.java

Merged V3.4 to HEAD

2011-04-11 14:24:38 +00:00

RepositoryContainer.java

Merged DEV/SWIFT to HEAD

2011-06-10 00:21:55 +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

Merged V3.4-BUG-FIX to HEAD

2011-04-11 15:57:26 +00:00

RepositoryTemplateProcessorFactory.java

Updated files to LGPL

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

RepoStore.java

Merged DEV/SWIFT to HEAD

2011-06-09 21:14:18 +00:00

TestWebScriptRepoServer.java

Merged V3.3-BUG-FIX to HEAD

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

WebScriptTestSuite.java

Merged BRANCHES/DEV/SWIFT to HEAD:

2011-06-27 10:10:07 +00:00