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

15245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
d0265f3388 Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome 
Quota storage wrapper is now used for all users in sharing mode
 2013-11-21 06:59:50 -08:00
Bjoern Schiessle
d2e6f7d979 check HTTP Referer to check if we come from public.php or from a internal page. 
Necessary to detect public access also if a user is logged in.
 2013-11-21 15:57:49 +01:00
Morris Jobke
3e1ade4397 Merge pull request #5988 from owncloud/files-mobilequickfix 
Added min width to files table
 2013-11-21 06:09:11 -08:00
Thomas Müller
418a9b11c4 Merge pull request #5983 from owncloud/fixing-l10n-again-master 
Fixing l10n again master
 2013-11-21 06:02:53 -08:00
Vincent Petry
14ad1ebf53 Added min width to files table 
Having a too small widths for the files table doesn't make sense as it
overlaps file actions with the files themselves and make them
unclickable, especially when viewed on mobile phone.

The compromise that this fix introduces is to have a minimum width that
will trigger horizontal scrolling, which will at least make it possible
to click files on mobile phones.
 2013-11-21 14:45:24 +01:00
Thomas Müller
cd1cf58875 Fixing the warning notifications 2013-11-21 14:44:25 +01:00
blizzz
a20c6049c3 Merge pull request #5979 from owncloud/fix5881 
LDAP Wizard: add objectclass for group detection in Zimbra
 2013-11-21 04:03:33 -08:00
Vincent Petry
bd50ed0ded Merge pull request #5980 from owncloud/public_view_fixes 
Public view fixes
 2013-11-21 04:01:14 -08:00
Vincent Petry
69e8e7dbd5 Now using the "Home" storage detection approach for quota 
To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
 2013-11-21 12:17:47 +01:00
Bjoern Schiessle
9d16353e09 disable trahs in files_sharing/public.php 2013-11-21 12:06:35 +01:00
Vincent Petry
356eef0739 Quota storage wrapper is now used for all users in sharing mode 
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
 2013-11-21 12:04:54 +01:00
Bjoern Schiessle
c9646ddc4c fix undefined index errors if public share view 2013-11-21 12:03:27 +01:00
Arthur Schiwon
dd5e1092c7 LDAP Wizard: add objectclass for group detection in Zimbra 2013-11-21 11:20:31 +01:00
Bjoern Schiessle
87f2696e6a Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 11:18:53 +01:00
Bjoern Schiessle
c7dc6dc2c2 fix getFileKey() call 2013-11-21 11:11:15 +01:00
Bjoern Schiessle
009bbef17e Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 10:34:25 +01:00
Bjoern Schiessle
16b484209c Merge branch 'master' into encryption_work_with_public_gallery 
Conflicts:
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/crypt.php
 2013-11-21 10:33:37 +01:00
Bjoern Schiessle
18c80e47b6 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 
Conflicts:
	apps/files_encryption/lib/stream.php
 2013-11-21 10:24:47 +01:00
Vincent Petry
391f267d38 Merge pull request #5897 from hkjolhede/master 
Fixed error-checking error in sftp.php
 2013-11-21 01:22:05 -08:00
Vincent Petry
19af45c7d1 Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfix 
Fixed move operation to pass the whole URL as expected
 2013-11-21 01:20:19 -08:00
Bjoern Schiessle
2b361ea085 better distinction between userID and keyId 2013-11-21 10:09:07 +01:00
Thomas Müller
f2fe47bc21 fixing spelling and restructure sentence 2013-11-21 09:59:21 +01:00
Thomas Müller
02b92137b3 unify translation string - less work for the translators 2013-11-21 09:58:35 +01:00
Bjoern Schiessle
b27fc42e1f public upload now also works with encryption enabled 2013-11-21 00:23:38 +01:00
Bjoern Schiessle
318db64b2d adapt tests to the new code 2013-11-20 23:27:42 +01:00
Bjoern Schiessle
b9c18d16fe make sure that we always use the correct user id 2013-11-20 23:23:23 +01:00
Bjoern Schiessle
e11afd3066 fix some getShareKey() and getFileKey() calls 2013-11-20 22:44:23 +01:00
Frank Karlitschek
c2ccf4a6b3 beta 5 is here 2013-11-20 19:30:30 +01:00
Vincent Petry
e26500045f Fixed move operation to pass the whole URL as expected 
The MOVE and COPY spec expect the "Destination" header to receive the
full URL, not only the root.

