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.

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

Downstream 2016-06-08 #25

Merged
merged 32 commits into from
Jun 9, 2016
Merged

Downstream 2016-06-08 #25

merged 32 commits into from
Jun 9, 2016

Commits on Jun 9, 2016

  1. Configuration menu
    Copy the full SHA
    9108257 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dbaeedc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a2c7b2e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    57444b0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8de206c View commit details
    Browse the repository at this point in the history
  6. Get a range from several chunks

    SergioBertolinSG authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    44f7241 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    67c2c85 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f4831f4 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    18f7ced View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    16559e4 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0041d89 View commit details
    Browse the repository at this point in the history
  12. Fix Decrypt message via occ

    davitol authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    ad33992 View commit details
    Browse the repository at this point in the history
  13. Comments fixed

    davitol authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    3b5c169 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    c4b80b8 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e7a55c4 View commit details
    Browse the repository at this point in the history
  16. [tx-robot] updated from transifex

    Jenkins for ownCloud authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    d72d8c1 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    60e15e9 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    4f27c2c View commit details
    Browse the repository at this point in the history
  19. Fixed reviews

    SergioBertolinSG authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    fad91e9 View commit details
    Browse the repository at this point in the history
  20. 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 authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    75870c9 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    a6134a6 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    bee9186 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    ea6921d View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    9b5fd51 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    7970ff2 View commit details
    Browse the repository at this point in the history
  26. 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 authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    8c7a32c View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    49db297 View commit details
    Browse the repository at this point in the history
  28. Allow to cancel 2FA after login

    nickvergessen authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    7f88645 View commit details
    Browse the repository at this point in the history
  29. [tx-robot] updated from transifex

    Jenkins for ownCloud authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    6aab7d7 View commit details
    Browse the repository at this point in the history
  30. Bring back sharedstorage hooks

    rullzer authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    b0dd063 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    6ec2d12 View commit details
    Browse the repository at this point in the history
  32. ownCloud 9.1.0 beta 2

    Daniel Molkentin authored and blizzz committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    bb67acf View commit details
    Browse the repository at this point in the history