Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add endpoint with list of OCS providers | Lukas Reschke | 2015-06-27 | 3 | -0/+172 |
| | | | | | | | | This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services. In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-)) That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted... | ||||
* | Merge pull request #17191 from owncloud/issue-17188-group-share-part-file | Thomas Müller | 2015-06-26 | 1 | -8/+18 |
|\ | | | | | Correctly check if the real file exists, otherwise try the part file | ||||
| * | Correctly check if the real file exists, otherwise try the part file | Joas Schilling | 2015-06-26 | 1 | -8/+18 |
| | | |||||
* | | Merge pull request #17008 from owncloud/fix-17006 | Björn Schießle | 2015-06-26 | 2 | -26/+76 |
|\ \ | |/ |/| | Improve splitting of username and remote adress when username contains an `@` | ||||
| * | Use \OC\HintException and translate the hint | Joas Schilling | 2015-06-22 | 2 | -1/+30 |
| | | |||||
| * | Merge spliteUserRemote with fixRemoteUrlInShareWith | Joas Schilling | 2015-06-22 | 1 | -49/+31 |
| | | |||||
| * | make sure that we split username and server address at the first '@' from ↵ | Bjoern Schiessle | 2015-06-22 | 1 | -0/+39 |
| | | | | | | | | the right to allow usernames containing '@' | ||||
* | | Merge pull request #17070 from owncloud/lock-movemountbug | Vincent Petry | 2015-06-24 | 1 | -0/+91 |
|\ \ | | | | | | | Lock correct paths when moving mount | ||||
| * | | Fix locked paths in the moveMount case | Vincent Petry | 2015-06-24 | 1 | -0/+91 |
| | | | | | | | | | | | | | | | | | | | | | When moving a mount point directly, the lock must be applied on the local mount point path instead of the attached storage root. Other operations will still lock the attached storage root. | ||||
* | | | Merge pull request #17045 from owncloud/enc_improvements | Björn Schießle | 2015-06-23 | 1 | -3/+60 |
|\ \ \ | | | | | | | | | encryption improvements | ||||
| * | | | make sure that we always read the header from the original file | Bjoern Schiessle | 2015-06-23 | 1 | -3/+60 |
| | | | | |||||
* | | | | Make an assertion in risky test testGetNodeForPathRoot | Joas Schilling | 2015-06-22 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #12546 from oparoz/patch-1 | Björn Schießle | 2015-06-22 | 1 | -0/+20 |
|\ \ \ | |_|/ |/| | | Send the mime icon if we can't generate a preview | ||||
| * | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-19 | 1 | -4/+3 |
| | | | |||||
| * | | Move media type icon preview creation to its own method | Olivier Paroz | 2015-06-18 | 1 | -0/+21 |
| | | | |||||
* | | | Merge pull request #16657 from owncloud/view-emit-path | Thomas Müller | 2015-06-22 | 1 | -0/+29 |
|\ \ \ | | | | | | | | | emit hooks from a view as long as the path is inside the default root | ||||
| * | | | emit hooks from a view as long as the path is inside the default root | Robin Appelman | 2015-06-02 | 1 | -0/+29 |
| | | | | |||||
* | | | | Merge pull request #17056 from owncloud/appframework-type-cast | Bernhard Posselt | 2015-06-22 | 1 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | Allow multiple whitespace in type hints in AppFramework | ||||
| * | | | | AppFramework annotation whitespace unit test | Robin McCorkell | 2015-06-21 | 1 | -0/+14 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydir | Robin McCorkell | 2015-06-21 | 1 | -0/+7 |
|\ \ \ \ | |/ / / |/| | | | Workaround for empty dir deletion for SFTP | ||||
| * | | | Workaround for empty dir deletion for SFTP | Vincent Petry | 2015-06-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly clear the stat cache after deleting an empty folder to make sure it is properly detected as deleted in subsequent requests. This works around a problem with phpseclib where the folder is properly deleted remotely but the stat cache was not updated. | ||||
* | | | | Merge pull request #16889 from owncloud/group-sorting-fixes | Joas Schilling | 2015-06-19 | 1 | -1/+95 |
|\ \ \ \ | |/ / / |/| | | | Only sort by group name when LDAP is involved | ||||
| * | | | Only sort by group name when LDAP is involved | Joas Schilling | 2015-06-16 | 1 | -1/+95 |
| | | | | |||||
* | | | | Fix test | Lukas Reschke | 2015-06-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Normalize path in View's lock methods | Vincent Petry | 2015-06-16 | 1 | -0/+22 |
| | | | | |||||
* | | | | Merge pull request #16892 from owncloud/lock-returnfullpath | Vincent Petry | 2015-06-16 | 1 | -0/+39 |
|\ \ \ \ | |/ / / |/| | | | Rethrow LockedException with full path | ||||
| * | | | Rethrow LockedException with full path | Vincent Petry | 2015-06-16 | 1 | -0/+39 |
| | | | | | | | | | | | | | | | | | | | | Because the path is converted to md5 from the original exception, rethrow the exception with the correct full path | ||||
* | | | | Merge pull request #16832 from owncloud/memcache-fail | Joas Schilling | 2015-06-16 | 1 | -22/+42 |
|\ \ \ \ | | | | | | | | | | | Throw exception if memcache misconfigured or missing | ||||
| * | | | | Throw exception if memcache misconfigured or missing | Vincent Petry | 2015-06-12 | 1 | -22/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of falling back to null memcache, throw exceptions. Also throw file locking specific exceptions in case the class is not available. | ||||
* | | | | | Merge pull request #16943 from owncloud/sabre-convertinvalidpath | Joas Schilling | 2015-06-16 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Convert invalid path exception to sabre exception on MOVE | ||||
| * | | | | | Convert invalid path exception to sabre exception on MOVE | Vincent Petry | 2015-06-15 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Adjust NullCache tests | Lukas Reschke | 2015-06-15 | 1 | -3/+1 |
| | | | | | |||||
* | | | | | Add `no-store` to AppFramework | Lukas Reschke | 2015-06-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16821 from owncloud/compare-and-delete-locking-watch | Thomas Müller | 2015-06-15 | 1 | -0/+12 |
|\ \ \ \ \ | |/ / / / |/| | | | | Compare and delete locking watch | ||||
| * | | | | add compare-and-delete to the memcache interface | Robin Appelman | 2015-06-12 | 1 | -0/+12 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #16912 from owncloud/webdav-smalltransferlockfix | Thomas Müller | 2015-06-15 | 2 | -0/+115 |
|\ \ \ \ | |/ / / |/| | | | Webdav PUT small file lock must be shared during hooks | ||||
| * | | | Webdav PUT small file lock must be shared during hooks | Vincent Petry | 2015-06-12 | 2 | -0/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed code path for Webdav PUT of small files to use shared locks during hook execution, and exclusive during the file operation This makes it possible for versions to be copied by accessing the file in a post_write hook. | ||||
* | | | | Merge pull request #16886 from owncloud/webdav-verify-path-again | Vincent Petry | 2015-06-12 | 1 | -6/+56 |
|\ \ \ \ | |/ / / |/| | | | verify path when getting a node for sabredav | ||||
| * | | | tests for getNodeForPath with invalid path | Robin Appelman | 2015-06-11 | 1 | -6/+56 |
| |/ / | |||||
* / / | Add return value to lock methods and check it in tests | Joas Schilling | 2015-06-12 | 1 | -8/+70 |
|/ / | |||||
* | | Merge pull request #16879 from jcfischer/jcf_fix_user_delete_message | Lukas Reschke | 2015-06-11 | 1 | -1/+1 |
|\ \ | | | | | | | Fix error message and add 'user' to it | ||||
| * | | Fix test message and add 'user' to it | Jens-Christian Fischer | 2015-06-11 | 1 | -1/+1 |
| | | | |||||
* | | | Check the query() for all defined services | Joas Schilling | 2015-06-11 | 1 | -1/+112 |
| | | | |||||
* | | | Correctly import NullCache class | Joas Schilling | 2015-06-11 | 1 | -0/+51 |
|/ / | |||||
* | | Merge pull request #16803 from ↵ | Thomas Müller | 2015-06-09 | 1 | -13/+46 |
|\ \ | | | | | | | | | | | | | owncloud/issue/16801-group-reshare-part-file-enc-keys Check if the part files has keys when the original file does not | ||||
| * | | Add a test for the fallback to the part file keys | Joas Schilling | 2015-06-08 | 1 | -13/+46 |
| | | | |||||
* | | | Merge pull request #16382 from ↵ | Thomas Müller | 2015-06-08 | 16 | -160/+1451 |
|\ \ \ | |/ / |/| | | | | | | | | oparoz/providers-are-responsible-for-the-size-of-their-preview Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly | ||||
| * | | Fix max preview, some resizing and caching issues and force preview ↵ | Olivier Paroz | 2015-06-06 | 16 | -160/+1451 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | providers to resize their previews properly * introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box * adds the method to all key providers so that they can do their job, as expected by the Preview class * improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space * fixes some long standing issues * **contains mostly tests** | ||||
* | | | Merge pull request #16158 from owncloud/mountprovider-after-setup | Thomas Müller | 2015-06-08 | 2 | -1/+43 |
|\ \ \ | | | | | | | | | Call newly registered mount providers after the filesystem is setup | ||||
| * | | | more type hints | Robin Appelman | 2015-06-02 | 1 | -1/+1 |
| | | | |