]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Thu, 25 Feb 2016 20:41:29 +0000 (21:41 +0100)]
Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rules
Exclude ocs-provider from rewrite rule
Lukas Reschke [Thu, 25 Feb 2016 17:47:09 +0000 (18:47 +0100)]
Exclude ocs-provider from rewrite rule
Otherwise `localhost/ocs-provider/` cannot be accessed if mod_rewrite is install
ed. Only affects master.
Thomas Müller [Thu, 25 Feb 2016 15:58:00 +0000 (16:58 +0100)]
Merge pull request #22644 from owncloud/external-share-manager
inject the correct external share manager into the storage
Thomas Müller [Thu, 25 Feb 2016 15:56:19 +0000 (16:56 +0100)]
Merge pull request #21854 from owncloud/fix-share-hook-group-add
Fix addUserToGroup hook of the share code
Thomas Müller [Thu, 25 Feb 2016 15:55:36 +0000 (16:55 +0100)]
Merge pull request #22628 from owncloud/fix-thrashbin-cronjob
Skip users with no trashbin
Thomas Müller [Thu, 25 Feb 2016 15:55:17 +0000 (16:55 +0100)]
Merge pull request #22611 from owncloud/add-uid-on-hover
Add the uid on hover for sharing autocomplete
Robin Appelman [Thu, 25 Feb 2016 12:33:42 +0000 (13:33 +0100)]
inject the correct external share manager into the storage
Thomas Müller [Thu, 25 Feb 2016 13:36:00 +0000 (14:36 +0100)]
Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
Thomas Müller [Thu, 25 Feb 2016 13:35:39 +0000 (14:35 +0100)]
Merge pull request #22604 from owncloud/fix-google-drive-encryption
Copy into local file
Thomas Müller [Thu, 25 Feb 2016 13:35:24 +0000 (14:35 +0100)]
Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault
Disable sharing by default for external storage mounts
Thomas Müller [Thu, 25 Feb 2016 13:35:06 +0000 (14:35 +0100)]
Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
take the first result of that array, if present. Fixes 2nd display na…
Thomas Müller [Thu, 25 Feb 2016 13:34:48 +0000 (14:34 +0100)]
Merge pull request #22579 from owncloud/fix_broken_unencrypted_size
Heal unencrypted file sizes at download time (second approach)
Morris Jobke [Thu, 25 Feb 2016 11:54:48 +0000 (12:54 +0100)]
Merge pull request #22639 from owncloud/dont-show-pcntl-warning
Don't show PCNTL warning if --no-warnings is passed
Vincent Petry [Thu, 25 Feb 2016 10:18:30 +0000 (11:18 +0100)]
Tweak tooltip style for recipients
Lukas Reschke [Thu, 25 Feb 2016 09:12:31 +0000 (10:12 +0100)]
More error handling
Morris Jobke [Thu, 25 Feb 2016 09:05:34 +0000 (10:05 +0100)]
Don't show PCNTL warning if --no-warnings is passed
* fixes owncloud/updater#252
Lukas Reschke [Tue, 23 Feb 2016 16:53:19 +0000 (17:53 +0100)]
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 => :bomb:
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 https://github.com/owncloud/core/commit/
d608c37c90c308d0518d854de908ec4be5f462dc 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
Jenkins for ownCloud [Thu, 25 Feb 2016 06:58:06 +0000 (01:58 -0500)]
[tx-robot] updated from transifex
Arthur Schiwon [Tue, 23 Feb 2016 14:12:01 +0000 (15:12 +0100)]
take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled.
Lukas Reschke [Wed, 24 Feb 2016 18:49:03 +0000 (19:49 +0100)]
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
Lukas Reschke [Wed, 24 Feb 2016 18:48:47 +0000 (19:48 +0100)]
Add proxy support to external storage
Otherwise debugging issues is a PITA
Victor Dubiniuk [Wed, 24 Feb 2016 15:08:45 +0000 (18:08 +0300)]
Skip users with no trashbin
Vincent Petry [Tue, 23 Feb 2016 14:16:13 +0000 (15:16 +0100)]
Disable sharing by default for external storage mounts
This is for newly created mount points.
Migrated mount points will have sharing enabled as before.
Thomas Müller [Wed, 24 Feb 2016 11:17:58 +0000 (12:17 +0100)]
Merge pull request #22593 from owncloud/swift-docker-fix
Enable upstream entrypoint changes with Ceph Docker
Thomas Müller [Wed, 24 Feb 2016 11:16:38 +0000 (12:16 +0100)]
Merge pull request #22612 from owncloud/davclient-update-headers
Update davclient.js for headers fix
Thomas Müller [Wed, 24 Feb 2016 11:15:32 +0000 (12:15 +0100)]
Merge pull request #22592 from owncloud/fix-response-header
Add header for attachment disposition only once
Thomas Müller [Wed, 24 Feb 2016 11:15:23 +0000 (12:15 +0100)]
Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids
Make sure we can store strings as per the interface
Thomas Müller [Wed, 24 Feb 2016 11:14:39 +0000 (12:14 +0100)]
Merge pull request #22565 from owncloud/avoid-scanning-root-storage
Avoids scanning the root storage
Thomas Müller [Wed, 24 Feb 2016 11:14:22 +0000 (12:14 +0100)]
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
Vincent Petry [Wed, 24 Feb 2016 09:09:54 +0000 (10:09 +0100)]
Update davclient.js for headers fix
Joas Schilling [Wed, 24 Feb 2016 08:57:02 +0000 (09:57 +0100)]
Add the uid on hover for sharing autocomplete
Thomas Müller [Tue, 23 Feb 2016 15:08:14 +0000 (16:08 +0100)]
Merge pull request #20876 from owncloud/reproducing-test-for-20686
Behat test for update of a shared file
Bjoern Schiessle [Mon, 22 Feb 2016 16:28:53 +0000 (17:28 +0100)]
recalculate unencrypted size if we assume that the size stored in the db is not correct
Thomas Müller [Tue, 23 Feb 2016 14:02:08 +0000 (15:02 +0100)]
Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries
Allow defining a limit and offset for getObjectIdsForTags
Morris Jobke [Tue, 23 Feb 2016 13:53:12 +0000 (14:53 +0100)]
Drop unneeded use statements
Morris Jobke [Tue, 1 Dec 2015 15:49:40 +0000 (16:49 +0100)]
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
Robin McCorkell [Tue, 23 Feb 2016 11:52:05 +0000 (11:52 +0000)]
Enable upstream entrypoint changes with Ceph Docker
Lukas Reschke [Tue, 23 Feb 2016 10:54:22 +0000 (11:54 +0100)]
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
Thomas Müller [Tue, 23 Feb 2016 09:48:38 +0000 (10:48 +0100)]
Merge pull request #22582 from owncloud/case-insensitive-contact-search
Case insensitive contact search
Thomas Müller [Tue, 23 Feb 2016 09:47:55 +0000 (10:47 +0100)]
Merge pull request #22586 from owncloud/be-verbose-when-something-fails-on-ci
Add verbose flag to occ commands of autotest*
Thomas Müller [Tue, 23 Feb 2016 09:36:34 +0000 (10:36 +0100)]
Merge pull request #22516 from owncloud/core-cumulativenotifications
Accumulate notifications instead of blinking
Thomas Müller [Tue, 23 Feb 2016 09:23:03 +0000 (10:23 +0100)]
Merge pull request #22551 from owncloud/make-exceptions-easier-to-debug
Throw normal exceptions instead of eating them
Joas Schilling [Tue, 23 Feb 2016 08:27:52 +0000 (09:27 +0100)]
Add verbose flag to occ commands of autotest*
Joas Schilling [Mon, 22 Feb 2016 14:47:23 +0000 (15:47 +0100)]
Fix dav unit tests
Joas Schilling [Mon, 22 Feb 2016 14:19:09 +0000 (15:19 +0100)]
Allow defining a limit and offset for getObjectIdsForTags
Joas Schilling [Tue, 23 Feb 2016 07:50:52 +0000 (08:50 +0100)]
Make sure we don't quote column names twice
Thomas Müller [Mon, 22 Feb 2016 19:20:33 +0000 (20:20 +0100)]
Merge pull request #22581 from owncloud/fix_interface
since 9.0 we have a additional parameter $position used for integrity…
Thomas Müller [Mon, 22 Feb 2016 18:47:10 +0000 (19:47 +0100)]
Case insensitive search in contacts - fixes #22575
Thomas Müller [Mon, 22 Feb 2016 18:46:37 +0000 (19:46 +0100)]
Add ILIKE support to querybuilder
Thomas Müller [Mon, 22 Feb 2016 17:39:10 +0000 (18:39 +0100)]
Merge pull request #22570 from owncloud/make-method-non-public
Make FilesReportPlugin::processFilterRules non-public
Bjoern Schiessle [Mon, 22 Feb 2016 17:24:54 +0000 (18:24 +0100)]
since 9.0 we have a additional parameter $position used for integrity checks
Vincent Petry [Mon, 22 Feb 2016 16:25:16 +0000 (17:25 +0100)]
Remove unused update-notification style
Vincent Petry [Mon, 22 Feb 2016 16:19:08 +0000 (17:19 +0100)]
Fix unit tests affected by side effects
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.
Since now we're restoring the clock properly, the other tests were fixed
to still work.
Vincent Petry [Fri, 19 Feb 2016 11:09:46 +0000 (12:09 +0100)]
Accumulate notifications instead of blinking
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
Morris Jobke [Mon, 22 Feb 2016 13:30:32 +0000 (14:30 +0100)]
Avoids scanning the root storage
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.
Fixes #22501
Joas Schilling [Mon, 22 Feb 2016 14:41:21 +0000 (15:41 +0100)]
Make sure we can store strings as per the interface
Joas Schilling [Mon, 22 Feb 2016 14:26:59 +0000 (15:26 +0100)]
Make non-public-method protected
Thomas Müller [Mon, 22 Feb 2016 13:15:12 +0000 (14:15 +0100)]
Merge pull request #22527 from wern/master
Moved set -e option to enable executable checks again
Thomas Müller [Mon, 22 Feb 2016 13:14:51 +0000 (14:14 +0100)]
Merge pull request #22536 from owncloud/add-integration-tests-for-tags
Add integration tests for tags plus fix permissions
Thomas Müller [Mon, 22 Feb 2016 13:14:35 +0000 (14:14 +0100)]
Merge pull request #22552 from owncloud/fix-avconv-preview-parameters
Move `-an` after the input arg because it is an output option
Thomas Müller [Mon, 22 Feb 2016 13:14:15 +0000 (14:14 +0100)]
Merge pull request #22554 from owncloud/fix_22550
We should check for exceptions when trying to get the avatar
Thomas Müller [Mon, 22 Feb 2016 13:13:59 +0000 (14:13 +0100)]
Merge pull request #22555 from owncloud/jenkins-19978
Show username when writing "Insufficient storage" into owncloud.log
Thomas Müller [Mon, 22 Feb 2016 13:13:42 +0000 (14:13 +0100)]
Merge pull request #22561 from owncloud/ie-publicpagefooter
Fix public page footer position in IE
Vincent Petry [Mon, 22 Feb 2016 10:26:50 +0000 (11:26 +0100)]
Fix public page footer position in IE
The content element needs hasLayout, so triggering it with a display
attribute.
Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
Vincent Petry [Mon, 22 Feb 2016 09:29:10 +0000 (10:29 +0100)]
Merge pull request #22548 from owncloud/fix-pagination-in-ie
Fixes pagination in IE
Roeland Jago Douma [Mon, 22 Feb 2016 08:55:29 +0000 (09:55 +0100)]
We should check for exceptions when trying to get the avatar
Fixes #22550
* Updated phpdoc of avatatmanager
* Add unit test
Pierre Jochem [Thu, 22 Oct 2015 13:46:33 +0000 (15:46 +0200)]
Solution for Proposal #19974
Show username when writing into owncloud.log
Lukas Reschke [Mon, 22 Feb 2016 08:41:56 +0000 (09:41 +0100)]
Throw normal exceptions instead of eating them
Partially addresses https://github.com/owncloud/core/issues/22550
Replaces https://github.com/owncloud/core/pull/20185
Joas Schilling [Mon, 22 Feb 2016 08:40:46 +0000 (09:40 +0100)]
Move `-an` after the input arg because it is an output option
Joas Schilling [Mon, 22 Feb 2016 08:17:59 +0000 (09:17 +0100)]
Use the notification instead of the disruptive popup
Morris Jobke [Mon, 22 Feb 2016 07:55:20 +0000 (08:55 +0100)]
Fixes pagination in IE
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
Thomas Müller [Sat, 20 Feb 2016 23:03:22 +0000 (00:03 +0100)]
Merge pull request #22526 from owncloud/fix-english-texts
Fix error in source language strings
Lukas Reschke [Fri, 19 Feb 2016 18:45:03 +0000 (19:45 +0100)]
Check if user has permission to create such a tag
Fixes https://github.com/owncloud/core/issues/22512
Lukas Reschke [Fri, 19 Feb 2016 17:08:21 +0000 (18:08 +0100)]
Add integration tests for tags
Lukas Reschke [Fri, 19 Feb 2016 17:10:30 +0000 (18:10 +0100)]
Merge pull request #22511 from owncloud/add-integration-tests-for-comments
Add integration tests for comments
Lukas Reschke [Thu, 18 Feb 2016 22:07:41 +0000 (23:07 +0100)]
Add integration tests for comments
This adds integration tests for the comments. Especially with regard to the permission handling, didn't find any problem in it.
Fixes https://github.com/owncloud/core/issues/22367
Thomas Müller [Fri, 19 Feb 2016 15:17:37 +0000 (16:17 +0100)]
Merge pull request #22529 from owncloud/tags-style
improve tags interface styling
Thomas Müller [Fri, 19 Feb 2016 15:07:43 +0000 (16:07 +0100)]
Merge pull request #22503 from owncloud/issue_22500
When (re-)sharing an incomming federated share set the corrent owner
Thomas Müller [Fri, 19 Feb 2016 15:06:55 +0000 (16:06 +0100)]
Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename
Check delete permission before attemping copy+delete
Thomas Müller [Fri, 19 Feb 2016 15:06:40 +0000 (16:06 +0100)]
Merge pull request #22410 from owncloud/fix_22119
Do not copy skeleton on avatar access
Jan-Christoph Borchardt [Fri, 19 Feb 2016 14:40:10 +0000 (15:40 +0100)]
improve tags interface styling
Andreas Schubert [Fri, 19 Feb 2016 14:16:04 +0000 (15:16 +0100)]
moved set -e after executable checking with which as old position off set -e stopped the script at this point without any error message
Thomas Müller [Fri, 19 Feb 2016 14:04:16 +0000 (15:04 +0100)]
Fix error ins source language strings
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/core/
50786279
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/settings-1/
50555028
Thomas Müller [Fri, 19 Feb 2016 13:44:02 +0000 (14:44 +0100)]
Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint
Add FilesPlugin
Thomas Müller [Fri, 19 Feb 2016 12:35:32 +0000 (13:35 +0100)]
Merge pull request #22521 from owncloud/mssql-is-not-support-since-ages
Remove old adapter - mssql is not supported
Thomas Müller [Fri, 19 Feb 2016 12:33:16 +0000 (13:33 +0100)]
Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url
Fix old calendar dav urls
Thomas Müller [Fri, 19 Feb 2016 12:32:52 +0000 (13:32 +0100)]
Merge pull request #22218 from owncloud/occ-no-extra-messages
Add global --no-warnings option to occ…
Joas Schilling [Fri, 19 Feb 2016 12:16:43 +0000 (13:16 +0100)]
Remove old adapter - mssql is not supported
Bjoern Schiessle [Fri, 19 Feb 2016 12:15:09 +0000 (13:15 +0100)]
make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers
Vincent Petry [Fri, 19 Feb 2016 11:59:10 +0000 (12:59 +0100)]
Check delete permission before attemping copy+delete
Some move operations when cross-storage will be replaced by copy and
delete. Before attempting this, first check whether the source storage
has delete permissions.
This also prevents renaming system-wide external storages.
Roeland Jago Douma [Thu, 18 Feb 2016 12:38:38 +0000 (13:38 +0100)]
When (re-)sharing an incomming federated share set the corrent owner
Incomming federated shares are a special kind. We mount them as normal
webdav shares but we do supply owner info with the federated cloud id of
the share owner.
Since we do not yet have the new resharing behaviour on federated shares
we need to set the correct owner. Which will allow sharing and proper
mounting for other users.
fixes #22500
Thomas Müller [Thu, 18 Feb 2016 19:11:59 +0000 (20:11 +0100)]
Add FilesPlugin - fixes #22507
Thomas Müller [Fri, 19 Feb 2016 11:36:56 +0000 (12:36 +0100)]
Merge pull request #22515 from owncloud/webdav_checksum_only_for_files
Only add checksum headers for 'real' files
Thomas Müller [Fri, 19 Feb 2016 11:36:21 +0000 (12:36 +0100)]
Merge pull request #22487 from owncloud/hidden-text-for-information
Add hidden text to issue templates
Thomas Müller [Fri, 19 Feb 2016 11:36:11 +0000 (12:36 +0100)]
Merge pull request #22472 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
Joas Schilling [Mon, 15 Feb 2016 10:52:51 +0000 (11:52 +0100)]
Add correct principals for the current user before ACL check
Joas Schilling [Fri, 12 Feb 2016 13:38:43 +0000 (14:38 +0100)]
Convert the old principal to the new principal before getting calendars
Thomas Müller [Fri, 19 Feb 2016 11:33:19 +0000 (12:33 +0100)]
Merge pull request #22198 from owncloud/birthday-calendar
Sync a users contacts birthday to the users birthday calendar
Roeland Jago Douma [Fri, 19 Feb 2016 09:56:43 +0000 (10:56 +0100)]
Only add checksum headers for files
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
Roeland Jago Douma [Fri, 19 Feb 2016 08:43:20 +0000 (09:43 +0100)]
Fix even more