Commit graph

7368 commits

Author SHA1 Message Date
Jenkins for ownCloud
5ff5b7386f [tx-robot] updated from transifex 2014-09-24 01:56:46 -04:00
Lukas Reschke
75e45ac786 Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
Do not show exception to the end-user - use a proper error page instead
2014-09-23 18:36:40 +02:00
Vincent Petry
89e02e89d4 Merge pull request #7051 from owncloud/postsetupajaxcheck
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
Thomas Müller
c587a4aaa2 Merge pull request #11222 from owncloud/store-users-timezone-master
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
Thomas Müller
42fe0b9e08 Merge pull request #11241 from owncloud/use-lower-case
Use only lower-case letters
2014-09-23 12:16:58 +02:00
Lukas Reschke
5d977f97b0 Merge pull request #11032 from owncloud/harden-redirect
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Vincent Petry
e65ceb08fc Moved WebDAV and internet checks to client side JS
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server
2014-09-23 11:16:14 +02:00
Vincent Petry
fc42a64e6c Merge pull request #11226 from owncloud/kill-postsetupcheck-master
remove post setup check
2014-09-23 10:33:50 +02:00
Jenkins for ownCloud
479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Thomas Müller
37a5bff155 Merge pull request #11227 from owncloud/fix-windows-path
fixing directory seperators
2014-09-23 07:38:23 +02:00
Morris Jobke
f970c81b1e Merge pull request #11215 from owncloud/dav-throwwhendeletefailed
WebDAV now throws 403 when deletion did not work
2014-09-23 00:49:30 +02:00
Morris Jobke
051ed93e24 Merge pull request #11211 from owncloud/previewProviderSwitch
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
Lukas Reschke
1565d82b81 Use only lower-case letters
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
Lukas Reschke
6eeb905871 Do only follow HTTP and HTTPS redirects
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Thomas Müller
21412559df remove post setup check 2014-09-22 19:43:55 +02:00
Morris Jobke
9e8d2907e2 Merge pull request #11204 from owncloud/fix_oc_stream_seek
Fix oc stream seek
2014-09-22 16:25:07 +02:00
Clark Tomlinson
db72270acc fixing directory seperators 2014-09-22 10:13:46 -04:00
Lukas Reschke
ca3447fcde Add a configuration switch for enabled preview mimetypes 2014-09-22 16:09:08 +02:00
Thomas Müller
814114ab8e enhance formatDate function to accept an optional argument containing the time zone 2014-09-22 15:03:28 +02:00
Morris Jobke
831d34f084 Merge pull request #11210 from owncloud/issue/11209
Also match routes without trailing slash for files app
2014-09-22 14:04:20 +02:00
Thomas Müller
bb18fe1384 send browsers timezone back tp the server on login 2014-09-22 14:01:45 +02:00
Vincent Petry
470c25eff4 WebDAV now throws 403 when deletion did not work
Assume a permission issue whenever a file could not be deleted.

This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.
2014-09-22 13:15:17 +02:00
blizzz
b8a1340538 Merge pull request #9225 from voxsim/fix_displayNamesInGroup
fix in displayNamesInGroup
2014-09-22 12:13:15 +02:00
Jörn Friedrich Dreyer
f83689e1be in quota wrapper use === instead of ! for better readability and as in other wrappers 2014-09-22 11:35:42 +02:00
Jörn Friedrich Dreyer
561a7e47cd return boolean in Ciose::stream_seek 2014-09-22 11:33:55 +02:00
Joas Schilling
71bec60b92 Also match routes without trailing slash
Fix #11209
2014-09-22 11:22:33 +02:00
Jörn Friedrich Dreyer
b752cb98d8 return boolean in OC::stream_seek 2014-09-22 11:20:15 +02:00
Thomas Müller
b1d0a0f3bf Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
Append port to trusted domain in case it's not 80 or 443
2014-09-22 10:04:02 +02:00
Thomas Müller
8abf786af9 Merge pull request #10499 from owncloud/mkcol-headers-afterbind
Use afterBind to send fileId header for files and directories
2014-09-22 10:02:03 +02:00
Jenkins for ownCloud
5aaf8dcc01 [tx-robot] updated from transifex 2014-09-22 01:54:36 -04:00
Morris Jobke
154e848ce2 Merge pull request #11199 from owncloud/delete_bogus_previews
Delete bogus cached previews while updating
2014-09-21 22:48:21 +02:00
Georg Ehrke
071e4bfc06 make sure preview prop is instanceof OC_Image before using it in showPreview 2014-09-21 17:30:29 +02:00
Georg Ehrke
ab2554e013 delete old previews 2014-09-21 17:16:21 +02:00
Morris Jobke
69726d951e Merge pull request #11196 from owncloud/sqlite-migration-smallint-master
adding 'smallint unsigned' to type mapping for sqlite
2014-09-21 11:13:58 +02:00
Jenkins for ownCloud
a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Thomas Müller
7537d405e3 adding 'smallint unsigned' to type mapping for sqlite 2014-09-20 20:06:44 +02:00
Jenkins for ownCloud
e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Morris Jobke
463dd44d6d Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor
Throw error in showPreview instead the constructor
2014-09-19 21:39:30 +02:00
Lukas Reschke
4c6bad7f71 Merge pull request #11158 from owncloud/fix_basic_auth
Move BasicAuth check to isLoggedIn
2014-09-19 13:39:13 +02:00
Lukas Reschke
6869d2e82a Throw error in showPreview instead the constructor
This function is also used in a way such as:

```
	$preview = new \OC\Preview(\OC_User::getUser(), 'files');
	$info = \OC\Files\Filesystem::getFileInfo($file);
	if (!$always and !$preview->isAvailable($info)) {
		\OC_Response::setStatus(404);
	} else {
		$preview->setFile($file);
		$preview->setMaxX($maxX);
		$preview->setMaxY($maxY);
		$preview->setScalingUp($scalingUp);
		$preview->setKeepAspect($keepAspect);
	}
```

Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.
2014-09-19 13:26:41 +02:00
Vincent Petry
437f8c3cd5 Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
Remove old upgrade routines
2014-09-19 12:23:42 +02:00
Vincent Petry
f0186d99d2 Merge pull request #11163 from owncloud/check-for-updates-between-major-versions
Prevent updates between multiple major versions
2014-09-19 12:20:22 +02:00
Robin Appelman
33f7af9207 Merge pull request #10958 from owncloud/db-ilike
Introduce cross-db ILIKE
2014-09-19 12:07:56 +02:00
Jenkins for ownCloud
786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Lukas Reschke
a71af58535 Prevent updates between multiple major versions
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
voxsim
7a14f94ae5 1. remove sizeof($filteredUsers) > 0 as condition
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;
2014-09-18 17:50:19 +02:00
Lukas Reschke
d0d3b7457b Move BasicAuth check to "isLoggedIn()"
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
2014-09-18 16:14:07 +02:00
Lukas Reschke
a543807d85 Merge pull request #11151 from owncloud/removeOverflowingFunction
Remove unused and overflowing function
2014-09-18 15:42:36 +02:00
Robin Appelman
a85f0ae2da Fix ILIKE without wildcards for oracle 2014-09-18 15:09:57 +02:00
Lukas Reschke
f0bf46b080 Merge pull request #11130 from owncloud/moveBasicAuthCheck
Move basic auth check
2014-09-18 14:40:42 +02:00