Alan Davis 963320d6c2 Merged 5.1.N (5.1.1) to HEAD (5.2) ...

122653 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122623 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122577 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122484 amukha:       Reverse merged V4.2.6 (4.2.6)
                     118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
                        117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
                           - moved deletion in a retrying context 


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

2016-03-11 22:31:44 +00:00

..

app

Merged 5.1.N (5.1.1) to HEAD (5.2)

2016-03-11 22:25:39 +00:00

Actions.java

…

ApplicationScriptUtils.java

Merged V4.0-BUG-FIX to HEAD

2012-02-13 12:24:24 +00:00

Association.java

…

BaseScopableProcessorExtension.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

Behaviour.java

…

CategoryNode.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

CategoryTemplateNode.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ChildAssociation.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

Classification.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ClasspathScriptLocation.java

…

ContentAwareScriptableQNameMap.java

…

ExecuteScriptJob.java

…

Imap.java

Merged V3.4-BUG-FIX to HEAD

2011-10-10 12:07:32 +00:00

NativeMap.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

People.java

Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

2015-10-30 00:09:37 +00:00

Presence.java

…

RhinoScriptProcessor.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

Scopeable.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

ScriptableHashMap.java

Merged V4.1-BUG-FIX to HEAD

2013-02-27 11:56:13 +00:00

ScriptableQNameMap.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ScriptAction.java

…

ScriptBehaviour.java

…

ScriptFacetResult.java

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-05-19 12:49:26 +00:00

ScriptLogger.java

Added missing script logger API method to mirror log4j:

2011-08-15 13:38:00 +00:00

ScriptNode.java

Merged 5.1.N (5.1.1) to HEAD (5.2)

2016-03-11 22:31:44 +00:00

ScriptPagingNodes.java

…

ScriptSpellCheckResult.java

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-20 10:51:27 +00:00

ScriptTestUtils.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

ScriptUrls.java

…

ScriptUtils.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ScriptVersion.java

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-18 17:27:07 +00:00

Search.java

Fix for ACE-2004 SOLR 4 - Support filtering of query results

2015-08-27 20:35:23 +00:00

Session.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ValueConverter.java

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-02-12 10:12:44 +00:00