Commit Graph

2103 Commits

Author SHA1 Message Date
Lukas Reschke cb002c1f6b Clarify possible preview providers for type Office
a
2014-09-24 21:21:39 +02:00
Robin Appelman f88021dbbc Don't keep the full info of all children in memory 2014-09-24 15:44:56 +02:00
Lukas Reschke 3da6b3b533 Merge pull request #11229 from kofemann/for-upstream
user/backed: use pow of two for backed action constants
2014-09-24 15:19:11 +02:00
Bjoern Schiessle 07d43df713 only add a new row if it isn't a unique share, otherwise update the existing row 2014-09-24 14:02:02 +02:00
Bjoern Schiessle 9f7b15582a fix add user to group to work with grouped shares 2014-09-24 14:02:01 +02:00
Bjoern Schiessle bd268c35f5 generateTarget() will always find a unique target 2014-09-24 14:02:01 +02: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
Tigran Mkrtchyan 276f50a1ba user/backed: use pow of two for backed action constants
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.

The old values are preserved for backward compatibility.
2014-09-23 15:18:01 +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
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
Bjoern Schiessle 9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle 89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +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
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 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
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
Thomas Müller 7537d405e3 adding 'smallint unsigned' to type mapping for sqlite 2014-09-20 20:06:44 +02: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
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
Robin Appelman a85f0ae2da Fix ILIKE without wildcards for oracle 2014-09-18 15:09:57 +02:00
Robin Appelman c8dbdc29d0 Check for writable datadir during setup 2014-09-18 14:15:52 +02:00
Robin Appelman 23dd7cb51d Don't complain about non-writable datadirs before we're installed 2014-09-18 13:33:13 +02:00
Robin Appelman 6fa3280c2a Inject config into checkserver and cleanup tests 2014-09-18 13:33:13 +02:00
Lukas Reschke d07d5915c9 Remove unused and overflowing function
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
Morris Jobke c89c6ed21d Merge pull request #11143 from owncloud/improve-404
Make 404 page easier to understand
2014-09-18 09:10:16 +02:00
Lukas Reschke 8fc1a9f5a9 Make 404 page easier to understand
Fixes https://github.com/owncloud/core/issues/11133
2014-09-17 22:57:32 +02:00
Remco Brenninkmeijer f930b356e6 Error needs to push body-id for new guest layout 2014-09-17 18:02:18 +02:00
Lukas Reschke ef0a0f5f87 Merge pull request #9554 from owncloud/fix_preview_orientation
fix orientation in image-backend, not in preview system itself
2014-09-17 17:05:47 +02:00
Robin Appelman 0c03b2bdd5 Use ILIKE in cache search 2014-09-17 16:12:54 +02:00
Lukas Reschke c88d517e88 Merge pull request #10622 from owncloud/recursive-delete-forbidden
Fix isDeletable
2014-09-17 15:36:41 +02:00
Robin Appelman 67b1ec1faf Implement ILIKE for sqlite 2014-09-17 13:47:55 +02:00
Robin Appelman 60587e9dcd Make sqlite LIKE case sensitive on default 2014-09-17 13:47:33 +02:00
Morris Jobke c6eab9aaba fix error message template 2014-09-17 13:25:50 +02:00
Lukas Reschke 6d3757f864 Do not show exception to the end-user
Log the error instead of potentially leaking sensitive information
2014-09-17 13:17:52 +02:00
Morris Jobke b644e8a5e7 Merge pull request #10932 from owncloud/issue/10926
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
Lukas Reschke 33c0d2f743 Fix mapping of relative paths 2014-09-17 11:38:10 +02:00
Robin Appelman 2f22e67570 Also check if the file itself is updatable 2014-09-17 11:35:16 +02:00
Robin Appelman d25a9a118f Check if a folder is deletable before we try to recursively delete it 2014-09-17 11:35:16 +02:00
Robin Appelman ab79caf29b Check if the parent is writable to check if a file is deletable 2014-09-17 11:35:16 +02:00
Lukas Reschke 0d37e16499 Merge pull request #11092 from owncloud/conceal_sabredav_version
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +02:00
Lukas Reschke 2cfa07049f Remove old upgrade routines
We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.
2014-09-16 20:27:52 +02:00
Lukas Reschke 368391e401 Merge pull request #11009 from owncloud/tobiasKaminsky-route
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke 4ebc11aa8d Merge pull request #11102 from owncloud/visit1985-issue_108
mysql setup: if dbuser exists try a different one (owncloud/core#108)
2014-09-16 18:54:37 +02:00
Lukas Reschke d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Thomas Müller ba445e85b2 Merge pull request #11082 from owncloud/deduplicateDependencyCheck
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
Lukas Reschke 2f10b60c9e Merge pull request #10754 from cetra3/master
Refactor internal session handler to write directly to $_SESSION
2014-09-16 15:48:19 +02:00
Thomas Müller ca35d86c5a adding ILIKE to AdapterSQLSrv 2014-09-16 15:44:21 +02:00
Robin Appelman 1771bfc2f2 Introduce cross-db ILIKE 2014-09-16 15:32:34 +02:00
tobiasKaminsky e62d5b7e55 Route for thumbnail generation
Thumbnail generation

Removed Log

Added requested changes

Added requested changes.

- Fix code style
- Add exception if file does not exist
- Switch route styling

Replaces https://github.com/owncloud/core/pull/10805

Fix codestyle

Fix codestyle

Migrate to appframework

Fix typo
2014-09-16 15:00:58 +02:00
Lukas Reschke 261d07c95c Merge pull request #11084 from owncloud/no-migration-for-mssql-master
Disable database migrations for MSSQL - scripts have to be applied manua...
2014-09-16 14:00:24 +02:00
scolebrook f31e4066de Conceal or display SabreDAV version number in browser and http response headers. 2014-09-16 13:25:44 +02:00
Lukas Reschke 5813cf32dc Deduplicate dependency checks
Some code that I also used for https://github.com/owncloud/administration/pull/11
2014-09-16 13:07:47 +02:00
Michael Göhler e6609d0970 simplify mysql user creation flow
if dbuser exists try a different one, owncloud/core#108

changed outdated comment

corrected length calculation

changed indentation for else clauses
2014-09-16 11:53:54 +02:00
Morris Jobke dd70d1b88c Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
Fix unexisting class and PHPDoc
2014-09-16 10:29:01 +02:00
Morris Jobke af52ffc5d5 Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
add y to with-aspect naming schema
2014-09-16 08:36:33 +02:00
Morris Jobke 245a0e2ad8 Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
voxsim 1366133d2b add more logic in displayNamesInGroup for big user bases 2014-09-15 18:37:54 +02:00
Lukas Reschke 4f0f7e35ca Fix unexisting class and PHPDoc
You can't add int here as hint...
2014-09-15 17:08:56 +02:00
Morris Jobke 06eb3b62c6 Merge pull request #10109 from owncloud/issue_#9793_guestlayout
Step one, open guest layout for different styles.
2014-09-15 15:15:41 +02:00
Georg Ehrke cf76933b76 add phpdoc 2014-09-15 15:10:03 +02:00
Georg Ehrke 3157d307f7 add y to with-aspect naming schema 2014-09-15 15:10:03 +02:00
Thomas Müller d824d03fe1 Disable database migrations for MSSQL - scripts have to be applied manually 2014-09-15 15:00:32 +02:00
Lukas Reschke 07b14bcd4f Merge pull request #10960 from owncloud/use-intl-module-master
use intl's native normalizer_normalize() in case the module is available
2014-09-15 14:13:30 +02:00
Raghu Nayyar 1145529584 Merge pull request #11041 from owncloud/no-size-check-on-lock-master
content size checks are not valid for LOCK
2014-09-13 00:48:52 +05:30
Lukas Reschke 5ff999d69d Return false in case one of the values is null 2014-09-12 13:34:45 +02:00
Thomas Müller 27cd30aa94 content size checks are not valid for LOCK 2014-09-12 09:42:32 +02:00
Thomas Müller 4878f7a416 Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
Add custom hex2bin implementation for 5.3
2014-09-11 15:05:36 +02:00
Lukas Reschke 7d2c521b46 Step one, open guest layout for different styles.
Conflicts:
	core/templates/layout.guest.php

Step one, open guest layout for different styles.
2014-09-11 11:41:02 +02:00
Thomas Müller 59209e0f2b use intl's native normalizer_normalize() in case the module is available 2014-09-11 10:24:31 +02:00
Lukas Reschke bfebbe47de Merge pull request #10962 from owncloud/repair_search_lucene
repair search lucene before installing
2014-09-11 10:09:43 +02:00
Lukas Reschke 1973275adc Add custom hex2bin implementation for 5.3
Fixes https://github.com/owncloud/core/issues/11004
2014-09-11 09:51:45 +02:00
kondou 18ef7bf1ed Preserve transparency when loading from a file
Fix #7148 - again :)
2014-09-10 23:49:21 +02:00