Commit Graph

27758 Commits

Author SHA1 Message Date
Thomas Müller 3413b76631 Merge pull request #18128 from owncloud/share-groupchangeetagpropagation
Propagate shares etag when group membership changed
2015-10-06 16:28:49 +02:00
Jörn Friedrich Dreyer 5646e39248 test objectstore with ceph docker
use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
2015-10-06 16:27:25 +02:00
Robin Appelman c2d76d2010 fix internal path when searching in storage root 2015-10-06 15:54:17 +02:00
Robin Appelman e28a2ff888 Add unit test for searching in storage root 2015-10-06 15:54:17 +02:00
Olivier Paroz 3173ed29df The minimum size for internalRootLength is 1 2015-10-06 15:54:17 +02:00
Thomas Müller bb4246c9a8 Merge pull request #19207 from RealRancor/fix_mount.json_dir
Path to mount.json needs to be absolute in config.sample.php
2015-10-06 15:31:49 +02:00
Morris Jobke 285e73ac72 validate HTTP protocol in case of an exception 2015-10-06 15:25:31 +02:00
Lukas Reschke 6a4f22c61f Use `/` if installed in main folder
Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour.

Fixes https://github.com/owncloud/core/issues/19196
2015-10-06 15:24:19 +02:00
Thomas Müller 932e64f77f Merge pull request #19602 from owncloud/allow-certificate-import
Fix importing of certificates
2015-10-06 15:23:27 +02:00
Thomas Müller 79524ce163 Merge pull request #19605 from owncloud/add-get-http-protocol
Add \OCP\IRequest::getHttpProtocol
2015-10-06 15:23:00 +02:00
Joas Schilling 13dd62f7b0 Make sure that remote shares use the correct uid casing 2015-10-06 15:16:19 +02:00
Vincent Petry d546c5bb59 Propagate shares etag when group membership changed 2015-10-06 15:02:22 +02:00
Thomas Müller 191f1b2d49 Merge pull request #19603 from owncloud/fix-invalid-class-usage
OC_Log not longer exists
2015-10-06 14:46:02 +02:00
Lukas Reschke 80a232da6a Add \OCP\IRequest::getHttpProtocol
Only allow valid HTTP protocols.

Ref https://github.com/owncloud/core/pull/19537#discussion_r41252333 + https://github.com/owncloud/security-tracker/issues/119
2015-10-06 14:18:46 +02:00
Thomas Müller 48ef5b6b3b OC_Log not longer exists 2015-10-06 14:18:22 +02:00
Lukas Reschke 6c798889a5 Only show import button if user storages are allowed 2015-10-06 14:06:22 +02:00
Lukas Reschke 384c6fd3ac Fix importing of certificates
Fixes https://github.com/owncloud/core/issues/19601
2015-10-06 14:00:55 +02:00
Thomas Müller 4b31b349b8 Merge pull request #19595 from owncloud/fix-versions-log-entry
Reset to auto if not set
2015-10-06 13:45:35 +02:00
Robin Appelman 47c71d8e87 use microtime 2015-10-06 13:00:30 +02:00
Thomas Müller 6651aa19ea Merge pull request #19526 from owncloud/issue-16251-reload-app-settings-when-app-needs-update
Reload the page when an app needs an update after being enabled
2015-10-06 12:36:32 +02:00
Thomas Müller 319e61f0ea Merge pull request #19407 from owncloud/lock-zip-content
Lock zip content
2015-10-06 11:47:43 +02:00
Robin Appelman 41f9946272 clear hooks for tests 2015-10-06 11:38:41 +02:00
Robin Appelman 0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +02:00
Morris Jobke 999196b9fb fix wording 2015-10-06 11:35:08 +02:00
Thomas Müller d9ffb09479 Merge pull request #19452 from owncloud/ocs_provisioning_api_more_tests
OCS provisioning API more tests
2015-10-06 11:19:48 +02:00
Thomas Müller 0385a62363 Merge pull request #19597 from owncloud/update-license-headers
update licence headers via script
2015-10-06 11:18:35 +02:00
Bjoern Schiessle 14497ecfac improved explanation of server side encryption 2015-10-06 11:02:38 +02:00
Roeland Jago Douma b0babfc847 [Intergration] Throw error if exception not thrown 2015-10-06 10:30:31 +02:00
Sergio Bertolin 6e5aae2608 added a couple of tests 2015-10-06 10:30:31 +02:00
Sergio Bertolin 0c1a657282 restored assertions in existance of users and groups 2015-10-06 10:30:31 +02:00
Sergio Bertolin fd709b4b49 Being explicit between http and ocs return codes 2015-10-06 10:30:31 +02:00
Sergio Bertolin ac478b1910 added edit user test 2015-10-06 10:30:31 +02:00
Sergio Bertolin 0e3836ed48 Return the actual ocs return codes and check it 2015-10-06 10:30:31 +02:00
Sergio Bertolin 186aff5dea added some deletion logic 2015-10-06 10:30:31 +02:00
Sergio Bertolin 7c63a6baa6 added some deletion logic 2015-10-06 10:30:31 +02:00
Sergio Bertolin 583c082acf added some group logic 2015-10-06 10:30:31 +02:00
Morris Jobke b05422544d Fixes last causes for WSOD
* print plain text if rendering of exception/error page is not possible
2015-10-06 10:20:53 +02:00
Morris Jobke 8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Thomas Müller da640adf68 Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotingroup
Remove invalid share items from result when missing group membership
2015-10-06 09:24:22 +02:00
Thomas Müller 822e8fbfe1 Merge pull request #19535 from owncloud/check-memcache-module
[admin] check for correct PHP memcached module
2015-10-06 09:24:03 +02:00
Thomas Müller 26b92c406c Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sharing-subfile
Make sure the share we found is for the same item
2015-10-06 09:23:44 +02:00
Thomas Müller 1525ef43f9 Merge pull request #18484 from owncloud/fix-17964
Remove whitespace from base-DNs
2015-10-06 09:23:24 +02:00
Morris Jobke b519965408 [admin] check for correct PHP memcached module 2015-10-06 08:51:47 +02:00
Jenkins for ownCloud 3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke 264d123396 Use OC.Dialogs for modal reload message 2015-10-05 22:07:24 +02:00
Joas Schilling 69d68fbe8e Reload the page when an app needs an update after being enabled 2015-10-05 22:07:24 +02:00
Thomas Müller 0577eed14e Merge pull request #18883 from owncloud/encryption-move-same-storage
use a normal rename when moving from the same storage in the encryption wrapper
2015-10-05 22:02:33 +02:00
Thomas Müller ea72d90617 Merge pull request #19553 from owncloud/properly_format_date_shareview
Use DD-MM-YYYY consistently in share sidebar
2015-10-05 22:02:12 +02:00
Thomas Müller 94c0cc1bb3 Merge pull request #19590 from owncloud/compactmode-sidebarfullscreen
Make sidebar properly fullscreen in mobile/compact mode
2015-10-05 22:01:41 +02:00
Roeland Douma 97bade9108 Merge pull request #19558 from owncloud/sharing_sidebar_toggle_enforcedpass
Do not remove linkshare if there is none
2015-10-05 21:40:37 +02:00