Code

Sync stable9#334

Code

Merged

blizzz merged 21 commits intostable9nextcloud/server:stable9from sync-stable9nextcloud/server:sync-stable9Copy head branch name to clipboardJul 7, 2016

+169-55

Commits

Commits on Jun 29, 2016

• get only vcards which match both the address book id and the vcard uri (#25294)

  

  schiessle

  authored and

  DeepDiver1975

  committed
  1f71285

  Copy full SHA for 1f71285

Commits on Jul 1, 2016

• Suppress warnings from DAV migration if there's nothing to do (#25279)

  DeepDiver1975

  authored
  4a4103b

  Copy full SHA for 4a4103b

• [stable9] Fix decrypt message stable9 (#25188)

  Show description for 4ac256e
  DeepDiver1975

  authored
  4ac256e

  Copy full SHA for 4ac256e

• Fix OC_Helper::rmdirr for nested symlinks (#25255)

  

  VicDeo

  authored and

  DeepDiver1975

  committed
  21bdd30

  Copy full SHA for 21bdd30

• occ web executor (#24957)

  Show description for 9fcb269
  

  VicDeo

  authored and

  DeepDiver1975

  committed
  9fcb269

  Copy full SHA for 9fcb269

Commits on Jul 4, 2016

• Revert "Remove repair steps for broken updater repair"

  Show description for 1a42979
  

  Vincent Petry

  committed
  1a42979

  Copy full SHA for 1a42979

• check if renamed user is still valid by reapplying the ldap filter (#25338)

  

  felixboehm

  authored and

  DeepDiver1975

  committed
  fdb0d4a

  Copy full SHA for fdb0d4a

Commits on Jul 5, 2016

• Change order of share creation validation

  Show description for a2bbc22
  

  Vincent Petry

  committed
  a2bbc22

  Copy full SHA for a2bbc22

• Add integration test for sharing with group, then user in group

  Show description for ffe1a8b
  

  Vincent Petry

  committed
  ffe1a8b

  Copy full SHA for ffe1a8b

• Merge pull request #25222 from owncloud/web-executor-stable9

  Show description for 6e27375
  

  Vincent Petry

  authored
  6e27375

  Copy full SHA for 6e27375

Commits on Jul 6, 2016

• Merge pull request #25298 from owncloud/schiessle-fix-get-contact-stable9

  Show description for a2e0573
  

  Vincent Petry

  authored
  a2e0573

  Copy full SHA for a2e0573

• Ignore invalid paths in the JS file list (#25368)

  

  Vincent Petry

  authored and

  DeepDiver1975

  committed
  c92c234

  Copy full SHA for c92c234

• Merge pull request #25360 from owncloud/stable9-backportshareownerfix

  Show description for 3864555
  

  Vincent Petry

  authored
  3864555

  Copy full SHA for 3864555

• Merge pull request #25343 from owncloud/stable9-revertrepairrevert

  Show description for 116a6f3
  

  Vincent Petry

  authored
  116a6f3

  Copy full SHA for 116a6f3

• Merge pull request #25375 from owncloud/stable9-147c672f5866002d45ec68e99e379449792eeaf8

  Show description for ad67b3f
  

  Vincent Petry

  authored
  ad67b3f

  Copy full SHA for ad67b3f

• Bypass upgrade page when occ controller is requested (#25363)

  

  VicDeo

  authored and

  DeepDiver1975

  committed
  445a76b

  Copy full SHA for 445a76b

• Backport 25367 to Stable 9.0 (#25384)

  

  cdamken

  authored and

  DeepDiver1975

  committed
  64a1519

  Copy full SHA for 64a1519

Commits on Jul 7, 2016

• Merge branch 'stable9' into sync-stable9

  MorrisJobke

  committed
  11e834e

  Copy full SHA for 11e834e

• Revert "Revert "Remove repair steps for broken updater repair""

  Show description for 06964b3
  MorrisJobke

  committed
  06964b3

  Copy full SHA for 06964b3

• Revert "Bypass upgrade page when occ controller is requested (#25363)"

  Show description for 4782b92
  MorrisJobke

  committed
  4782b92

  Copy full SHA for 4782b92

• Revert "occ web executor (#24957)"

  Show description for f593a09
  MorrisJobke

  committed
  f593a09

  Copy full SHA for f593a09