Alan Davis 1eda74e709 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) ...

107010: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      106860: MNT-14113: User admin console: sorting users causes some to disappear
      The behavior of indexed people search has been modified to return the same results as a CQ search. The test for this behavior has been added to 'PeolpleTest'. This test is valid for SOLR1/SOLR4 and "buildonly" (Lucene)


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

2015-06-25 08:28:15 +00:00

..

app

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

2015-04-08 16:24:03 +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

ALF-9252 - SVC 58: Apply contribution for category management services

2011-07-22 00:49:32 +00:00

CategoryTemplateNode.java

…

ChildAssociation.java

…

Classification.java

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

2015-03-27 23:00:01 +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-QA to HEAD (4.2) (including moving test classes into separate folders)

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

People.java

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

2015-06-25 08:28:15 +00:00

Presence.java

…

RhinoScriptProcessor.java

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

2014-04-02 21:54:58 +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-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +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 HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-05-20 10:38:05 +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-01-31 11:37:17 +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

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

2015-05-19 15:14:02 +00:00

Session.java

…

ValueConverter.java

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

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