Commit Graph

30713 Commits

Author SHA1 Message Date
Thomas Müller cb41b1a863 Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508
Before installing new shipped apps we need to load authentication apps
2016-02-25 21:43:32 +01:00
Thomas Müller 290f159a97 Merge pull request #22653 from owncloud/integration-tests-for-dav-csrf
Add integration test for CSRF protection on DAV
2016-02-25 21:42:20 +01:00
Thomas Müller 84ffc4fbc4 Merge pull request #22654 from owncloud/icon-fixes
add download icon for image detail view, ref gallery issue 51
2016-02-25 21:42:03 +01:00
Thomas Müller f95277481f Merge pull request #22659 from owncloud/fix-formatting
Fix formatting of response
2016-02-25 21:41:48 +01:00
Thomas Müller 04c9abf4e5 Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rules
Exclude ocs-provider from rewrite rule
2016-02-25 21:41:29 +01:00
Lukas Reschke 8b8dcca6c5 Fix typo 2016-02-25 19:55:28 +01:00
Lukas Reschke 0e19c6a3a0 Fix formatting of response
The elements are expected to be within a `service` array as per specification.
2016-02-25 19:05:05 +01:00
Lukas Reschke 0a624c0f1e Exclude ocs-provider from rewrite rule
Otherwise `localhost/ocs-provider/` cannot be accessed if mod_rewrite is install
ed. Only affects master.
2016-02-25 18:47:09 +01:00
Lukas Reschke 5780ba611e Add integration test for CSRF protection on DAV
This adds the integration tests for the CSRF protection on the DAV backend introduced with 9.0.

Fixes https://github.com/owncloud/core/issues/22598
2016-02-25 17:54:27 +01:00
Jan-Christoph Borchardt 91b0c4325d add download icon for image detail view, ref gallery issue 51 2016-02-25 17:26:03 +01:00
Thomas Müller 3772a8acdb Merge pull request #22644 from owncloud/external-share-manager
inject the correct external share manager into the storage
2016-02-25 16:58:00 +01:00
Thomas Müller 776d91f3bc Merge pull request #21854 from owncloud/fix-share-hook-group-add
Fix addUserToGroup hook of the share code
2016-02-25 16:56:19 +01:00
Thomas Müller 29e3c4a60e Merge pull request #22628 from owncloud/fix-thrashbin-cronjob
Skip users with no trashbin
2016-02-25 16:55:36 +01:00
Thomas Müller 35423102af Merge pull request #22611 from owncloud/add-uid-on-hover
Add the uid on hover for sharing autocomplete
2016-02-25 16:55:17 +01:00
Robin Appelman f338329ddf inject the correct external share manager into the storage 2016-02-25 14:49:25 +01:00
Thomas Müller 914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
Thomas Müller 202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption
Copy into local file
2016-02-25 14:35:39 +01:00
Thomas Müller 5ecf2d5987 Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault
Disable sharing by default for external storage mounts
2016-02-25 14:35:24 +01:00
Thomas Müller dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
take the first result of that array, if present. Fixes 2nd display na…
2016-02-25 14:35:06 +01:00
Thomas Müller efc966698f Merge pull request #22579 from owncloud/fix_broken_unencrypted_size
Heal unencrypted file sizes at download time (second approach)
2016-02-25 14:34:48 +01:00
Morris Jobke d64c20b191 Merge pull request #22639 from owncloud/dont-show-pcntl-warning
Don't show PCNTL warning if --no-warnings is passed
2016-02-25 12:54:48 +01:00
Vincent Petry 1add45ae6a Tweak tooltip style for recipients 2016-02-25 11:18:30 +01:00
Lukas Reschke aebb900cd4 More error handling 2016-02-25 10:12:31 +01:00
Morris Jobke 4f60ee90d6 Don't show PCNTL warning if --no-warnings is passed
* fixes owncloud/updater#252
2016-02-25 10:05:34 +01:00
Lukas Reschke 3b5ddb417c Copy into local file
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣

This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.

While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90 for the breaking change.

To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.

Fixes https://github.com/owncloud/core/issues/22590
2016-02-25 09:40:30 +01:00
Jenkins for ownCloud 32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Arthur Schiwon b9b85e32be take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-24 21:32:03 +01:00
Lukas Reschke db2ddb5441 Properly cast type
The current logic is checking whether:

