Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches | Thomas Müller | 2015-09-24 | 1 | -1/+4 |
|\ | | | | | Prevent wrong matches in getRelativePath | ||||
| * | Prevent wrong matches in getRelativePath | Vincent Petry | 2015-09-22 | 1 | -1/+4 |
| | | | | | | | | | | Before this fix, the root "/files" with path "/files_trashbin" would return "_trashbin" as relative path... | ||||
* | | Revert "use correct variable" | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810. | ||||
* | | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | | | wow ... just wow ... | ||||
* | | Merge pull request #19236 from owncloud/call_dot_directories_function | Thomas Müller | 2015-09-23 | 4 | -5/+5 |
|\ \ | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir | ||||
| * | | Replaces if ($file === '.' || $file === '..') by ↵ | Martin | 2015-09-22 | 4 | -5/+5 |
| | | | | | | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. | ||||
* | | | Merge pull request #19247 from owncloud/fix_locking_copy_operation | Thomas Müller | 2015-09-23 | 1 | -42/+55 |
|\ \ \ | |/ / |/| | | locking: handle exceptions correctly during copy operation | ||||
| * | | catch excexptions during the copy operation and make sure that we free the ↵ | Bjoern Schiessle | 2015-09-22 | 1 | -42/+55 |
| |/ | | | | | | | lock correctly | ||||
* / | Move mimetype files into /resources/config/ | Lukas Reschke | 2015-09-22 | 1 | -13/+22 |
|/ | |||||
* | dont download the existing file for webdav if we're going to overwrite it | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
| | |||||
* | Explicitly cast number to integer | Robin McCorkell | 2015-09-16 | 1 | -1/+1 |
| | |||||
* | Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic | Robin Appelman | 2015-09-15 | 2 | -70/+11 |
|\ | | | | | Use the view logic for getFolderContent for the node api | ||||
| * | Use the view logic for getFolderContent for the node api | Robin Appelman | 2015-09-08 | 2 | -70/+11 |
| | | |||||
* | | Use integer for availability instead of bool | Robin McCorkell | 2015-09-15 | 1 | -3/+5 |
| | | |||||
* | | Merge pull request #18653 from owncloud/dav-stream-guzzle | Lukas Reschke | 2015-09-11 | 1 | -62/+31 |
|\ \ | | | | | | | stream webdav downloads using http client | ||||
| * | | also use httpclient for uploadFile | Robin Appelman | 2015-09-01 | 1 | -35/+18 |
| | | | |||||
| * | | stream webdav downloads using http client | Robin Appelman | 2015-08-29 | 1 | -29/+15 |
| | | | |||||
* | | | Add reset method to mimetype loader | Robin McCorkell | 2015-09-11 | 2 | -1/+9 |
| |/ |/| | | | | | Used to solve concurrency issues | ||||
* | | Split mimetype handling to new class | Robin McCorkell | 2015-09-04 | 2 | -80/+181 |
| | | |||||
* | | Allow access to full alias and mapping arrays | Robin McCorkell | 2015-09-01 | 1 | -8/+22 |
| | | |||||
* | | Check result of storage wrappers | Robin Appelman | 2015-08-30 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #18423 from owncloud/occ_encrypt_all | Björn Schießle | 2015-08-28 | 1 | -29/+15 |
|\ | | | | | occ command line tool to encrypt all files | ||||
| * | copy always file by file to encrypt/decrypt it if needed | Bjoern Schiessle | 2015-08-26 | 1 | -29/+15 |
| | | |||||
* | | Prevent scanner going crazy with unavailable storages | Vincent Petry | 2015-08-24 | 1 | -4/+14 |
| | | |||||
* | | Merge pull request #17501 from tbartenstein/patch-1 | Vincent Petry | 2015-08-24 | 1 | -1/+1 |
|\ \ | | | | | | | Update fileinfo.php | ||||
| * | | Update fileinfo.php | tbartenstein | 2015-07-08 | 1 | -1/+1 |
| | | | | | | | | | Edits isMounted() to remove the check for 'local' prefix, so that folder icons are displayed correctly (see issue #10712) | ||||
* | | | Revert "Fix mounting wrapped storages resulting in many-layered wrapping" | Robin McCorkell | 2015-08-19 | 1 | -6/+1 |
| | | | | | | | | | | | | This reverts commit 75a5e6e12b18a9f5b7b113cd7e2c9c56c204084d. | ||||
* | | | Implement password authentication mechanisms | Robin McCorkell | 2015-08-19 | 1 | -0/+4 |
| |/ |/| | | | | | | | | | | | | | | | | | | | Introduces the basic password authentication mechanism, along with a mechanism based on ownCloud credentials stored in the user session. Change to lib/private is an extension of PermissionsMask, as isSharable() override was missing. Session credentials auth mechanism now disables sharing on applied storages, as credentials will not be available. | ||||
* | | Merge pull request #17932 from owncloud/fix_move_files | Thomas Müller | 2015-08-11 | 1 | -2/+7 |
|\ \ | | | | | | | make sure that hooks are emitted properly on file move operation | ||||
| * | | make sure that we emit the hooks if a file gets moved from a subfolder to ↵ | Bjoern Schiessle | 2015-07-29 | 1 | -2/+7 |
| | | | | | | | | | | | | the root folder with the nodes API | ||||
* | | | Merge pull request #14779 from owncloud/use-iterator-directory | Robin McCorkell | 2015-08-07 | 3 | -7/+4 |
|\ \ \ | | | | | | | | | Use the new IteratorDirectory instead of the fakedir wrapper | ||||
| * | | | Use the new IteratorDirectory instead of the fakedir wrapper | Robin Appelman | 2015-07-15 | 3 | -7/+4 |
| | | | | |||||
* | | | | Merge pull request #18124 from owncloud/share-permwrongvar | Morris Jobke | 2015-08-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix removal of share permissions when share disabled for user | ||||
| * | | | | Fix removal of share permissions when share disabled for user | Vincent Petry | 2015-08-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #13641 from owncloud/cache-storage-status | Vincent Petry | 2015-08-07 | 5 | -11/+543 |
|\ \ \ \ \ | |/ / / / |/| | | | | Store storage availability in database | ||||
| * | | | | Fix mounting wrapped storages resulting in many-layered wrapping | Robin McCorkell | 2015-07-20 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This usually doesn't cause issues, but in unit tests sometimes a wrapped storage is passed to Filesystem::mount() and gets rewrapped, hitting the XDebug function nesting level limit when used. | ||||
| * | | | | Store storage availability in database | Robin McCorkell | 2015-07-20 | 4 | -10/+537 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage status is saved in the database. Failed storages are rechecked every 10 minutes, while working storages are rechecked every request. Using the files_external app will recheck all external storages when the settings page is viewed, or whenever an external storage is saved. | ||||
* | | | | | always update file cache, the cache can handle partial data correctly if the ↵ | Bjoern Schiessle | 2015-07-31 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | file doesn't already exists in the file cache | ||||
* | | | | | Merge pull request #17981 from owncloud/correct-regex | Thomas Müller | 2015-07-30 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Correct regular expressions | ||||
| * | | | | | Correct regular expressions | Lukas Reschke | 2015-07-30 | 1 | -2/+2 |
| | |_|/ / | |/| | | | | | | | | | | | | | Previously the regex was only matching on single characters. Meaning that file names such as ":+1:.txt" where possible while ":+1:" alone never was. This check apparently never worked as expected. | ||||
* | | | | | Merge pull request #17950 from ↵ | Robin McCorkell | 2015-07-29 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | owncloud/config-dontdetectfschangesinrootbydefault Disable filesystem_check_changes by default | ||||
| * | | | | Disable filesystem_check_changes by default | Vincent Petry | 2015-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent detecting remote changes done in the data folder / root storage by default. In the rare cases where the data folder is shared with other apps/users outside ownCloud and change detection is needed, the admin will have to set the option explicitly from now on. Note that this doesn't affect external storages which have their own setting in the mount options. | ||||
* | | | | | Merge pull request #15543 from rullzer/mimetypedetector | Morris Jobke | 2015-07-28 | 1 | -3/+124 |
|\ \ \ \ \ | |/ / / / |/| | | | | Mimetypedetector | ||||
| * | | | | Pass config dir as parameter to detection class | Roeland Jago Douma | 2015-07-27 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to properly test the mimetype function: * constructor takes path to configdir * Added unit tests for mimetype (only if vfsStream is available) | ||||
| * | | | | Proper deprecate methods | Roeland Jago Douma | 2015-07-27 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Loading of mapping/aliases is done in class | Roeland Jago Douma | 2015-07-27 | 1 | -12/+47 |
| | | | | | |||||
| * | | | | Move mimetypedetection to files/type/detection | Roeland Jago Douma | 2015-07-27 | 1 | -85/+42 |
| | | | | | |||||
| * | | | | Added mimetype detector | Roeland Jago Douma | 2015-07-27 | 1 | -1/+126 |
| |/ / / | | | | | | | | | | | | | * Copied unit tests from old functions | ||||
* | | | | Merge pull request #17902 from owncloud/fix_17898 | Vincent Petry | 2015-07-27 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | get header size before we open the file to avoid locking exception | ||||
| * | | | | get header size before we open the file to avoid locking exception | Bjoern Schiessle | 2015-07-27 | 1 | -1/+2 |
| | | | | |