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

Downstream 2016-06-09 #31

Merged
merged 82 commits into from
Jun 9, 2016
Merged

Downstream 2016-06-09 #31

merged 82 commits into from
Jun 9, 2016

Commits on May 31, 2016

  1. Added tests about overwriting files and folders as recipient

    @SergioBertolinSG @rullzer
    SergioBertolinSG authored and rullzer committed May 31, 2016
    Configuration menu
    Copy the full SHA
    c6a5a43 View commit details
    Browse the repository at this point in the history

  2. add overwriting using chunking but failing

    @SergioBertolinSG @rullzer
    SergioBertolinSG authored and rullzer committed May 31, 2016
    Configuration menu
    Copy the full SHA
    a626aa2 View commit details
    Browse the repository at this point in the history

  3. userUploadsChunkFileOfWithToWithChecksum has chunking-42 hardcoded

    @SergioBertolinSG @rullzer
    SergioBertolinSG authored and rullzer committed May 31, 2016
    Configuration menu
    Copy the full SHA
    f2bf75d View commit details
    Browse the repository at this point in the history

  4. Added same test using old chunking

    @SergioBertolinSG @rullzer
    SergioBertolinSG authored and rullzer committed May 31, 2016
    Configuration menu
    Copy the full SHA
    dc05f97 View commit details
    Browse the repository at this point in the history

  5. Added another case about overwriting folder using old chunking

    @SergioBertolinSG @rullzer
    SergioBertolinSG authored and rullzer committed May 31, 2016
    Configuration menu
    Copy the full SHA
    a716740 View commit details
    Browse the repository at this point in the history

  6. Get a range from several chunks

    @SergioBertolinSG @rullzer
    SergioBertolinSG authored and rullzer committed May 31, 2016
    Configuration menu
    Copy the full SHA
    118050d View commit details
    Browse the repository at this point in the history

  7. implement specific rename handling for SMB

    @blizzz @icewind1991
    blizzz authored and icewind1991 committed May 31, 2016
    Configuration menu
    Copy the full SHA
    c913226 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2016

  1. allow deleting "ghost files" trough the View and Node api

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

  2. return success when deleting ghost files

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

  3. Fix warnings when trying to get mtime of non existing files

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

  4. add test for deleting ghost files over dav

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

  5. .htaccess update making two rules non-capturing

    @mmattel
    mmattel committed Jun 3, 2016
    Configuration menu
    Copy the full SHA
    1059315 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2016

  1. Do not allow to store boolean configs, they behave unexpected on post… 

    …gres
    @nickvergessen
    nickvergessen committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    911fd3e View commit details
    Browse the repository at this point in the history

  2. Fix Decrypt message via occ

    @davitol
    davitol committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    eaeb5d6 View commit details
    Browse the repository at this point in the history

  3. Comments fixed

    @davitol
    davitol committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    f9b3865 View commit details
    Browse the repository at this point in the history

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

    @DeepDiver1975
    DeepDiver1975 committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    371a07e View commit details
    Browse the repository at this point in the history

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

    @icewind1991 @DeepDiver1975
    icewind1991 authored and DeepDiver1975 committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    7a0254b View commit details
    Browse the repository at this point in the history

  6. Remove background from curved logo (#24980)

    @DeepDiver1975
    William Bargent authored and DeepDiver1975 committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    6256bbd View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. [tx-robot] updated from transifex

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

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

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

  3. Allow to decrypt user '0' files only

    @nickvergessen
    nickvergessen committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    d4ba982 View commit details
    Browse the repository at this point in the history

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

    allow deleting "ghost files" trough the View and Node api
    Vincent Petry committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    bf917d7 View commit details
    Browse the repository at this point in the history

  5. Fixed reviews

    @SergioBertolinSG
    SergioBertolinSG committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    67c9e59 View commit details
    Browse the repository at this point in the history

  6. decrease initial users to load to 50 

    Prevents timeouts on the initial loading of users. proper fix will be in owncloud/core#10994
Workaround for owncloud/core#24734
    @butonic
    butonic committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    2989584 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #23845 from owncloud/smb-rename 

    implement specific rename handling for SMB
    Vincent Petry committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    46fe2dd View commit details
    Browse the repository at this point in the history

  8. Improve the UX for "not found" perma links

    @nickvergessen
    nickvergessen committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    77db6d3 View commit details
    Browse the repository at this point in the history

  9. dissalow symlinks in local storages that point outside the datadir

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

  10. Ignore forbidden files while scanning

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

  11. Better handling of forbidden files in dav

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

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

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

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

    Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
    Vincent Petry committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    15fffb2 View commit details
    Browse the repository at this point in the history

  14. Add support to know where the storage test comes from

    @jvillafanez
    jvillafanez committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    8526bbb View commit details
    Browse the repository at this point in the history

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

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

  16. Allow to cancel 2FA after login

    @nickvergessen
    nickvergessen committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    3e3b326 View commit details
    Browse the repository at this point in the history

  17. Rename variable

    @jvillafanez
    jvillafanez committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    110edd3 View commit details
    Browse the repository at this point in the history

  18. Fix test

    @jvillafanez
    jvillafanez committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    a2b0058 View commit details
    Browse the repository at this point in the history

  19. Use temporary htaccesstest.txt for data dir security check

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

Commits on Jun 8, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    bbd61cd View commit details
    Browse the repository at this point in the history

  2. Bring back sharedstorage hooks

    @rullzer
    rullzer committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    4a3c67f View commit details
    Browse the repository at this point in the history

  3. darker background image for better font contrast

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

  4. Adjust test to work with phpunit < 5.2

    @nickvergessen
    nickvergessen committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    68a7aed View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder 

    Fix GDrive upload file which name might match the one of a folder
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    4fd55c2 View commit details
    Browse the repository at this point in the history

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

    Uploading a txt file with XML contents makes GDrive return the XML mime
type.

This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size
properly rely on the Google Docs mime types.
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    fa9c96a View commit details
    Browse the repository at this point in the history

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

    Added tests about overwriting files and folders as recipient
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    1ee4d4d View commit details
    Browse the repository at this point in the history

  8. Merge pull request #25001 from owncloud/issue-24939-better-ux-on-inva… 

    …lid-perma-link

Improve the UX for "not found" perma links
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    652b496 View commit details
    Browse the repository at this point in the history

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

    don't update storage mtime if we can't get the modified date
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    87c150e View commit details
    Browse the repository at this point in the history

  10. Merge pull request #25018 from owncloud/background-contrast 

    darker background image for better font contrast
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    5601684 View commit details
    Browse the repository at this point in the history

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

    decrease initial users to load to 50
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    111b4d7 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-… 

    …user-0-only

Allow to decrypt user '0' files only
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b7935dc View commit details
    Browse the repository at this point in the history

  13. Merge pull request #24992 from owncloud/fix_decrypt_message 

    Fix Decrypt message via occ
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    9b6125e View commit details
    Browse the repository at this point in the history

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

    do not generate device token if 2FA is enable for user
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    12683b7 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #24983 from owncloud/issue-23776-do-not-allow-bool… 

    …ean-user-config

Do not allow to store boolean configs, they behave unexpected on postgres
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    ed92f4c View commit details
    Browse the repository at this point in the history

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

    dissalow symlinks in local storages that point outside the datadir
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    8d09489 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #25019 from owncloud/fix_24937 

    Bring back sharedstorage hooks
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b3592ab View commit details
    Browse the repository at this point in the history

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

    Allow to cancel 2FA after login
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    7dcc47d View commit details
    Browse the repository at this point in the history

  19. Fixed problem about removing trusted servers accidentally

    @SergioBertolinSG
    SergioBertolinSG committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    e0aaa21 View commit details
    Browse the repository at this point in the history

  20. ownCloud 9.1.0 beta 2

    Daniel Molkentin committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    e133f7e View commit details
    Browse the repository at this point in the history

  21. Improve readability

    @SergioBertolinSG
    SergioBertolinSG committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    b849362 View commit details
    Browse the repository at this point in the history

  22. Change the default value to true instead of null

    @jvillafanez
    jvillafanez committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    7d85bed View commit details
    Browse the repository at this point in the history

  23. Removed old html

    @SergioBertolinSG
    SergioBertolinSG committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    6bc7e3f View commit details
    Browse the repository at this point in the history

  24. When creating a session token, make sure it's the login password and … 

    …not a device token
    @ChristophWurst
    ChristophWurst committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    ec929f0 View commit details
    Browse the repository at this point in the history

  25. Added width of the tooltip

    @SergioBertolinSG
    SergioBertolinSG committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    e70bd36 View commit details
    Browse the repository at this point in the history

  26. skip scanning for a user when the user is not setup yet

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

  27. catch sessionnotavailable exception if memory session is used

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

  28. Merge pull request #24974 from owncloud/htaccess_update 

    .htaccess update making two rules non-capturing
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    396363c View commit details
    Browse the repository at this point in the history

  29. use client login method on CORS routes

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

  30. Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetyp… 

    …emismatch

Fix GDrive file size when mime type doesn't match contents
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    5621551 View commit details
    Browse the repository at this point in the history

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

    * Make the filtering better readable

* Add some more methods to the sensitive list
    @nickvergessen @DeepDiver1975
    nickvergessen authored and DeepDiver1975 committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    e493070 View commit details
    Browse the repository at this point in the history

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

    Added width of the tooltip
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    7c8d2a8 View commit details
    Browse the repository at this point in the history

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

    Fixed problem about removing trusted servers accidentally
    Vincent Petry committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    6de406a View commit details
    Browse the repository at this point in the history

  34. Update autotest.sh 

    usage in sync with reality.
    @jnweiger
    jnweiger committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    0a6b845 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. [tx-robot] updated from transifex

    Jenkins for ownCloud committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    355f50b View commit details
    Browse the repository at this point in the history

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

    skip scanning for a user when the user is not setup yet
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    0e3737f View commit details
    Browse the repository at this point in the history

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

    use client login method on CORS routes
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    aca4ea1 View commit details
    Browse the repository at this point in the history

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

    When creating a session token, make sure it's the login password and …
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    826e276 View commit details
    Browse the repository at this point in the history

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

    Use temporary htaccesstest.txt for data dir security check
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    90c1ec1 View commit details
    Browse the repository at this point in the history

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

    @DeepDiver1975
    DeepDiver1975 committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    f20c617 View commit details
    Browse the repository at this point in the history

  7. Fix the FIXME (#25022)

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

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

    Update autotest.sh
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    c13c561 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #25008 from owncloud/externals_test_with_origin 

    Add support to know where the storage test comes from
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    ac16342 View commit details
    Browse the repository at this point in the history

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

    Allow login by email address via webdav as well
    Vincent Petry committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    6ba1893 View commit details
    Browse the repository at this point in the history

  11. Downstream 2016-06-09 

    Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
    @blizzz
    blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    a636e4f View commit details
    Browse the repository at this point in the history