Merge remote-tracking branch 'Mark-H/bug-6934' into release-2.2

* Mark-H/bug-6934:
  [#6934] Fix for only showing the resource delete button if all permissions are given
Prevent php notice when set constraint doesnt have any related TVs
Add criteria support to aggregates and composites

This allows defining additional criteria beyond the local and foreign column values which must be satisfied to load or save an aggregate or composite with a criteria attribute defined.

NOTE: you can define selection conditions as any valid JSON string, but for satisfying save values, only array values with non-numeric keys will be considered.
Squashed commit of the following:

commit f3b6d965ea56c5d8b6166f8ca833a32905106aca
Author: Jason Coward <jason@modx.com>
Date:   Wed Mar 21 15:21:47 2012 -0600

    Add criteria support to aggregates and composites

    This allows defining additional criteria beyond the local and foreign column values which must be satisfied to load or save an aggregate or composite with a criteria attribute defined.

    NOTE: you can define selection conditions as any valid JSON string, but for satisfying save values, only array values with non-numeric keys will be considered.
Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)

Signed-off-by: Jan-Christoph Ihrens <ihrens@cc-services.de>
Merge remote-tracking branch 'enigmatic-user/german_translation' into release-2.2

* enigmatic-user/german_translation:
  Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)
  [#6496] Fix quick edit modal windows for elements on smaller screens.
  [#6501] Fix SuperBoxSelect selections spanning multiple rows
  [#6687] Fix duplicated OK buttons in MODx.Console in certain situations
  [#6864] Fix rare issue where primary group is not set for user, and custom dashboard for their group does not propagate
  [#7011] Prevent infinite recursion error in modElement::isStaticSourceMutable
  Fix change profile link
  Add MODX favicon.ico to site root for default in sites
  [#7389] Prevent error when input is shorter than truncate length in ellipsis filter
  [#7364] Better checking for default sort on file browser
  [#7357] Add else check to profile link in header to at least display name
  [#7333] Prevent error when id is undefined in resource edit controller
  [#7364] Add setting to set default sort field of MODx.Browser view
  [#7363] Check for this.stateful in MODx.tree.Tree::_saveState
  Add missing index to modSession.access
  [#7357] Prevent viewing of Profile if user does not have change_profile permission
  [#7322] Fix issue where certain regions were not able to be hid via FC; clarified FC set labels
  [#7362] Fix issue with conflicting FC Sets when User belongs to more than one User Group with a Set
  Translated newest phrases to German, improved the translation of some of the existing phrases
[#6931] Workaround for template changing issue on servers that have misconfigured date_timzeone setting
[#7456] Fix for minify not modified status in fastcgi environments
[#7455] Fallback to TV name if caption not found when displaying TV inputs
Merge remote-tracking branch 'upstream/release-2.2' into release-2.2
Merge remote-tracking branch 'enigmatic-user/release-2.2' into release-2.2

* enigmatic-user/release-2.2:
  Translated the newest phrases to German (formcustomization.inc.php, setting.inc.php)
Fix regression issue with PM tree and _saveState
[#7446] Added extra checks to protect against parse errors with :then and :else output filters
[#7445] Fix issues with TVs not respecting Resource Groups limiting access
Fix array/string notice when sending forgot password in login controller
Add "sudo" user attribute, which bypasses access permissions for said user; upgrade to 2.2.1 makes Super Users in Administrator group sudo users
Ensure initial first user is sudo
[#7481] Fix issue with reloading resource when changing templates and the context alias cache
[#7391] Fix UI error causing resource group checkboxes on TV edit page to not render correctly