1. The returned value is a boolen
2. The returned value is a string and then matches for "true"

Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP.

This change casts the data to a boolean if it is defined as boolean.

Fixes https://github.com/owncloud/core/issues/22605
Fixes https://github.com/owncloud/core/issues/22016
2016-02-24 19:58:41 +01:00
Lukas Reschke bf4a038535 Add proxy support to external storage
Otherwise debugging issues is a PITA
2016-02-24 19:48:47 +01:00
Victor Dubiniuk aac6932e92 Skip users with no trashbin 2016-02-24 18:08:45 +03:00
Vincent Petry 4829a2d421 Disable sharing by default for external storage mounts
This is for newly created mount points.

Migrated mount points will have sharing enabled as before.
2016-02-24 13:58:21 +01:00
Thomas Müller faf65e73b7 Merge pull request #22593 from owncloud/swift-docker-fix
Enable upstream entrypoint changes with Ceph Docker
2016-02-24 12:17:58 +01:00
Thomas Müller 0cd097e771 Merge pull request #22612 from owncloud/davclient-update-headers
Update davclient.js for headers fix
2016-02-24 12:16:38 +01:00
Thomas Müller 473cd97a45 Merge pull request #22592 from owncloud/fix-response-header
Add header for attachment disposition only once
2016-02-24 12:15:32 +01:00
Thomas Müller 2ec1c738d0 Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids
Make sure we can store strings as per the interface
2016-02-24 12:15:23 +01:00
Thomas Müller 4124d909b6 Merge pull request #22565 from owncloud/avoid-scanning-root-storage
Avoids scanning the root storage
2016-02-24 12:14:39 +01:00
Thomas Müller fbc5a44f77 Merge pull request #22549 from owncloud/issue-20470-yellow-warning-for-user-and-group-errors
Use the notification instead of the disruptive popup for settings/users errors
2016-02-24 12:14:22 +01:00
Vincent Petry a92cba3dbe Update davclient.js for headers fix 2016-02-24 10:09:54 +01:00
Joas Schilling edbc1060ce Add the uid on hover for sharing autocomplete 2016-02-24 09:57:02 +01:00
Thomas Müller 0d715c1184 Merge pull request #20876 from owncloud/reproducing-test-for-20686
Behat test for update of a shared file
2016-02-23 16:08:14 +01:00
Thomas Müller bfde96a623 Fix PHPDoc of OC_App::loadApps() 2016-02-23 15:57:12 +01:00
Bjoern Schiessle 834b51b83b recalculate unencrypted size if we assume that the size stored in the db is not correct 2016-02-23 15:09:46 +01:00
Thomas Müller 9a0950f10b Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries
Allow defining a limit and offset for getObjectIdsForTags
2016-02-23 15:02:08 +01:00
Morris Jobke 403f11633c Drop unneeded use statements 2016-02-23 14:53:12 +01:00
Morris Jobke 45e247594a Add a test that reproduces #20686
* user with a quota of 0 gets a file shared and can't update this file
  because the wrong quota is used to verify if the update is allowed
2016-02-23 14:50:24 +01:00
Robin McCorkell 1d8c1f5692 Enable upstream entrypoint changes with Ceph Docker 2016-02-23 11:52:05 +00:00
Lukas Reschke fc2c5fe414 Add header for attachment disposition only once
Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains.

This changeset adds the header only once and adds integration tests ensuring the correct header in future.

https://github.com/owncloud/core/issues/22577
2016-02-23 12:23:41 +01:00
Thomas Müller fae6643e6d Merge pull request #22582 from owncloud/case-insensitive-contact-search
Case insensitive contact search
2016-02-23 10:48:38 +01:00
Thomas Müller 3adb9392c5 Merge pull request #22586 from owncloud/be-verbose-when-something-fails-on-ci
Add verbose flag to occ commands of autotest*
2016-02-23 10:47:55 +01:00
Thomas Müller a3d1b2637d Merge pull request #22516 from owncloud/core-cumulativenotifications
Accumulate notifications instead of blinking
2016-02-23 10:36:34 +01:00