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

20705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Georg Ehrke
9fd23d2edf files_sharing: add route for ajax/publicpreview 2014-09-21 18:21:42 +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
Morris Jobke
bdcf858eb8 Merge pull request #11184 from owncloud/typo 
fix typo. closes #11132
 2014-09-19 21:39:03 +02:00
Vincent Petry
8aca127e52 Added extra check to avoid deleting key folders 
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
 2014-09-19 19:01:02 +02:00
Volkan Gezer
01808c8c84 fix typo 2014-09-19 18:22:09 +02:00
Vincent Petry
61bb19eff0 Add myself as author 2014-09-19 17:24:12 +02:00
Lukas Reschke
fed8100177 Merge pull request #10968 from owncloud/admin-groupsselect2 
Use select2 for the groups excluded from sharing in admin page
 2014-09-19 16:50:56 +02:00
Lukas Reschke
fb033cce98 Merge pull request #11104 from owncloud/enc_create_backup_on_recovery 
[encryption] create backup from all keys before recovery
 2014-09-19 16:40:19 +02:00
Lukas Reschke
e94ec409ae Merge pull request #11171 from owncloud/fix-route 
Match more URL fragments
 2014-09-19 16:04:29 +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
Lukas Reschke
079ad18bce Merge pull request #11142 from owncloud/fix-windows 
Resolves cache tests failing if the directory length is longer than 64
 2014-09-19 13:02:22 +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
Bjoern Schiessle
a280859bf8 make sure that we really catch the files folder only 2014-09-19 11:47:18 +02:00
Bjoern Schiessle
2ee14c4734 create backup from all keys before recovery 2014-09-19 11:47:18 +02:00
Jenkins for ownCloud
786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Lukas Reschke
7956765c12 Match more URL fragments 
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
 2014-09-18 23:18:07 +02:00
Vincent Petry
f2a01dddbc Reenable file proxy when renaming between mount points 
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
 2014-09-18 19:21:04 +02:00
Morris Jobke
112e570989 Merge pull request #11141 from owncloud/update_encrytionlink 
update encryption doc link
 2014-09-18 18:19:53 +02:00
Volkan Gezer
ccaea93d6b update encryption doc link 
I don't know how we missed to update this :/

update ldap doc link
 2014-09-18 18:14:51 +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
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
Robin Appelman
6ff29f3874 Don't test for htaccess if we cant write into the datadir anyway 2014-09-18 14:23:38 +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
Morris Jobke
338db48c0b Merge pull request #9541 from owncloud/force_loading_of_encryption_app 
force loading of encryption app to show correct error
 2014-09-18 09:04:53 +02:00
Jenkins for ownCloud
dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Morris Jobke
5030f14008 Merge pull request #11136 from owncloud/fix_body_id 
Error needs to push body-id for new guest layout
 2014-09-17 23:55:53 +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
Clark Tomlinson
55d56f2f0f Resolves cache tests failing if the directory length is longer than 64 2014-09-17 16:24:43 -04:00
Lukas Reschke
7db0d55129 Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix 
Tentative fix for legacy file actions unit test side effect
 2014-09-17 18:10:49 +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
14571d4103 force loading of encryption app 2014-09-17 17:13:25 +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