Commit graph

27565 commits

Author SHA1 Message Date
Joas Schilling
336a127426 Catch "missing table" exception when cleaning up locks 2015-10-08 11:37:51 +02:00
Thomas Müller
33cf1c3c92 Merge pull request #19640 from owncloud/fix-zip-downloads-32-bit-os
Only use zip64 when we have 64 bit php
2015-10-08 10:29:54 +02:00
Joas Schilling
e6d9869cf7 Only use zip64 when we have 64 bit php 2015-10-08 09:13:08 +02:00
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Thomas Müller
b2872ef759 Merge pull request #19589 from owncloud/shares-external-mount-provider
Move the setup of external share mounts to a mountprovider
2015-10-07 17:46:33 +02:00
Thomas Müller
c8021441d0 Merge pull request #19489 from owncloud/fix-18297
fix possible infinite loop when reading groups in the wizard
2015-10-07 14:55:48 +02:00
Thomas Müller
70ba594f45 Merge pull request #19537 from owncloud/fix-white-page-of-death
Fixes last causes for WSOD
2015-10-07 14:55:11 +02:00
Thomas Müller
f5c390fffd Merge pull request #19619 from owncloud/fix-19614-master
Fix single file download
2015-10-07 14:38:02 +02:00
Thomas Müller
9f25745649 Fix single file download - fixes #19614 2015-10-07 13:15:58 +02:00
Joas Schilling
937fb70757 Do not trigger the update exception when we already show an error 2015-10-07 08:07:52 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Thomas Müller
648b86abdd Merge pull request #19610 from owncloud/ext-deletestoragefromdatabase
Remove oc_storages entries after removing ext storages
2015-10-06 21:58:59 +02:00
C Montero-Luque
58b8571454 8.2 RC1 2015-10-06 13:17:12 -04:00
Robin Appelman
59cf817308 Merge pull request #19511 from owncloud/etag-share-permissions-update
Mark shares as dirty when changing permissions
2015-10-06 18:09:12 +02:00
Vincent Petry
bbebffb60c Remove oc_storages entries after removing ext storages
When removing external storages, either system-wide or user-wide,
automatically remove the matching oc_storages and oc_filecache entries.

This can only work if the backend configuration doesn't contain any
substitution variable $user in which case the storage id cannot be
computed, so this case is ignored for now.
2015-10-06 17:33:16 +02:00
Robin Appelman
17756ebf5b fix phpdoc 2015-10-06 16:37:43 +02:00
Robin Appelman
d3c1fcf961 Fix getEtag for roots of shared storages 2015-10-06 16:33:37 +02:00
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
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
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
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
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