Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add test case if a file gets moved out from the shared folder | Bjoern Schiessle | 2014-02-24 | 2 | -0/+125 |
| | |||||
* | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -4/+13 |
| | |||||
* | Merge pull request #7305 from owncloud/extstorage-configclass | Lukas Reschke | 2014-02-22 | 2 | -1/+32 |
|\ | | | | | Added extra checks for ext storage class | ||||
| * | Merge branch 'master' into extstorage-configclass | Robin Appelman | 2014-02-21 | 12 | -31/+259 |
| |\ | |||||
| * | | Added extra checks for ext storage class | Vincent Petry | 2014-02-20 | 2 | -1/+32 |
| | | | |||||
* | | | Merge pull request #7355 from owncloud/new-menu-svg | icewind1991 | 2014-02-21 | 2 | -13/+28 |
|\ \ \ | | | | | | | | | Use SVG icons in New file menu | ||||
| * | | | fix too much distance between text and icon | Jan-Christoph Borchardt | 2014-02-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | use SVG icons from icons.css for New file menu | Jan-Christoph Borchardt | 2014-02-21 | 2 | -13/+28 |
| | |/ | |/| | |||||
* | | | fix test so that it doesn't depend on the array order | Bjoern Schiessle | 2014-02-21 | 1 | -14/+25 |
| | | | |||||
* | | | fix usersPath and add unit tests | Bjoern Schiessle | 2014-02-21 | 2 | -10/+110 |
|/ / | |||||
* | | Merge pull request #7312 from owncloud/ldap_fix_add_test | Thomas Müller | 2014-02-21 | 2 | -3/+169 |
|\ \ | | | | | | | LDAP: fix and extend tests | ||||
| * | | LDAP: fix and extend tests | Arthur Schiwon | 2014-02-20 | 2 | -3/+169 |
| | | | |||||
* | | | Merge pull request #7290 from owncloud/issue/5463 | icewind1991 | 2014-02-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Correctly redirect to settings page when not selecting cert file for upload | ||||
| * | | | Correctly redirect to settings page when not selecting cert file for upload | Joas Schilling | 2014-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fix #5463 | ||||
* | | | | Merge pull request #7205 from owncloud/fix_7153 | blizzz | 2014-02-20 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | LDAP: prevent other configuration from being deleted when deleting the f... | ||||
| * | | | | LDAP: prevent other configuration from being deleted when deleting the first ↵ | Arthur Schiwon | 2014-02-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | one which has an empty prefix for historical reasons | ||||
* | | | | | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 1 | -4/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | mount: make location of mount.json configurable | ||||
| * | | | | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
* | | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix | Lukas Reschke | 2014-02-20 | 2 | -6/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | ||||
| * | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | Vincent Petry | 2014-02-18 | 2 | -6/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added PHP utility function to check for file name validity - fixes issue where a user can create a file called ".." from the files UI - added extra checks to make sure newfile.php and newfolder.php also check for invalid characters | ||||
* | | | | | | Revert "Added extra checks for ext storage class" | Vincent Petry | 2014-02-20 | 2 | -31/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9. Unit tests weren't ready, need further tweaking. | ||||
* | | | | | | Merge pull request #7284 from owncloud/ldap_filter_compilation | Lukas Reschke | 2014-02-20 | 2 | -0/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | LDAP: improve compilation of filters | ||||
| * | | | | | | LDAP: improve compilation of filters | Arthur Schiwon | 2014-02-19 | 2 | -0/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7294 from owncloud/extstorage-configclass | Lukas Reschke | 2014-02-20 | 2 | -1/+31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added extra checks for ext storage class | ||||
| * | | | | | | | Added extra checks for ext storage class | Vincent Petry | 2014-02-19 | 2 | -1/+31 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* / | | | | | | Fixed ext storage webdav path encoding | Vincent Petry | 2014-02-19 | 3 | -17/+55 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some WebDAV servers like lighttpd need paths in URLs to be properly encoded - Added error log output when curl connection failed - Added check for 'resourcetype' in case the WebDAV server doesn't support/return it - Fixed touch() to return false if the server doesn't implement PROPPATCH - Added optional delay in WebDAV unit tests to use when testing against lighttpd's WebDAV | ||||
* | | | | | | Merge pull request #7195 from owncloud/files-selectall | Vincent Petry | 2014-02-19 | 9 | -118/+227 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Do not send file list for select all on Download/delete | ||||
| * | | | | | Trashbin select all now doesn't send file list | Vincent Petry | 2014-02-17 | 3 | -79/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed "delete" and "restore" actions to not send the file list when all files are selected - When some files are selected, sends the current dir - Removed "dirListing" attribute as the backend is able to compute the value based on the current dir | ||||
| * | | | | | Do not send file list for select all on Download/delete | Vincent Petry | 2014-02-13 | 6 | -39/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When all files are selected, do not send the whole file list - Download will trigger download for the parent folder, also works with root - Delete will send "allfiles" to the server that will find the file list or the passed directory by itself | ||||
* | | | | | | Merge pull request #4799 from ↵ | Jan-Christoph Borchardt | 2014-02-19 | 1 | -11/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/tune_legacy_cache_webdav_properties_prefixing_master Concatenate string in SQL instead of PHP | ||||
| * | | | | | | cleanup and actually execute the query | Jörn Friedrich Dreyer | 2013-11-01 | 1 | -4/+8 |
| | | | | | | | |||||
| * | | | | | | use doctrine to construct concat expression | Jörn Friedrich Dreyer | 2013-11-01 | 1 | -8/+1 |
| | | | | | | | |||||
| * | | | | | | Concatenate string in SQL instead of PHP | Jörn Friedrich Dreyer | 2013-11-01 | 1 | -10/+10 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1 | Morris Jobke | 2014-02-19 | 12 | -13/+36 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 12 | -13/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend | ||||
* | | | | | | | Merge pull request #7257 from owncloud/filelist-fileinfo | Vincent Petry | 2014-02-19 | 3 | -26/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | use a FileInfo object of the directory when generting the filelist | ||||
| * | | | | | | use a FileInfo object of the directory when generting the filelist | Robin Appelman | 2014-02-18 | 3 | -26/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 25 | -89/+228 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * \ \ \ \ \ \ | Merge pull request #7190 from owncloud/appconfig-legacy-apps | Thomas Müller | 2014-02-18 | 13 | -31/+43 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | Remove usage of legacy OC_Appconfig | ||||
| | * | | | | | | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 13 | -31/+43 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #7176 from owncloud/style | Lukas Reschke | 2014-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Some style fixes | ||||
| | * | | | | | Style fixes | Bart Visscher | 2014-02-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #7235 from DavidVentura/master | Jan-Christoph Borchardt | 2014-02-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | small change for compatibility | ||||
| | * | | | | | | small change for compatibility | David | 2014-02-17 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #7211 from mattcaron/master | Vincent Petry | 2014-02-17 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fit shared videos to viewer, just like images. Issue #1648 | ||||
| | * | | | | | | | Consolidate two sections, per code review. Issue #1648 | Matthew Caron | 2014-02-17 | 1 | -6/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fit shared videos to viewer, just like images. Issue #1648 | Matthew Caron | 2014-02-14 | 1 | -0/+7 |
| | |/ / / / / / | |||||
| * | | | | | | | LDAP: improve wizard strings, fixes #5567 | Arthur Schiwon | 2014-02-17 | 3 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | don't block login forever if we are stuck in the middle of the initial ↵ | Bjoern Schiessle | 2014-02-17 | 5 | -10/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption | ||||
| * | | | | | | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 2 | -16/+105 |
| | | | | | | | |