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 master #333

Merged
merged 51 commits into from
Jul 7, 2016
Merged

Sync master #333

merged 51 commits into from
Jul 7, 2016

Commits on Jun 23, 2016

  1. Fix "Other" value handling in quota dropdown in users page 

    Prevents "other" value to be deleted.
When appending custom value, put it above the "other" entry.
    Vincent Petry committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    6c1ea7a View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. Prevent negative or non-number values in quota input

    Vincent Petry committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    819b7c4 View commit details
    Browse the repository at this point in the history

  2. better detect errors in fed sharing response

    @icewind1991
    icewind1991 committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    ee67484 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2016

  1. Handle exceptions thrown while trying to notify remote server of a fe… 

    …d share
    @icewind1991
    icewind1991 committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    8d32e1d View commit details
    Browse the repository at this point in the history

  2. Log reason why we removed the fed share

    @icewind1991
    icewind1991 committed Jun 27, 2016
    Configuration menu
    Copy the full SHA
    646c90c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. prevent users from deleting their own session token

    @ChristophWurst
    ChristophWurst committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    dc6c234 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. hide hidden parameters from list backend/auth parameters

    @icewind1991
    icewind1991 committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    cb3b678 View commit details
    Browse the repository at this point in the history

  2. show configuration options for authentication backends while listing … 

    …storage

Fixes #22447
    @icewind1991
    icewind1991 committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    17036c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2016

  1. Filelist change dir auto-prepend slash 

    Prepend a slash to directories in case it was missing since many places
assume that it's there.
    Vincent Petry committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    6802fd2 View commit details
    Browse the repository at this point in the history

  2. Add all properties while creating a subscription (#25318) 

    Fixes #24469
    @tcitworld @DeepDiver1975
    tcitworld authored and DeepDiver1975 committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    aaf4c30 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #25276 from owncloud/delete-own-session-token 

    prevent users from deleting their own session token
    Vincent Petry committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    e42ce62 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #25262 from owncloud/fed-sharing-error 

    Only save federated share after remote server is notified
    Vincent Petry committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    027715f View commit details
    Browse the repository at this point in the history

  5. remove javascript png fallback for svg

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

  6. remove png actions, fileicons, etc

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

  7. remove png references in core

    @Henni
    Henni authored and Vincent Petry committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    9e7e3de View commit details
    Browse the repository at this point in the history

  8. remove svg classes

    @Henni
    Henni authored and Vincent Petry committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    0a8f7bd View commit details
    Browse the repository at this point in the history

  9. adjusts tests to removal of svg fallback

    @Henni
    Henni authored and Vincent Petry committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    5cc0147 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jul 2, 2016
    Configuration menu
    Copy the full SHA
    b0bad03 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    6a89a63 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    59fc3ff View commit details
    Browse the repository at this point in the history

  2. Cap LDAP user cache (#25323)

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

  3. 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
    aa42d60 View commit details
    Browse the repository at this point in the history

  4. Change nickvergessen mailmap entry (#25349)

    @nickvergessen @DeepDiver1975
    nickvergessen authored and DeepDiver1975 committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    8147eef View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25314 from owncloud/files_external-backends-config 

    show configuration options for authentication backends
    Vincent Petry committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    a573b68 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #25253 from owncloud/users-fixotherquotadropdown 

    Fix "Other" value handling in quota dropdown in users page
    Vincent Petry committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    a35747b View commit details
    Browse the repository at this point in the history

  7. Merge pull request #25240 from owncloud/remove-svg 

    Remove SVG fallback
    @MorrisJobke
    MorrisJobke committed Jul 4, 2016
    Configuration menu
    Copy the full SHA
    8b8d2b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2016

  1. Bypass upgrade page when occ controller is requested

    @VicDeo
    VicDeo committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    89e581a View commit details
    Browse the repository at this point in the history

  2. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    e7cc8ba View commit details
    Browse the repository at this point in the history

  3. fix swift primary object store test (#25281) 

    * Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
    @DeepDiver1975
    DeepDiver1975 committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    3bde47c View commit details
    Browse the repository at this point in the history

  4. 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
    647e168 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25344 from owncloud/fix-ldap-check-user 

    check if renamed user is still valid by reapplying the ldap filter
    Vincent Petry committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    1d10d58 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #25356 from owncloud/checkupgrade-bypass 

    Bypass upgrade page when occ controller is requested
    Vincent Petry committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    e668cf1 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    94d9111 View commit details
    Browse the repository at this point in the history

  2. Upgrading the log level From Debug to INFO to be consistent with file… 

    …s_trashbin (#25367)
    @cdamken @DeepDiver1975
    cdamken authored and DeepDiver1975 committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    9c9062c View commit details
    Browse the repository at this point in the history

  3. 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
    147c672 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #25325 from owncloud/filelist-prependslash 

    Filelist change dir auto-prepend slash
    Vincent Petry committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    e0b5a64 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25361 from owncloud/sharing-inttestforusershareaf… 

    …tergroupshare

Add integration test for sharing with group, then user in group
    Vincent Petry committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    db45607 View commit details
    Browse the repository at this point in the history

  6. Use named parameter instead of direct value for system tags search pa… 

    …ram (#25380)
    @DeepDiver1975
    Vincent Petry authored and DeepDiver1975 committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    e4d1851 View commit details
    Browse the repository at this point in the history

  7. Set content type when downloading log file to force download in some … 

    …browsers (#25382)
    @DeepDiver1975
    Vincent Petry authored and DeepDiver1975 committed Jul 6, 2016
    Configuration menu
    Copy the full SHA
    a3b6735 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    3731b2a View commit details
    Browse the repository at this point in the history

  2. Revert "[tx-robot] updated from transifex" 

    This reverts commit 3731b2a.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d9111.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8ba.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63.

Revert "[tx-robot] updated from transifex"

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

  3. Merge branch 'master' into sync-master

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

  4. Revert "Bypass upgrade page when occ controller is requested" 

    This reverts commit 89e581a.
    @MorrisJobke
    MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    00eaa3e View commit details
    Browse the repository at this point in the history

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

    This reverts commit 854352d.
    @MorrisJobke
    MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    4e06726 View commit details
    Browse the repository at this point in the history

  6. Change png icons to svg

    @jvillafanez @MorrisJobke
    jvillafanez authored and MorrisJobke committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    13ae263 View commit details
    Browse the repository at this point in the history

  7. Add expiration date to share by link view

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

  8. add "Never" if expiration date is not set

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

  9. Not set expiration date is represented as 0

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

  10. Update header during update callback

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

  11. add unit tests

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

  12. Simplify test code and don't show anything if no date is set

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