summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add tests for correct pathJoas Schilling2015-04-201-1/+2
|
* Fix phpStorm complains and namespaceJoas Schilling2015-04-201-7/+18
|
* get rid of OC_GeoGeorg Ehrke2015-04-191-23/+0
|
* Use data provider instead of hand-crafted for loopsMorris Jobke2015-04-181-22/+24
| | | | | * reduces scrutinizer complains * uses PHPUnit functionality
* always create a new instance of the encryption moduleBjoern Schiessle2015-04-171-19/+22
|
* detect system wide mount points correctlyBjoern Schiessle2015-04-163-14/+31
|
* add migration script from old encryption to new oneBjoern Schiessle2015-04-161-48/+47
|
* Merge pull request #12006 from owncloud/dav-put-storageMorris Jobke2015-04-151-9/+25
|\ | | | | Work directly on the storage when uploading over webdav
| * pass a stream to the testsRobin Appelman2015-04-141-5/+13
| |
| * update testsRobin Appelman2015-04-091-4/+12
| |
* | Merge pull request #15592 from owncloud/fix-15590-masterThomas Müller2015-04-151-0/+22
|\ \ | | | | | | Avoid php message "Invalid argument supplied for foreach()"
| * | Remove unneeded commentsMorris Jobke2015-04-141-13/+0
| | |
| * | Avoid php message "Invalid argument supplied for foreach()" - refs #15590Thomas Müller2015-04-141-0/+35
| | |
* | | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-142-14/+2
|\ \ \ | | | | | | | | Fix file size of encrypted files
| * | | remove calculateUnencryptedSize() - not neededThomas Müller2015-04-142-14/+2
| | | |
* | | | Merge pull request #13360 from owncloud/cross-storage-moveMorris Jobke2015-04-141-7/+81
|\ \ \ \ | |/ / / |/| | | Proper copy/move between multiple local storages
| * | | Properly handle copy/move failures in cross storage copy/moveRobin Appelman2015-04-131-5/+14
| | | |
| * | | Improve cross storage copy between local storagesRobin Appelman2015-04-131-2/+67
| | | |
* | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-131-13/+61
|\ \ \ \ | | | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages
| * | | | Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-131-13/+61
| |/ / /
* | | | upda testsRobin Appelman2015-04-131-6/+1
| | | |
* | | | preserve cache data when doing a cross storage moveRobin Appelman2015-04-131-0/+74
|/ / /
* | | Properly add trailing slash to mount pointVincent Petry2015-04-131-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üller2015-04-131-0/+45
|/ / | | | | | | /xxx/lib/private/ocsclient.php#282"
* | Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-122-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 codeLukas Reschke2015-04-102-0/+254
| | |
* | | fix cherrypickingJörn Friedrich Dreyer2015-04-102-28/+37
| | |
* | | fix filesystem and encryption testsJörn Friedrich Dreyer2015-04-101-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_sharesThomas Müller2015-04-091-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 shareBjoern Schiessle2015-04-091-0/+7
| | |
* | | Merge pull request #15511 from owncloud/fix-typosLukas Reschke2015-04-092-0/+4
|\ \ \ | | | | | | | | Fix typos and some other adjustments
| * | | Fix mock object to return proper typeThomas Müller2015-04-091-0/+2
| | | |
| * | | Fix mock object to return proper typeThomas Müller2015-04-091-0/+2
| |/ /
* | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deletingThomas Müller2015-04-091-0/+16
|\ \ \ | |/ / |/| | Check if the key exists, before trying to delete it
| * | Check if the key exists, before trying to delete itJoas Schilling2015-04-091-0/+16
| | |
* | | Merge pull request #15314 from owncloud/app-categories-15274Lukas Reschke2015-04-092-0/+1165
|\ \ \ | |/ / |/| | Add different trust levels to AppStore interface
| * | Make user names clickableLukas Reschke2015-04-031-0/+3
| | |
| * | Add experimental applications switchLukas Reschke2015-04-032-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-favoritesMorris Jobke2015-04-091-1/+102
|\ \ \ | | | | | | | | Limit file activities to favorites
| * | | Make scrutinizer happyJoas Schilling2015-04-011-17/+10
| | | |
| * | | Add tests from getCurrentUserId() method and fix the constructorJoas Schilling2015-03-301-1/+109
| | | |
* | | | Merge pull request #14987 from rullzer/ocs_password_fix2Morris Jobke2015-04-081-0/+234
|\ \ \ \ | | | | | | | | | | OCS Fixes to allow setting of password without removing additional settings
| * | | | Fix unit testRoeland Jago Douma2015-03-301-0/+4
| | | | |
| * | | | OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-03-301-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added setPassword to share.php - Fixed OCS API call - Added unit tests
* | | | | Replace originalStorage in tests with a proper teardownVincent Petry2015-04-0811-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-cachingMorris Jobke2015-04-071-19/+71
|\ \ \ \ | | | | | | | | | | Introducing the maximum size preview
| * | | | Introducing the maximum size previewOlivier Paroz2015-04-071-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/wipencryptionappThomas Müller2015-04-0717-94/+453
|\ \ \ \ \ | |/ / / / |/| | | | encryption 2.0 app
| * | | | fixing unit test - expected value change due to different size being stored ↵Thomas Müller2015-04-072-2/+2
| | | | | | | | | | | | | | | | | | | | in cache table
| * | | | fixing unit test execution related to trashbinThomas Müller2015-04-072-0/+27
| | | | |