wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20487 commits 157 branches 562 tags 714 MiB
Commit graph

7330 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
561a7e47cd return boolean in Ciose::stream_seek 2014-09-22 11:33:55 +02:00
Jörn Friedrich Dreyer
b752cb98d8 return boolean in OC::stream_seek 2014-09-22 11:20:15 +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
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
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
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
Jenkins for ownCloud
dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04: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
c19bc1917b Move basic auth check 
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.

Fixes https://github.com/owncloud/core/issues/11129
 2014-09-17 16:04:12 +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
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