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

20513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
70937dabcd Merge pull request #11167 from owncloud/env-movetomountreenableproxy 
Reenable file proxy when renaming between mount points
 2014-09-22 16:30:19 +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
Morris Jobke
da20d71174 Merge pull request #11212 from owncloud/occ-catching-errors 
Occ catching errors
 2014-09-22 16:23:27 +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
Morris Jobke
b0e0d0d2d2 update 3rdparty submodule to its master commit 2014-09-22 13:03:43 +02:00
blizzz
b8a1340538 Merge pull request #9225 from voxsim/fix_displayNamesInGroup 
fix in displayNamesInGroup
 2014-09-22 12:13:15 +02:00
Thomas Müller
a348a6f450 no loner use deprecated class \OC_Config 2014-09-22 12:04:48 +02:00
Thomas Müller
e655d32979 remove bootstrapping - occ can by definition only be executed if ownCloud is installed - base.php is required earlier already 2014-09-22 12:00:22 +02:00
Thomas Müller
43c191fffb show upgrade errors as error in the console and report back that the upgrade process failed if it did 2014-09-22 11:59:13 +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
Volkan Gezer
d16b8c03e9 fix button text l10n 2014-09-22 09:32:03 +02:00
Jenkins for ownCloud
5aaf8dcc01 [tx-robot] updated from transifex 2014-09-22 01:54:36 -04:00
Morris Jobke
567977ec63 Merge pull request #11203 from owncloud/fix_broken_previews_on_public_page 
files_sharing: add route for ajax/publicpreview
 2014-09-21 23:07:17 +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
Jörn Friedrich Dreyer
ef6db5e9d7 add seek and tell to streamwrapper test 2014-09-21 22:47:40 +02:00
Morris Jobke
b622fa502e Merge pull request #11200 from owncloud/preview_better_errorhandling 
make sure preview prop is instanceof OC_Image before using it in showPreview
 2014-09-21 22:44:07 +02:00
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
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