Sub-dir was prepended twice
Sub-dir was prepended twice
[tx-robot] updated from transifex
Removes highlighting of selected items, padding from apps management.
[tx-robot] updated from transifex
Merge pull request #7939 from owncloud/wring_redirect_on_login

Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
fix duplicate rules for button/input styles, em to px
replace last personalblock fieldset within files_external
external storage: fix merge conflict, indentation
merge CSS rules
Check if web root has already been appended
Improve phpdoc
select statement always need to contain file_source respectively item_source
move check if a file should be encrypted to the pre hook
don't call getFileInfo() to avoid to open the same file twice
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
Allow using "/" in "overwritewebroot"

Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
Merge pull request #7916 from owncloud/fix-input-sizes

Fix input sizes
Fix uploading files containing a # in the path for webdav
Remove whitespace at end of lines.