Prevent content duplication when using [css|js|html]To[Head|Bottom] output filters that call modX.regClient*
Bump version for 2.2.12 dev
Updated copyright dates
Improve Confirm Navigation feature and make configurable

Merge remote-tracking branch 'origin/pr/820' into release-2.2

* origin/pr/820:
  Do not trigger confirmation dialog when the empty cache checkbox was triggered Affects CacheMaster users.
  Seriously... I think I need coffee
  Oops, put lexicon back in order.
  Improved "prevent navigation" alert by tracking field changes instead of using flawed isDirty() check.
  [REBUILD] Allow disabling the confirm navigation popup
[REBUILD] Allow disabling the confirm navigation popup

(cherry picked from commit 4f8ae7293230bca9a7a29fa3dc828a40532ef263)

Conflicts:
	manager/assets/modext/widgets/resource/modx.panel.resource.js
Improved "prevent navigation" alert by tracking field changes instead of using flawed isDirty() check.

The FormPanel.isDirty() check does a raw comparison between the original value and the current value of each of the fields. When using a rich text editor, there could be changes in the current content value of a resource due to changes in formatting (editors forcing a <p> root block) or encoding (& being turned into &amp;) which would result in the navigation popup. While yes, there are changes, no, the user did not make them so they should not be bothered with a popup.

The commit changes from looking at FormPanel.isDirty() to tracking field changes through the changeField event and a local flag.

This commit also resolves an issue where changing templates would show the warning during the reload.

(cherry picked from commit 5f24bb7fa025e4ae9c07d903e13d1c53b0c2fd41)

Conflicts:
	manager/assets/modext/widgets/resource/modx.panel.resource.js
Do not trigger confirmation dialog when the empty cache checkbox was triggered
Affects CacheMaster users.

(cherry picked from commit 7e95477189787071f11f9a7c2a06969df6b76b90)
add changelog entry
Improve Confirm Navigation feature and make configurable

Merge branch 'pr/820' into develop

* pr/820:
  add changelog entry
  Do not trigger confirmation dialog when the empty cache checkbox was triggered Affects CacheMaster users.
  Improved "prevent navigation" alert by tracking field changes instead of using flawed isDirty() check.
  [REBUILD] Allow disabling the confirm navigation popup
Merge pull request #751 from Mark-H/issue749

Add separation between a minute (singular) and minutes (plural)
Fix warnings (LOG_LEVEL_WARN) about alias not found for deleted resources

(cherry picked from commit d3d4cd93ac2ca18d68f67ec5a145f94dafaa49b6)

Conflicts:
	core/model/modx/processors/resource/getnodes.class.php
Need some sleep...

(cherry picked from commit 203b42c95a5b784c9d094ea52b8723c70fc676b0)
Fix warnings (LOG_LEVEL_WARN) about alias not found for deleted resources

Merge branch 'pr/794' into develop

* pr/794:
  Need some sleep...
  Fix warnings (LOG_LEVEL_WARN) about alias not found for deleted resources
Handle "preview" resource button visibility according to the "deleted" status of the resource

(cherry picked from commit 18840d793e31d200cb8a653f65a821525a610418)

Conflicts:
	manager/assets/modext/widgets/resource/modx.panel.resource.js
	manager/assets/modext/widgets/resource/modx.tree.resource.js
Fix lexicon getList processor

Merge remote-tracking branch 'origin/pr/791' into develop

* origin/pr/791:
  moved $count after DB and file results merge
  moved $where search update before DB quering
Increase message_limit for ExtJS HttpStateProvider

Changed message_limit and delay

This will fix the annoying tree problem.

If there are more than 200 cache files modx won't load the tree position cache file (modx-resource-tree.msg.php).
The cache files are inside the core/cache/registry/state/ys/user.. directory.

I reduced the delay so the level of the tree will be saved faster.
(cherry picked from commit b9823230c354b7d838e086c2875a1919fd9295c9)
Fix property set tree bug and TV vertical tab bugs

Merge remote-tracking branch 'origin/pr/736' into develop

* origin/pr/736:
  Template Variable Vertical Tab Fixes
  Property Set Tree Bug Fix
Merge pull request #737 from rtripault/fix-sort-usergroups

Fix action to sort user groups (tree)
Merge pull request #738 from rtripault/menu

Added ability to define parent for menu & making action field optional
Merge pull request #739 from rtripault/packages

Fix processors path