Code

Downstream 2016-06-09#31

Code

Merged

blizzz merged 82 commits intomasternextcloud/server:masterfrom downstream-160609nextcloud/server:downstream-160609Copy head branch name to clipboardJun 9, 2016

+1,210-270

Commits

Commits on May 31, 2016

• Added tests about overwriting files and folders as recipient

  

  SergioBertolinSG

  authored and

  rullzer

  committed
  c6a5a43

• add overwriting using chunking but failing

  

  SergioBertolinSG

  authored and

  rullzer

  committed
  a626aa2

• userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded

  

  SergioBertolinSG

  authored and

  rullzer

  committed
  f2bf75d

• Added same test using old chunking

  

  SergioBertolinSG

  authored and

  rullzer

  committed
  dc05f97

• Added another case about overwriting folder using old chunking

  

  SergioBertolinSG

  authored and

  rullzer

  committed
  a716740

• Get a range from several chunks

  

  SergioBertolinSG

  authored and

  rullzer

  committed
  118050d

• implement specific rename handling for SMB

  

  blizzz

  authored and

  icewind1991

  committed
  c913226

Commits on Jun 3, 2016

• allow deleting "ghost files" trough the View and Node api

  icewind1991

  committed
  63408fa

• return success when deleting ghost files

  icewind1991

  committed
  14f96f8

• Fix warnings when trying to get mtime of non existing files

  icewind1991

  committed
  6bc8305

• add test for deleting ghost files over dav

  icewind1991

  committed
  3bd5073

• .htaccess update making two rules non-capturing

  mmattel

  committed
  1059315

Commits on Jun 6, 2016

• Do not allow to store boolean configs, they behave unexpected on postgres

  nickvergessen

  committed
  911fd3e

• Fix Decrypt message via occ

  davitol

  committed
  eaeb5d6

• Comments fixed

  davitol

  committed
  f9b3865

• Fix checkMove() implementation for dav v2 - fixes #24776 (#24971)

  DeepDiver1975

  committed
  371a07e

