Alan Davis 81d2356496 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) ...

69948: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69866: Merged V4.2.2 to V4.2-BUG-FIX (V4.2.3)
         69863: Fix edge-case read-only server browsing of sites that require the tagscope aspect (MNT-11310)
         69864 (RECORD-ONLY): Removed deep svn:mergeinfo
         69865 (RECORD-ONLY): Undo r69863 (MNT-11310) as incorrect branch


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

2014-05-16 20:08:47 +00:00

..

script

Added a new findSites() method for use by live-search and Site Finder (sites.get.js) for ACE-1513

2014-04-26 16:20:13 +00:00

DocLibNodeLocator.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-20 11:11:55 +00:00

package-info.java

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

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

RoleComparatorImpl.java

…

SiteAspect.java

Merged V4.0-BUG-FIX to HEAD

2012-03-02 15:00:35 +00:00

SiteAVMBootstrap.java

…

SiteContainersCannedQuery.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

SiteContainersCannedQueryFactory.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

SiteContainersCannedQueryParams.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

SiteDoesNotExistException.java

Provide a new SiteDoesNotExistException, extending the existing SiteServiceException, to make it easier for code to identify this case

2011-07-14 13:20:59 +00:00

SiteInfoImpl.java

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

2014-03-15 01:43:38 +00:00

SiteMemberInfoImpl.java

ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.

2012-09-24 15:36:02 +00:00

SiteMembersCannedQuery.java

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

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

SiteMembersCannedQueryParams.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

SiteMembership.java

Merged BRANCHES/DEV/HEAD-QA to HEAD:

2013-07-01 09:35:59 +00:00

SiteMembershipCannedQueryFactory.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

SiteModel.java

Adding Public API annotation per ALF-19074

2013-09-19 00:12:36 +00:00

SitesCannedQuery.java

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

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

SitesCannedQueryParams.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-19 14:16:01 +00:00

SiteServiceBootstrap.java

ACE-415: MT: Server bootstraps all tenants on startup - linear scaling

2014-01-21 17:32:40 +00:00

SiteServiceException.java

…

SiteServiceImpl.java

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

2014-05-16 20:08:47 +00:00

SiteServiceInternal.java

Merged DEV/SWIFT to HEAD

2011-06-08 14:47:59 +00:00

SitesPermissionCleaner.java

Merged BRANCHES/DEV/CONV_HEAD to HEAD:

2013-03-18 09:52:08 +00:00