aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
* | 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)
* | | 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
* | make sure that the owners home is mounted correctlyBjoern Schiessle2013-11-191-0/+4
| |
* | Fixed SMB file deletion success detectionVincent Petry2013-11-191-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 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 #5923 from owncloud/font-weightJan-Christoph Borchardt2013-11-181-0/+1
|\ \ \ | | | | | | | | change bold 'deleted files' button to normal for less focus
| * | | change bold 'deleted files' button to normal for less focusJan-Christoph Borchardt2013-11-181-0/+1
| | | |
* | | | fix filtering number like filenames in filelistJörn Friedrich Dreyer2013-11-181-1/+1
|/ / / | | | | | | forward port of https://github.com/owncloud/core/commit/847ad6c40b951cbd3d187e3c72cb55dc3acd6951
* | | Merge pull request #5908 from owncloud/fix_errorpage_callVincent Petry2013-11-181-1/+1
|\ \ \ | |/ / |/| | [encryption] fix redirectToErrorPage() call
| * | call error page with session as parameterBjoern Schiessle2013-11-171-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-1519-19/+134
| |/ |/|
* | Merge pull request #5894 from owncloud/readd_sharing_tokenVincent Petry2013-11-152-0/+2
|\ \ | | | | | | readd sharing token to public template
| * | readd sharing token to public templateJörn Friedrich Dreyer2013-11-152-0/+2
| |/ | | | | | | necessary for https://github.com/owncloud/apps/pull/1476
* | Merge pull request #5772 from owncloud/fix5741blizzz2013-11-153-22/+92
|\ \ | | | | | | LDAP Wizard: introduce configuration status indicator, fixes #5741
| * | LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't ↵Arthur Schiwon2013-11-132-0/+7
| | | | | | | | | | | | take too much awareness
| * | LDAP Wizard: move status indicator in one line with back and continue buttonsArthur Schiwon2013-11-131-3/+2
| | |
| * | LDAP Wizard: introduce configuration status indicator, fixes #5741Arthur Schiwon2013-11-133-22/+86
| | |
* | | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-153-22/+83
|\ \ \ | | | | | | | | [encryption] preserve timestamps and etags during encryption/decryption
| * | | remove debug outputBjoern Schiessle2013-11-141-6/+0
| | | |
| * | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ↵Bjoern Schiessle2013-11-141-0/+64
| | | | | | | | | | | | | | | | same
| * | | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-138-72/+111
| |\ \ \
| * | | | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| | | | |
| * | | | only update file cache if the file is already indexed to avoid that we ↵Bjoern Schiessle2013-11-121-11/+14
| | | | | | | | | | | | | | | | | | | | create a incomplete file cache entry
| * | | | make sure that we keep the correct timestamp and etag after ↵Bjoern Schiessle2013-11-121-11/+11
| | | | | | | | | | | | | | | | | | | | encryoption/decryption
* | | | | Merge pull request #5880 from owncloud/replace_etmp_filesVincent Petry2013-11-154-16/+64
|\ \ \ \ \ | | | | | | | | | | | | write encryption tmp files to the cache folder
| * | | | | tests addedBjoern Schiessle2013-11-151-1/+14
| | | | | |
| * | | | | instead of writing etmp files we write the dummy file to data/user/cache to ↵Bjoern Schiessle2013-11-143-15/+50
| | |/ / / | |/| | | | | | | | | | | | | avoid that etmp files show up in the users files list
* | | | | Fix for smb4php fseekVincent Petry2013-11-151-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/ldapWizSetDisplayNamesThomas Müller2013-11-151-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 Schiwon2013-11-051-0/+13
| | | | | | | | | | | | | | | | | | | | group, makes Test Connection succeed
* | | | | Merge pull request #5862 from owncloud/files-singledotdirsThomas Müller2013-11-142-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Files singledotdirs
| * | | | | Files app backend now normalizes paths before rendering templatesVincent Petry2013-11-142-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_slashesFrank Karlitschek2013-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Don't double-slash filenames at the root.
| * | | | | Don't double-slash filenames at the root.ringmaster2013-10-081-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.
* | | | | | Merge pull request #5805 from owncloud/shared-storage-copy-folderlistFrank Karlitschek2013-11-131-59/+47
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Use View::copy and View::rename when copying or renaming files in the shared storage
| * | | | | Use View::copy and View::rename when copying or renaming files in the shared ↵Robin Appelman2013-11-111-59/+47
| | | | | | | | | | | | | | | | | | | | | | | | storage
* | | | | | Merge pull request #5806 from owncloud/styles-fix-external_storageFrank Karlitschek2013-11-131-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix spacing issue for checkboxes, vertically center checkboxes on person...
| * | | | | | Fix spacing issue for checkboxes, vertically center checkboxes on personal pageMorris Jobke2013-11-111-0/+4
| |/ / / / /
* | | | | | Merge pull request #5809 from owncloud/fix5753Morris Jobke2013-11-135-53/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP Wizard: proper behaviour with anonymous bind, fixes #5753
| * | | | | | LDAP Wizard: make UI behaviour more consistent and more pleasant when ↵Arthur Schiwon2013-11-112-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | determining Base DN
| * | | | | | LDAP Wizard: remove ugly whitespace where it should not beArthur Schiwon2013-11-111-2/+1
| | | | | | |