Commit Graph

15313 Commits

Author SHA1 Message Date
Arthur Schiwon 54f0deff2a LDAP: get user photo from LDAP and set it as avatar if available 2013-11-22 13:25:20 +01:00
Raghu Nayyar c503588827 Merge pull request #6000 from owncloud/use_relative_path_to_create_images
use relative paths to create images from a file.
2013-11-22 03:52:40 -08:00
blizzz 2f73db12bb Merge pull request #5040 from owncloud/public_api_avatar_master
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
Thomas Müller 92c8672c0f fixing PHPDoc comments and syntax 2013-11-22 12:34:37 +01:00
Bjoern Schiessle 3488f0b77a use relative paths to create images from a file. This way it also works if
no user is logged in (e.g. public gallery share)
2013-11-22 12:26:01 +01:00
Thomas Müller 14e7075030 we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00
Thomas Müller c22019dec5 Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that 2013-11-22 12:20:06 +01:00
Jenkins for ownCloud 60cfdae503 [tx-robot] updated from transifex 2013-11-21 21:07:12 -05:00
Arthur Schiwon f94a6eb166 Add missing Avatar Interface 2013-11-22 00:43:23 +01:00
Arthur Schiwon 00071401d7 Round out Avatar Public API 2013-11-21 23:40:25 +01:00
raghunayyar aa5d5a422f Doesn't Cut the top arrow from navigation 2013-11-22 02:10:22 +05:30
Vincent Petry 3b48d23478 Merge pull request #5970 from owncloud/extstorage-webdavdotdirfix
Fixed path normalization to prevent dot dirs
2013-11-21 09:01:47 -08:00
Vincent Petry 476d8e6de0 Added unit test for root mount point validation 2013-11-21 17:26:13 +01:00
Vincent Petry 0b2c9b823c Prevent using root as mount point for external storage
Fixes #5981
2013-11-21 17:22:12 +01:00
Thomas Müller 4a2f9636cf Merge pull request #5773 from owncloud/fix-2152-master
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
Vincent Petry 39cbdca429 Fixed path normalization to prevent dot dirs
Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir
(only in older versions)
2013-11-21 16:07:01 +01:00
Jenkins for ownCloud 5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Bjoern Schiessle 6443e570c2 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 16:00:21 +01:00
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