Merge remote-tracking branch 'upstream/bugfix' into bugfix
Merge remote-tracking branch 'upstream/bugfix' into bugfix
Updated Languages from Transifex
Merge remote-tracking branch 'upstream/bugfix' into bugfix
Context menu don`t show if node has quotes.
Added Ukrainian Language to Transfix
Avoid tampering cache file by escaping all keys and values
- changing all $modx->db->escape to $this->escapeSingleQuotes/$this->escapeDoubleQuotes
- reformatted code for better readability
Use of $modx->htmlspecialchars instead of htmlspecialchars
Avoid XSS
- $modx->htmlspecialchars or explicit integer casting on $_GET/$_POST values
Wrong indents
htmlspecialchars be called with ENT_QUOTES
Prevent XSS
Sameorigin header

Conflicts:
	manager/index.php
config.inc.php to have setcookie specify httponly
setcookie specify httponly
Set secure flag to prevent cookies to be leaked via non encrypted requests.
Revert "setcookie specify httponly"

This reverts commit 337afd123a84b1c53e5337a6c5e36bc47b2376f7.
Merge branch 'bugfix' into develop

* bugfix:
  Revert "setcookie specify httponly"
  Set secure flag to prevent cookies to be leaked via non encrypted requests.
  setcookie specify httponly
  config.inc.php to have setcookie specify httponly
  Sameorigin header
  Prevent XSS
  htmlspecialchars be called with ENT_QUOTES
  Wrong indents
  Avoid XSS - $modx->htmlspecialchars or explicit integer casting on $_GET/$_POST values
  Use of $modx->htmlspecialchars instead of htmlspecialchars
  Avoid tampering cache file by escaping all keys and values - changing all $modx->db->escape to $this->escapeSingleQuotes/$this->escapeDoubleQuotes - reformatted code for better readability
  Added Ukrainian Language to Transfix
  Updated Languages from Transifex
Merge pull request #359 from Segr/bugfix

Context menu don't show if node has quotes.
Merge branch 'bugfix' into develop

* bugfix:
  Context menu don`t show if node has quotes.