• handle path not being set in shared cache (#24993)

  

  icewind1991

  authored and

  DeepDiver1975

  committed
  7a0254b

• Remove background from curved logo (#24980)

  

  William Bargent

  authored and

  DeepDiver1975

  committed
  6256bbd

Commits on Jun 7, 2016

• [tx-robot] updated from transifex

  

  Jenkins for ownCloud

  committed
  f28f6ad

• do not generate device token if 2FA is enable for user

  ChristophWurst

  committed
  8f7a4aa

• Allow to decrypt user '0' files only

  nickvergessen

  committed
  d4ba982

• Merge pull request #24813 from owncloud/delete-ghost-files

  Show description for bf917d7
  

  Vincent Petry

  committed
  bf917d7

• Fixed reviews

  SergioBertolinSG

  committed
  67c9e59

• decrease initial users to load to 50

  Show description for 2989584
  butonic

  committed
  2989584

• Merge pull request #23845 from owncloud/smb-rename

  Show description for 46fe2dd
  

  Vincent Petry

  committed
  46fe2dd

• Improve the UX for "not found" perma links

  nickvergessen

  committed
  77db6d3

• dissalow symlinks in local storages that point outside the datadir

  icewind1991

  committed
  7b1b723

• Ignore forbidden files while scanning

  icewind1991

  committed
  73547f2

• Better handling of forbidden files in dav

  icewind1991

  committed
  f119769

• don't update storage mtime if we can't get the modified date

  icewind1991

  committed
  6822689

• Fix GDrive upload file which name might match the one of a folder

  Show description for 15fffb2
  

  Vincent Petry

  committed
  15fffb2

• Add support to know where the storage test comes from

  jvillafanez

  committed
  8526bbb

• make sure $data['mtime'] is always a timestamp

  icewind1991

  committed
  2cf7ad8

• Allow to cancel 2FA after login

  nickvergessen

  committed
  3e3b326

• Rename variable

  jvillafanez

  committed
  110edd3

• Fix test

  jvillafanez

  committed
  a2b0058

• Use temporary htaccesstest.txt for data dir security check

  

  Vincent Petry

  committed
  fb087a0

Commits on Jun 8, 2016

• [tx-robot] updated from transifex

  

  Jenkins for ownCloud

  committed
  bbd61cd

• Bring back sharedstorage hooks

  rullzer

  committed
  4a3c67f

• darker background image for better font contrast

  ChristophWurst

  committed
  4bff16e

• Adjust test to work with phpunit < 5.2

  nickvergessen

  committed
  68a7aed

• Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder

  Show description for 4fd55c2
  

  Vincent Petry

  committed
  4fd55c2

• Fix GDrive file size when mime type doesn't match contents

  Show description for fa9c96a
  

  Vincent Petry

  committed
  fa9c96a

• Merge pull request #23996 from owncloud/integrations-tests-qa-145

  Show description for 1ee4d4d
  

  Vincent Petry

  committed
  1ee4d4d

• Merge pull request #25001 from owncloud/issue-24939-better-ux-on-invalid-perma-link

  Show description for 652b496
  

  Vincent Petry

  committed
  652b496

• Merge pull request #25005 from owncloud/parent-storage-time-cast

  Show description for 87c150e
  

  Vincent Petry

  committed
  87c150e

• Merge pull request #25018 from owncloud/background-contrast

  Show description for 5601684
  

  Vincent Petry

  committed
  5601684

• Merge pull request #24999 from owncloud/initial-userloading-workaround

  Show description for 111b4d7
  

  Vincent Petry

  committed
  111b4d7

• Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only

  Show description for b7935dc
  

  Vincent Petry

  committed
  b7935dc

• Merge pull request #24992 from owncloud/fix_decrypt_message

  Show description for 9b6125e
  

  Vincent Petry

  committed
  9b6125e

• Merge pull request #24991 from owncloud/2fa-do-not-generate-token

  Show description for 12683b7
  

  Vincent Petry

  committed
  12683b7

• Merge pull request #24983 from owncloud/issue-23776-do-not-allow-boolean-user-config

  Show description for ed92f4c
  

  Vincent Petry

  committed
  ed92f4c

• Merge pull request #24899 from owncloud/local-storage-symlinks

  Show description for 8d09489
  

  Vincent Petry

  committed
  8d09489

• Merge pull request #25019 from owncloud/fix_24937

  Show description for b3592ab
  

  Vincent Petry

  committed
  b3592ab

• Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa

  Show description for 7dcc47d
  

  Vincent Petry

  committed
  7dcc47d

• Fixed problem about removing trusted servers accidentally

  SergioBertolinSG

  committed
  e0aaa21

• ownCloud 9.1.0 beta 2

  

  Daniel Molkentin

  committed
  e133f7e

• Improve readability

  SergioBertolinSG

  committed
  b849362

• Change the default value to true instead of null

  jvillafanez

  committed
  7d85bed

• Removed old html

  SergioBertolinSG

  committed
  6bc7e3f

• When creating a session token, make sure it's the login password and not a device token

  ChristophWurst

  committed
  ec929f0

• Added width of the tooltip

  SergioBertolinSG

  committed
  e70bd36

• skip scanning for a user when the user is not setup yet

  icewind1991

  committed
  808438e

• catch sessionnotavailable exception if memory session is used

  ChristophWurst

  committed
  46e26f6

• Merge pull request #24974 from owncloud/htaccess_update

  Show description for 396363c
  

  Vincent Petry

  committed
  396363c

• use client login method on CORS routes

  ChristophWurst

  committed
  9997c43

• Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatch

  Show description for 5621551
  

  Vincent Petry

  committed
  5621551

• Do not log token or challenge with exception stacktrace (#25026)

  Show description for e493070
  

  nickvergessen

  authored and

  DeepDiver1975

  committed
  e493070

• Merge pull request #25027 from owncloud/fix-22746-narrowtooltip

  Show description for 7c8d2a8
  

  Vincent Petry

  committed
  7c8d2a8

• Merge pull request #25023 from owncloud/fix-22127-trusted-servers

  Show description for 6de406a
  

  Vincent Petry

  committed
  6de406a

• Update autotest.sh

  Show description for 0a6b845
  jnweiger

  committed
  0a6b845

Commits on Jun 9, 2016

• [tx-robot] updated from transifex

  

  Jenkins for ownCloud

  committed
  355f50b

• Merge pull request #25028 from owncloud/scanner-user-not-setup

  Show description for 0e3737f
  

  Vincent Petry

  committed
  0e3737f

• Merge pull request #24826 from owncloud/cors-client-login

  Show description for aca4ea1
  

  Vincent Petry

  committed
  aca4ea1

• Merge pull request #24973 from owncloud/token-password-session-token

  Show description for 826e276
  

  Vincent Petry

  committed
  826e276

• Merge pull request #25014 from owncloud/admin-datadircheck-fix

  Show description for 90c1ec1
  

  Vincent Petry

  committed
  90c1ec1

• Allow login by email address via webdav as well - fixes #24791

  DeepDiver1975

  committed
  f20c617

• Fix the FIXME (#25022)

  

  nickvergessen

  authored and

  DeepDiver1975

  committed
  4c26abe

• Merge pull request #25036 from owncloud/jnweiger-patch-1

  Show description for c13c561
  

  Vincent Petry

  committed
  c13c561

• Merge pull request #25008 from owncloud/externals_test_with_origin

  Show description for ac16342
  

  Vincent Petry

  committed
  ac16342

• Merge pull request #25000 from owncloud/fix-email-login-dav

  Show description for 6ba1893
  

  Vincent Petry

  committed
  6ba1893

• Downstream 2016-06-09

  Show description for a636e4f
  blizzz

  committed
  a636e4f