Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome | Vincent Petry | 2013-11-21 | 1 | -0/+15 |
|\ | | | | | Quota storage wrapper is now used for all users in sharing mode | ||||
| * | Quota storage wrapper is now used for all users in sharing mode | Vincent Petry | 2013-11-21 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | 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 #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 |
| |/ | |||||
* | | 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 |
| | | |||||
* | | 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 | ||||
* | | 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) | ||||
* | | | 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 | ||||
* | | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+4 |
| | | |||||
* | | Fixed SMB file deletion success detection | Vincent Petry | 2013-11-19 | 1 | -0/+12 |
| | | | | | | | | | | | | | | 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 #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 #5908 from owncloud/fix_errorpage_call | Vincent Petry | 2013-11-18 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | [encryption] fix redirectToErrorPage() call | ||||
| * | | call error page with session as parameter | Bjoern Schiessle | 2013-11-17 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-15 | 19 | -19/+134 |
| |/ |/| | |||||
* | | Merge pull request #5894 from owncloud/readd_sharing_token | Vincent Petry | 2013-11-15 | 2 | -0/+2 |
|\ \ | | | | | | | readd sharing token to public template | ||||
| * | | readd sharing token to public template | Jörn Friedrich Dreyer | 2013-11-15 | 2 | -0/+2 |
| |/ | | | | | | | necessary for https://github.com/owncloud/apps/pull/1476 | ||||
* | | Merge pull request #5772 from owncloud/fix5741 | blizzz | 2013-11-15 | 3 | -22/+92 |
|\ \ | | | | | | | LDAP Wizard: introduce configuration status indicator, fixes #5741 | ||||
| * | | LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't ↵ | Arthur Schiwon | 2013-11-13 | 2 | -0/+7 |
| | | | | | | | | | | | | take too much awareness | ||||
| * | | LDAP Wizard: move status indicator in one line with back and continue buttons | Arthur Schiwon | 2013-11-13 | 1 | -3/+2 |
| | | | |||||
| * | | LDAP Wizard: introduce configuration status indicator, fixes #5741 | Arthur Schiwon | 2013-11-13 | 3 | -22/+86 |
| | | | |||||
* | | | Merge pull request #5833 from owncloud/encryption_fixes | Björn Schießle | 2013-11-15 | 3 | -22/+83 |
|\ \ \ | | | | | | | | | [encryption] preserve timestamps and etags during encryption/decryption | ||||
| * | | | remove debug output | Bjoern Schiessle | 2013-11-14 | 1 | -6/+0 |
| | | | | |||||
| * | | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ↵ | Bjoern Schiessle | 2013-11-14 | 1 | -0/+64 |
| | | | | | | | | | | | | | | | | same | ||||
| * | | | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 8 | -72/+111 |
| |\ \ \ | |||||
| * | | | | fixPartialFilePath() is now stripPartialFileExtension() | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | only update file cache if the file is already indexed to avoid that we ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+14 |
| | | | | | | | | | | | | | | | | | | | | create a incomplete file cache entry | ||||
| * | | | | make sure that we keep the correct timestamp and etag after ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | encryoption/decryption | ||||
* | | | | | Merge pull request #5880 from owncloud/replace_etmp_files | Vincent Petry | 2013-11-15 | 4 | -16/+64 |
|\ \ \ \ \ | | | | | | | | | | | | | write encryption tmp files to the cache folder | ||||
| * | | | | | tests added | Bjoern Schiessle | 2013-11-15 | 1 | -1/+14 |
| | | | | | | |||||
| * | | | | | instead of writing etmp files we write the dummy file to data/user/cache to ↵ | Bjoern Schiessle | 2013-11-14 | 3 | -15/+50 |
| | |/ / / | |/| | | | | | | | | | | | | | avoid that etmp files show up in the users files list | ||||
* | | | | | Fix for smb4php fseek | Vincent Petry | 2013-11-15 | 1 | -1/+2 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stream_fseek function must return a boolean which will be mapped to 0 for success and -1 for failure for the caller. This patch fixes stream_fseek of smb4php to also respect this convention. Since the encryption app is relying on fseek to detect whether a file is encrypted by reading the last bit of data, this will fix #5023 | ||||
* | | | | Merge pull request #5700 from owncloud/ldapWizSetDisplayNames | Thomas Müller | 2013-11-15 | 1 | -0/+13 |
|\ \ \ \ | | | | | | | | | | | LDAP Wizard: do not forget to set display name attributes for user and g... | ||||
| * | | | | LDAP Wizard: do not forget to set display name attributes for user and ↵ | Arthur Schiwon | 2013-11-05 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | group, makes Test Connection succeed | ||||
* | | | | | Merge pull request #5862 from owncloud/files-singledotdirs | Thomas Müller | 2013-11-14 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Files singledotdirs | ||||
| * | | | | | Files app backend now normalizes paths before rendering templates | Vincent Petry | 2013-11-14 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before rendering breadcrumbs or the file list, the paths are now normalized. This prevents the UI to show "." breadcrumbs in case the path contains sections with "/./" Fixes #5848 | ||||
* | | | | | | Merge pull request #5214 from owncloud/no_extra_slashes | Frank Karlitschek | 2013-11-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Don't double-slash filenames at the root. | ||||
| * | | | | | Don't double-slash filenames at the root. | ringmaster | 2013-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace either the end of the dir string that isn't preceded by a slash or the slash at the end of the dir string with a slash and the filename. This prevents the root directory from ending up as two slashes, which breaks files_versions on Windows servers. See #4079 for an explanation. |