Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | fixing unit tests | Thomas Müller | 2015-04-07 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | fixing unit test execution - test dummy module was behaving wrong | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | fixing unit test execution | Thomas Müller | 2015-04-07 | 1 | -7/+12 |
| | | | | | |||||
| * | | | | add unit tests to the keystorage | Bjoern Schiessle | 2015-04-07 | 1 | -40/+45 |
| | | | | | |||||
| * | | | | implement webdav copy | Bjoern Schiessle | 2015-04-07 | 1 | -0/+76 |
| | | | | | |||||
| * | | | | Properly set size and unencrypted size in the stream unit tests | Thomas Müller | 2015-04-07 | 1 | -9/+8 |
| | | | | | |||||
| * | | | | Adding unit test for read and write of big file | Thomas Müller | 2015-04-07 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | Fixing encryption storage wrapper tests | Thomas Müller | 2015-04-07 | 2 | -5/+66 |
| | | | | | |||||
| * | | | | fixing unit tests for encryption stream wrapper seek | Thomas Müller | 2015-04-07 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | fixing unit tests for stream wrapper | Thomas Müller | 2015-04-07 | 1 | -10/+42 |
| | | | | | |||||
| * | | | | update unit tests after ctor signature change of \OC\Encryption\Util | Thomas Müller | 2015-04-07 | 2 | -2/+8 |
| | | | | | |||||
| * | | | | kill OC_FileProxy :boom: | Thomas Müller | 2015-04-07 | 4 | -14/+0 |
| | | | | | |||||
| * | | | | Further cleanup of files_encryption | Thomas Müller | 2015-04-07 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Removing files_encryption left overs | Thomas Müller | 2015-04-07 | 3 | -23/+0 |
| | | | | | |||||
| * | | | | remove unencrypted_size from the cache, size will contain the unencrypted size | Bjoern Schiessle | 2015-04-07 | 2 | -8/+5 |
| | | | | | |||||
| * | | | | adding unit tests for stream wrapper | Thomas Müller | 2015-04-07 | 1 | -0/+41 |
| | | | | | |||||
| * | | | | various fixes & start to unit test the encryption storage wrapper | Thomas Müller | 2015-04-07 | 2 | -4/+50 |
| | | | | | |||||
| * | | | | fix unit test execution | Thomas Müller | 2015-04-07 | 1 | -5/+13 |
| | | | | | |||||
| * | | | | Comment duplicate test methods | Thomas Müller | 2015-04-07 | 1 | -57/+57 |
| | | | | | |||||
| * | | | | enable encryption unit test execution | Thomas Müller | 2015-04-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fix encryption manager to handle more than one encryption module | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Initial commit | Clark Tomlinson | 2015-04-07 | 1 | -0/+58 |
| | | | | | |||||
* | | | | | Merge pull request #15426 from owncloud/issue/15420-remove-hardcoded-docs-link | Morris Jobke | 2015-04-07 | 1 | -3/+14 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove hardcoded link to performance docs | ||||
| * | | | | Remove hardcoded link to performance docs | Joas Schilling | 2015-04-07 | 1 | -3/+14 |
| | | | | | |||||
* | | | | | Select the timezone on the right timestamp and assert it | Joas Schilling | 2015-04-07 | 1 | -8/+11 |
|/ / / / | |||||
* | | / | Introducing media types for yml, yaml, cnf, conf | Olivier Paroz | 2015-04-02 | 1 | -4/+49 |
| |_|/ |/| | | |||||
* | | | Adjust tests and check whether clear() is called | Joas Schilling | 2015-04-01 | 2 | -102/+82 |
| | | | |||||
* | | | Properly quote file names in listFiles query for GDrive | Vincent Petry | 2015-03-31 | 1 | -16/+18 |
| | | |