Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add tests for correct path | Joas Schilling | 2015-04-20 | 1 | -1/+2 |
| | |||||
* | Fix phpStorm complains and namespace | Joas Schilling | 2015-04-20 | 1 | -7/+18 |
| | |||||
* | get rid of OC_Geo | Georg Ehrke | 2015-04-19 | 1 | -23/+0 |
| | |||||
* | Use data provider instead of hand-crafted for loops | Morris Jobke | 2015-04-18 | 1 | -22/+24 |
| | | | | | * reduces scrutinizer complains * uses PHPUnit functionality | ||||
* | always create a new instance of the encryption module | Bjoern Schiessle | 2015-04-17 | 1 | -19/+22 |
| | |||||
* | detect system wide mount points correctly | Bjoern Schiessle | 2015-04-16 | 3 | -14/+31 |
| | |||||
* | add migration script from old encryption to new one | Bjoern Schiessle | 2015-04-16 | 1 | -48/+47 |
| | |||||
* | Merge pull request #12006 from owncloud/dav-put-storage | Morris Jobke | 2015-04-15 | 1 | -9/+25 |
|\ | | | | | Work directly on the storage when uploading over webdav | ||||
| * | pass a stream to the tests | Robin Appelman | 2015-04-14 | 1 | -5/+13 |
| | | |||||
| * | update tests | Robin Appelman | 2015-04-09 | 1 | -4/+12 |
| | | |||||
* | | Merge pull request #15592 from owncloud/fix-15590-master | Thomas Müller | 2015-04-15 | 1 | -0/+22 |
|\ \ | | | | | | | Avoid php message "Invalid argument supplied for foreach()" | ||||
| * | | Remove unneeded comments | Morris Jobke | 2015-04-14 | 1 | -13/+0 |
| | | | |||||
| * | | Avoid php message "Invalid argument supplied for foreach()" - refs #15590 | Thomas Müller | 2015-04-14 | 1 | -0/+35 |
| | | | |||||
* | | | Merge pull request #15598 from owncloud/fix-enc-file-size-master | Björn Schießle | 2015-04-14 | 2 | -14/+2 |
|\ \ \ | | | | | | | | | Fix file size of encrypted files | ||||
| * | | | remove calculateUnencryptedSize() - not needed | Thomas Müller | 2015-04-14 | 2 | -14/+2 |
| | | | | |||||
* | | | | Merge pull request #13360 from owncloud/cross-storage-move | Morris Jobke | 2015-04-14 | 1 | -7/+81 |
|\ \ \ \ | |/ / / |/| | | | Proper copy/move between multiple local storages | ||||
| * | | | Properly handle copy/move failures in cross storage copy/move | Robin Appelman | 2015-04-13 | 1 | -5/+14 |
| | | | | |||||
| * | | | Improve cross storage copy between local storages | Robin Appelman | 2015-04-13 | 1 | -2/+67 |
| | | | | |||||
* | | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace | Morris Jobke | 2015-04-13 | 1 | -13/+61 |
|\ \ \ \ | | | | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages | ||||
| * | | | | Fix namespace duplication and other issues in repairlegacystorages | Joas Schilling | 2015-04-13 | 1 | -13/+61 |
| |/ / / | |||||
* | | | | upda tests | Robin Appelman | 2015-04-13 | 1 | -6/+1 |
| | | | | |||||
* | | | | preserve cache data when doing a cross storage move | Robin Appelman | 2015-04-13 | 1 | -0/+74 |
|/ / / | |||||
* | | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name | ||||
* | | | Prevent php message: "Trying to get property of non-object at ↵ | Thomas Müller | 2015-04-13 | 1 | -0/+45 |
|/ / | | | | | | | /xxx/lib/private/ocsclient.php#282" | ||||
* | | Merge pull request #15541 from owncloud/add-reply-to-support | Lukas Reschke | 2015-04-12 | 2 | -0/+254 |
|\ \ | | | | | | | Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests | ||||
| * | | Add "Reply-To" support to sharing mails and refactor code | Lukas Reschke | 2015-04-10 | 2 | -0/+254 |
| | | | |||||
* | | | fix cherrypicking | Jörn Friedrich Dreyer | 2015-04-10 | 2 | -28/+37 |
| | | | |||||
* | | | fix filesystem and encryption tests | Jörn Friedrich Dreyer | 2015-04-10 | 1 | -7/+4 |
|/ / | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php apps/files_encryption/tests/hooks.php | ||||
* | | Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares | Thomas Müller | 2015-04-09 | 1 | -0/+7 |
|\ \ | | | | | | | only create a db entry for the user in case of a name conflict on group share | ||||
| * | | only create a db entry for the user in case of a name conflict on group share | Bjoern Schiessle | 2015-04-09 | 1 | -0/+7 |
| | | | |||||
* | | | Merge pull request #15511 from owncloud/fix-typos | Lukas Reschke | 2015-04-09 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Fix typos and some other adjustments | ||||
| * | | | Fix mock object to return proper type | Thomas Müller | 2015-04-09 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fix mock object to return proper type | Thomas Müller | 2015-04-09 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting | Thomas Müller | 2015-04-09 | 1 | -0/+16 |
|\ \ \ | |/ / |/| | | Check if the key exists, before trying to delete it | ||||
| * | | Check if the key exists, before trying to delete it | Joas Schilling | 2015-04-09 | 1 | -0/+16 |
| | | | |||||
* | | | Merge pull request #15314 from owncloud/app-categories-15274 | Lukas Reschke | 2015-04-09 | 2 | -0/+1165 |
|\ \ \ | |/ / |/| | | Add different trust levels to AppStore interface | ||||
| * | | Make user names clickable | Lukas Reschke | 2015-04-03 | 1 | -0/+3 |
| | | | |||||
| * | | Add experimental applications switch | Lukas Reschke | 2015-04-03 | 2 | -0/+1162 |
| | | | | | | | | | | | | Allows administrators to disable or enabled experimental applications as well as show the trust level. | ||||
* | | | Merge pull request #15196 from owncloud/limit-file-activities-to-favorites | Morris Jobke | 2015-04-09 | 1 | -1/+102 |
|\ \ \ | | | | | | | | | Limit file activities to favorites | ||||
| * | | | Make scrutinizer happy | Joas Schilling | 2015-04-01 | 1 | -17/+10 |
| | | | | |||||
| * | | | Add tests from getCurrentUserId() method and fix the constructor | Joas Schilling | 2015-03-30 | 1 | -1/+109 |
| | | | | |||||
* | | | | Merge pull request #14987 from rullzer/ocs_password_fix2 | Morris Jobke | 2015-04-08 | 1 | -0/+234 |
|\ \ \ \ | | | | | | | | | | | OCS Fixes to allow setting of password without removing additional settings | ||||
| * | | | | Fix unit test | Roeland Jago Douma | 2015-03-30 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 1 | -0/+230 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added setPassword to share.php - Fixed OCS API call - Added unit tests | ||||
* | | | | | Replace originalStorage in tests with a proper teardown | Vincent Petry | 2015-04-08 | 11 | -72/+25 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of $originalStorage in unit tests was to remount the old root. However that storage itself is already wrapped by storage wrapper, so remounting it would rewrap the storage several times. This fix makes use of "loginAsUser()" and "logout()" from the TestCase class to properly initialize and cleanup the FS as expected. | ||||
* | | | | Merge pull request #14879 from oparoz/fix-preview-caching | Morris Jobke | 2015-04-07 | 1 | -19/+71 |
|\ \ \ \ | | | | | | | | | | | Introducing the maximum size preview | ||||
| * | | | | Introducing the maximum size preview | Olivier Paroz | 2015-04-07 | 1 | -19/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over. One of the fixes required for #12465 | ||||
* | | | | | Merge pull request #14472 from owncloud/feature/wipencryptionapp | Thomas Müller | 2015-04-07 | 17 | -94/+453 |
|\ \ \ \ \ | |/ / / / |/| | | | | encryption 2.0 app | ||||
| * | | | | fixing unit test - expected value change due to different size being stored ↵ | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | in cache table | ||||
| * | | | | fixing unit test execution related to trashbin | Thomas Müller | 2015-04-07 | 2 | -0/+27 |
| | | | | |