aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fixed path normalization to prevent dot dirsVincent Petry2013-11-211-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir (only in older versions)
* | | | | | | | Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-214-13/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement
| * | | | | | | | Fixing the warning notificationsThomas Müller2013-11-212-2/+10
| | | | | | | | |
| * | | | | | | | Update error messagesBart Visscher2013-11-153-4/+4
| | | | | | | | |
| * | | | | | | | Use \Patchwork\Utf8\Bootup::initLocaleBart Visscher2013-11-151-2/+2
| | | | | | | | |
| * | | | | | | | Make working en_US.UTF-8 locale a hard requirementBart Visscher2013-11-082-7/+8
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-21630-8468/+8323
| | | | | | | | |
* | | | | | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershomeVincent Petry2013-11-214-8/+94
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Quota storage wrapper is now used for all users in sharing mode
| * | | | | | | | Now using the "Home" storage detection approach for quotaVincent Petry2013-11-212-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To find out whether to apply a quota, we now try and detect whether the storage to wrap is a "Home" storage.
| * | | | | | | | Quota storage wrapper is now used for all users in sharing modeVincent Petry2013-11-213-9/+88
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #5988 from owncloud/files-mobilequickfixMorris Jobke2013-11-211-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added min width to files table
| * | | | | | | | Added min width to files tableVincent Petry2013-11-211-0/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #5983 from owncloud/fixing-l10n-again-masterThomas Müller2013-11-213-3/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fixing l10n again master
| * | | | | | | fixing spelling and restructure sentenceThomas Müller2013-11-211-1/+1
| | | | | | | |
| * | | | | | | unify translation string - less work for the translatorsThomas Müller2013-11-212-2/+4
| | | | | | | |
* | | | | | | | Merge pull request #5979 from owncloud/fix5881blizzz2013-11-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | LDAP Wizard: add objectclass for group detection in Zimbra
| * | | | | | | | LDAP Wizard: add objectclass for group detection in ZimbraArthur Schiwon2013-11-211-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5980 from owncloud/public_view_fixesVincent Petry2013-11-212-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Public view fixes
| * | | | | | | disable trahs in files_sharing/public.phpBjoern Schiessle2013-11-212-1/+2
| | | | | | | |
| * | | | | | | fix undefined index errors if public share viewBjoern Schiessle2013-11-212-2/+9
|/ / / / / / /
* | | | | | | Merge pull request #5897 from hkjolhede/masterVincent Petry2013-11-211-6/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed error-checking error in sftp.php
| * | | | | | | Fixed error-checking error in sftp.phphkjolhede2013-11-151-6/+8
| | | | | | | |
* | | | | | | | Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfixVincent Petry2013-11-211-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fixed move operation to pass the whole URL as expected
| * | | | | | | Fixed move operation to pass the whole URL as expectedVincent Petry2013-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MOVE and COPY spec expect the "Destination" header to receive the full URL, not only the root. Fixes #5942
* | | | | | | | beta 5 is herev6.0.0beta5Frank Karlitschek2013-11-201-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizeresetVincent Petry2013-11-202-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for extstorage + encryption where unencrypted size is not kept
| * | | | | | | Fix for extstorage + encryption where unencrypted size is not keptVincent Petry2013-11-202-1/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | | Merge pull request #5965 from owncloud/mimetype-only-pathVincent Petry2013-11-204-37/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change default mimetype detection for storage backends to only use filename
| * | | | | | | Change default mimetype detection for storage backends to only use filenameRobin Appelman2013-11-204-37/+7
| | | | | | | |
* | | | | | | | Merge pull request #5966 from owncloud/fixing-fileid-webdav-masterblizzz2013-11-201-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | always get the right node for the given file path
| * | | | | | | | always get the right node for the given file pathThomas Müller2013-11-201-0/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #5959 from owncloud/encryption_check_if_file_is_encryptedVincent Petry2013-11-204-24/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | only check if the key file exists to decide if it is an encrypted file or not
| * | | | | | | Merge branch 'master' into encryption_check_if_file_is_encryptedBjoern Schiessle2013-11-201-3/+5
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #5961 from owncloud/core-fixgetfiletempfileconditionVincent Petry2013-11-201-3/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fixed getLocalFile() condition for x-send-file
| * | | | | | | Fixed getLocalFile() condition for x-send-fileVincent Petry2013-11-201-3/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | check if it is a cached file or a version to resolve the correct path to the ↵Bjoern Schiessle2013-11-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | file key
| * | | | | | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-204-25/+17
|/ / / / / / | | | | | | | | | | | | | | | | | | This solves problems with external storage which doesn't support fseek
* | | | | | Merge pull request #5926 from owncloud/less-boldFrank Karlitschek2013-11-191-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove bold from legend, table header, label - less obtrusive
| * | | | | | remove bold from legend, table header, label - less obtrusiveJan-Christoph Borchardt2013-11-181-2/+0
| | | | | | |
* | | | | | | Merge pull request #5951 from owncloud/ldap_encryption_fixblizzz2013-11-191-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix encryption with LDAP, make sure that the owners home is mounted correctly
| * | | | | | | make sure that the owners home is mounted correctlyBjoern Schiessle2013-11-191-0/+4
|/ / / / / / /
* | | | | | | Merge pull request #5878 from owncloud/extstorage-smbVincent Petry2013-11-194-4/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [SMB] Fix stat and unlink
| * | | | | | | Fixed SMB file deletion success detectionVincent Petry2013-11-192-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since unlink() smb4php doesn't return true on deletion success, we need to check whether the file was deleted to confirm success. Fixes #5866
| * | | | | | | Removing trailing dot in path that samba doesn't seem to likeVincent Petry2013-11-192-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5778 Added unit test for getId() and constructUrl()
| * | | | | | | Fixed delete action to show error message as notificationVincent Petry2013-11-191-1/+11
|/ / / / / / /
* | | | | | | Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserrorMorris Jobke2013-11-181-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SMB ignore connection errors when NetBIOS is disabled
| * | | | | | | SMB ignore connection errors when NetBIOS is disabledVincent Petry2013-11-181-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When NetBIOS is blocked or disabled, a smb::look() call can still get the list of shares from smbclient, even though the name resolution at the end of the command fails. This fix makes it ignore the connection error if we already got the list of shares. Fixed #5860
* | | | | | | | Merge pull request #5927 from owncloud/quota-excludeextstorageMorris Jobke2013-11-185-7/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | External storage space is now not counted in total space
| * | | | | | | | External storage space is now not counted in total spaceVincent Petry2013-11-185-7/+17
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added argument to getFileInfo() to disable adding the size of mountpoints to a directory's size. Fixes #5924
* | | | | | | | Merge pull request #5928 from owncloud/quota-totalsizeoffilesMorris Jobke2013-11-182-0/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Root size for home storage is now size of "files" subdir