Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync stable9 #334

Merged
merged 21 commits into from
Jul 7, 2016
Merged

Sync stable9 #334

merged 21 commits into from
Jul 7, 2016

Commits on Jun 29, 2016

  1. get only vcards which match both the address book id and the vcard uri ( 

    #25294)
    @schiessle @DeepDiver1975
    schiessle authored and DeepDiver1975 committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    1f71285 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2016

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

    @DeepDiver1975
    DeepDiver1975 committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    4a4103b View commit details
    Browse the repository at this point in the history

  2. [stable9] Fix decrypt message stable9 (#25188) 

    * Fix Decrypt message via occ

* Comments fixed

* Fixed reviews

* Originally:
commit 2304e4bda027e61ff1302c55c2f70f8e4c8f47d0
Author: Joas Schilling <nickvergessen@owncloud.com>
Date:   Tue Jun 7 09:13:11 2016 +0200

    Allow to decrypt user '0' files only

* Fix uid comparison
    @DeepDiver1975
    DeepDiver1975 committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    4ac256e View commit details
    Browse the repository at this point in the history

  3. Fix OC_Helper::rmdirr for nested symlinks (#25255)

    @VicDeo @DeepDiver1975
    VicDeo authored and DeepDiver1975 committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    21bdd30 View commit details
    Browse the repository at this point in the history

  4. occ web executor (#24957) 

    * Initial web executor

* Fix PHPDoc

Fix broken integration test

OccControllerTests do not require database access - moch them all!

Kill unused sprintf
    @VicDeo @DeepDiver1975
    VicDeo authored and DeepDiver1975 committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    9fcb269 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2016

  1. Revert "Remove repair steps for broken updater repair" 

    This reverts commit 58ed5b9328e9e12dd4319c0730202f385ca0dc5d.
    Vincent Petry committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    1a42979 View commit details
    Browse the repository at this point in the history

  2. check if renamed user is still valid by reapplying the ldap filter (#… 

    …25338)
    @felixboehm @DeepDiver1975
    felixboehm authored and DeepDiver1975 committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    fdb0d4a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2016

  1. Change order of share creation validation 

    Makes sure that the share owner is set before entering the checks that
need it.

Partial backport of afa37d3
    Vincent Petry committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    a2bbc22 View commit details
    Browse the repository at this point in the history

  2. Add integration test for sharing with group, then user in group 

    Add integration test for the use case where a group share exists and
then the same owner creates a direct share to a user in that group.
    Vincent Petry committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    ffe1a8b View commit details
    Browse the repository at this point in the history

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

    [stable9] occ web executor
    Vincent Petry committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    6e27375 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. Merge pull request #25298 from owncloud/schiessle-fix-get-contact-sta… 

    …ble9

[stable9] get only vcards which match both the address book id and the vcard uri
    Vincent Petry committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    a2e0573 View commit details
    Browse the repository at this point in the history

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

    @DeepDiver1975
    Vincent Petry authored and DeepDiver1975 committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    c92c234 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #25360 from owncloud/stable9-backportshareownerfix 

    [stable9] Change order of share creation validation
    Vincent Petry committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    3864555 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #25343 from owncloud/stable9-revertrepairrevert 

    Revert "Remove repair steps for broken updater repair"
    Vincent Petry committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    116a6f3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25375 from owncloud/stable9-147c672f5866002d45ec6… 

    …8e99e379449792eeaf8

[stable9] Ignore invalid paths in the JS file list
    Vincent Petry committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    ad67b3f View commit details
    Browse the repository at this point in the history

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

    @VicDeo @DeepDiver1975
    VicDeo authored and DeepDiver1975 committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    445a76b View commit details
    Browse the repository at this point in the history

  7. Backport 25367 to Stable 9.0 (#25384)

    @cdamken @DeepDiver1975
    cdamken authored and DeepDiver1975 committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    64a1519 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. Merge branch 'stable9' into sync-stable9

    @MorrisJobke
    MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    11e834e View commit details
    Browse the repository at this point in the history

  2. Revert "Revert "Remove repair steps for broken updater repair"" 

    This reverts commit 1a42979.
    @MorrisJobke
    MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    06964b3 View commit details
    Browse the repository at this point in the history

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

    This reverts commit 445a76b.
    @MorrisJobke
    MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    4782b92 View commit details
    Browse the repository at this point in the history

  4. Revert "occ web executor (#24957)" 

    This reverts commit 9fcb269.
    @MorrisJobke
    MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    f593a09 View commit details
    Browse the repository at this point in the history