server/core/command
Andreas Fischer 2d69c4c2d3 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (663 commits)
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  Sub-dir was prepended twice
  Sub-dir was prepended twice
  [tx-robot] updated from transifex
  Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
  Emit event after setting a new expiration for a share
  adding @method annotation to declare methods which can be called on the wrapped statement object
  Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
  don't write file if opening a stream to encrypt the data fails
  Do not retrieve storage stats for trash bin
  [tx-robot] updated from transifex
  prevent dimmed ocdialog div from scrolling
  fix breadcrumbs for IE8
  enable SVG->PNG fallback for 'New' menu
  enable SVG->PNG fallback for newly uploaded files and folders
  specify logo to not repeat when container is bigger
  fix SVG replacement for logo so it works in IE8, fix #7866
  Fix swift touch operation
  [tx-robot] updated from transifex
  ...

Conflicts:
	3rdparty
2014-03-31 15:33:01 +02:00
..
app Add occ command to list all apps 2013-11-25 17:34:16 +01:00
db Merge remote-tracking branch 'owncloud/master' into db-convert-tool 2014-03-31 15:33:01 +02:00
maintenance Add a (currently) empty system for running common repair steps 2013-11-26 14:12:48 +01:00
user Merge branch 'master' into load-apps-proper-master 2014-03-21 14:05:08 +01:00
status.php Scrutinizer Auto-Fixes 2014-02-19 09:31:54 +01:00
upgrade.php Merge branch 'master' into load-apps-proper-master 2014-03-21 14:05:08 +01:00