Fixes #5942
 2013-11-20 18:59:02 +01:00
Bjoern Schiessle
c5cb4206f5 [wip] make encryption work with public gallery sharing 2013-11-20 18:10:56 +01:00
Vincent Petry
5de5c317c1 Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset 
Fix for extstorage + encryption where unencrypted size is not kept
 2013-11-20 09:04:37 -08:00
Vincent Petry
a88aec8a5c Merge pull request #5965 from owncloud/mimetype-only-path 
Change default mimetype detection for storage backends to only use filename
 2013-11-20 08:11:41 -08:00
blizzz
8f33286b19 Merge pull request #5966 from owncloud/fixing-fileid-webdav-master 
always get the right node for the given file path
 2013-11-20 07:51:47 -08:00
Vincent Petry
c221e8272c Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted 
only check if the key file exists to decide if it is an encrypted file or not
 2013-11-20 07:32:43 -08:00
Vincent Petry
fe44024868 Fix for extstorage + encryption where unencrypted size is not kept 
Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
 2013-11-20 16:22:55 +01:00
Thomas Müller
51a8172868 always get the right node for the given file path 2013-11-20 16:14:08 +01:00
Arthur Schiwon
ce1318c9f1 LDAP Wizard: clear the cache on save so changes have immediate effect 2013-11-20 15:56:25 +01:00
Robin Appelman
a0d570b4cc Change default mimetype detection for storage backends to only use filename 2013-11-20 15:25:29 +01:00
Bjoern Schiessle
b4e7258a04 Merge branch 'master' into encryption_check_if_file_is_encrypted 2013-11-20 14:45:04 +01:00
Vincent Petry
30b8f4ec8e Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition 
Fixed getLocalFile() condition for x-send-file
 2013-11-20 05:42:21 -08:00
Vincent Petry
726a202cdb Fixed getLocalFile() condition for x-send-file 
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.

Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.

This commit fixes both issues.
 2013-11-20 14:33:59 +01:00
Bjoern Schiessle
f3e2a63712 check if it is a cached file or a version to resolve the correct path to the file key 2013-11-20 12:34:23 +01:00
Bjoern Schiessle
caf486d6e7 - show a spinner while decrypting files if the encryption app was disabled 
- don't fade-out the decryption result
 2013-11-20 12:23:10 +01:00
Bjoern Schiessle
0c24c7c420 only check if the key file exists to decide if it is an encrypted file or not. 
This solves problems with external storage which doesn't support fseek
 2013-11-20 11:02:22 +01:00
Arthur Schiwon
ff9ecc8a51 LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired. 2013-11-19 23:58:08 +01:00
Frank Karlitschek
8bc339413b Merge pull request #5926 from owncloud/less-bold 
remove bold from legend, table header, label - less obtrusive
 2013-11-19 13:57:21 -08:00
blizzz
93ff86e31f Merge pull request #5951 from owncloud/ldap_encryption_fix 
fix encryption with LDAP, make sure that the owners home is mounted correctly
 2013-11-19 13:51:12 -08:00
Bjoern Schiessle
b823505bd1 make sure that the owners home is mounted correctly 2013-11-19 18:28:51 +01:00
Vincent Petry
5f6f78ee03 Merge pull request #5878 from owncloud/extstorage-smb 
[SMB] Fix stat and unlink
 2013-11-19 06:13:25 -08:00
Vincent Petry
5b6d1d79d0 Fixed SMB file deletion success detection 
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.

Fixes #5866
 2013-11-19 15:05:11 +01:00