| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-21 | 630 | -8468/+8323 |
| | | |||||
| * | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome | Vincent Petry | 2013-11-21 | 4 | -8/+94 |
| |\ | | | | | Quota storage wrapper is now used for all users in sharing mode | ||||
| | * | Now using the "Home" storage detection approach for quota | Vincent Petry | 2013-11-21 | 2 | -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 mode | Vincent Petry | 2013-11-21 | 3 | -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-mobilequickfix | Morris Jobke | 2013-11-21 | 1 | -0/+3 |
| |\ \ | | | | | | | Added min width to files table | ||||
| | * | | Added min width to files table | Vincent Petry | 2013-11-21 | 1 | -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-master | Thomas Müller | 2013-11-21 | 3 | -3/+5 |
| |\ \ | | | | | | | Fixing l10n again master | ||||
| | * | | fixing spelling and restructure sentence | Thomas Müller | 2013-11-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | unify translation string - less work for the translators | Thomas Müller | 2013-11-21 | 2 | -2/+4 |
| | | | | |||||
| * | | | Merge pull request #5979 from owncloud/fix5881 | blizzz | 2013-11-21 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | LDAP Wizard: add objectclass for group detection in Zimbra | ||||
| | * | | | LDAP Wizard: add objectclass for group detection in Zimbra | Arthur Schiwon | 2013-11-21 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #5980 from owncloud/public_view_fixes | Vincent Petry | 2013-11-21 | 2 | -2/+10 |
| |\ \ \ | |/ / |/| | | Public view fixes | ||||
| | * | | disable trahs in files_sharing/public.php | Bjoern Schiessle | 2013-11-21 | 2 | -1/+2 |
| | | | | |||||
| | * | | fix undefined index errors if public share view | Bjoern Schiessle | 2013-11-21 | 2 | -2/+9 |
| |/ / | |||||
| * | | Merge pull request #5897 from hkjolhede/master | Vincent Petry | 2013-11-21 | 1 | -6/+8 |
| |\ \ | | | | | | | Fixed error-checking error in sftp.php | ||||
| | * | | Fixed error-checking error in sftp.php | hkjolhede | 2013-11-15 | 1 | -6/+8 |
| | | | | |||||
| * | | | Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfix | Vincent Petry | 2013-11-21 | 1 | -2/+2 |
| |\ \ \ | |_|/ |/| | | Fixed move operation to pass the whole URL as expected | ||||
| | * | | Fixed move operation to pass the whole URL as expected | Vincent Petry | 2013-11-20 | 1 | -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.0beta5 | Frank Karlitschek | 2013-11-20 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset | Vincent Petry | 2013-11-20 | 2 | -1/+5 |
| |\ \ | | | | | | | Fix for extstorage + encryption where unencrypted size is not kept | ||||
| | * | | Fix for extstorage + encryption where unencrypted size is not kept | Vincent Petry | 2013-11-20 | 2 | -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-path | Vincent Petry | 2013-11-20 | 4 | -37/+7 |
| |\ \ \ | | | | | | | | | Change default mimetype detection for storage backends to only use filename | ||||
| | * | | | Change default mimetype detection for storage backends to only use filename | Robin Appelman | 2013-11-20 | 4 | -37/+7 |
| | | | | | |||||
| * | | | | Merge pull request #5966 from owncloud/fixing-fileid-webdav-master | blizzz | 2013-11-20 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | always get the right node for the given file path | ||||
| | * | | | | always get the right node for the given file path | Thomas Müller | 2013-11-20 | 1 | -0/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted | Vincent Petry | 2013-11-20 | 4 | -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_encrypted | Bjoern Schiessle | 2013-11-20 | 1 | -3/+5 |
| | |\ \ \ | |/ / / |/| | | | |||||
| * | | | | Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition | Vincent Petry | 2013-11-20 | 1 | -3/+5 |
| |\ \ \ \ | |_|/ / |/| | | | Fixed getLocalFile() condition for x-send-file | ||||
| | * | | | Fixed getLocalFile() condition for x-send-file | Vincent Petry | 2013-11-20 | 1 | -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 Schiessle | 2013-11-20 | 1 | -1/+5 |
| | | | | | | | | | | | | | file key | ||||
| | * | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 4 | -25/+17 |
| |/ / | | | | | | | This solves problems with external storage which doesn't support fseek | ||||
| * | | Merge pull request #5926 from owncloud/less-bold | Frank Karlitschek | 2013-11-19 | 1 | -2/+0 |
| |\ \ | | | | | | | remove bold from legend, table header, label - less obtrusive | ||||
| | * | | remove bold from legend, table header, label - less obtrusive | Jan-Christoph Borchardt | 2013-11-18 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge pull request #5951 from owncloud/ldap_encryption_fix | blizzz | 2013-11-19 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | fix encryption with LDAP, make sure that the owners home is mounted correctly | ||||
| | * | | | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+4 |
| |/ / / | |||||
| * | | | Merge pull request #5878 from owncloud/extstorage-smb | Vincent Petry | 2013-11-19 | 4 | -4/+84 |
| |\ \ \ | | | | | | | | | [SMB] Fix stat and unlink | ||||
| | * | | | Fixed SMB file deletion success detection | Vincent Petry | 2013-11-19 | 2 | -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 like | Vincent Petry | 2013-11-19 | 2 | -1/+47 |
| | | | | | | | | | | | | | | | | | | | | | Fixes #5778 Added unit test for getId() and constructUrl() | ||||
| | * | | | Fixed delete action to show error message as notification | Vincent Petry | 2013-11-19 | 1 | -1/+11 |
| |/ / / | |||||
| * | | | Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror | Morris Jobke | 2013-11-18 | 1 | -1/+8 |
| |\ \ \ | | | | | | | | | SMB ignore connection errors when NetBIOS is disabled | ||||
| | * | | | SMB ignore connection errors when NetBIOS is disabled | Vincent Petry | 2013-11-18 | 1 | -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-excludeextstorage | Morris Jobke | 2013-11-18 | 5 | -7/+17 |
| |\ \ \ \ | | | | | | | | | | | External storage space is now not counted in total space | ||||
| | * | | | | External storage space is now not counted in total space | Vincent Petry | 2013-11-18 | 5 | -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-totalsizeoffiles | Morris Jobke | 2013-11-18 | 2 | -0/+39 |
| |\ \ \ \ | | | | | | | | | | | Root size for home storage is now size of "files" subdir | ||||
| | * | | | | Root size for home storage is now size of "files" subdir | Vincent Petry | 2013-11-18 | 2 | -0/+39 |
| | |/ / / | | | | | | | | | | | | | Fixes #4593 | ||||
| * | | | | Merge pull request #5923 from owncloud/font-weight | Jan-Christoph Borchardt | 2013-11-18 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | change bold 'deleted files' button to normal for less focus | ||||
| | * | | | | change bold 'deleted files' button to normal for less focus | Jan-Christoph Borchardt | 2013-11-18 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | fix filtering number like filenames in filelist | Jörn Friedrich Dreyer | 2013-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | forward port of https://github.com/owncloud/core/commit/847ad6c40b951cbd3d187e3c72cb55dc3acd6951 | ||||
| * | | | | Merge pull request #5922 from owncloud/fix-time-inputs | Thomas Müller | 2013-11-18 | 1 | -6/+36 |
| |\ \ \ \ | |/ / / |/| | | | fix input type time fields, have them use the default styles | ||||
| | * | | | adjust input CSS to multiline, coding guidelines | Jan-Christoph Borchardt | 2013-11-18 | 1 | -6/+29 |
| | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |