Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Fix mounting wrapped storages resulting in many-layered wrapping" | Robin McCorkell | 2015-08-19 | 1 | -21/+0 |
| | | | | This reverts commit 75a5e6e12b18a9f5b7b113cd7e2c9c56c204084d. | ||||
* | Move avatarcontroller towards Node Api | Roeland Jago Douma | 2015-08-18 | 1 | -11/+11 |
| | |||||
* | Merge pull request #17182 from owncloud/user_ini_upload_size | Robin McCorkell | 2015-08-17 | 3 | -0/+202 |
|\ | | | | | Update .user.ini when setting upload size limit | ||||
| * | Unit test OC_Files::setUploadLimit() | Robin McCorkell | 2015-07-20 | 3 | -0/+202 |
| | | | | | | | | | | | | | | There was also a bug with checking the upper limit on the passed upload size. PHP does funny things with integer vs float comparisons, so our check didn't work. Now the check is much simpler, and ensures the value is sane. | ||||
* | | [test] more tests for UserController::setMailAddress | Morris Jobke | 2015-08-17 | 1 | -5/+13 |
| | | | | | | | | * fixes #12885 | ||||
* | | Merge pull request #17982 from owncloud/appframework-sanitize-name | Thomas Müller | 2015-08-12 | 1 | -0/+19 |
|\ \ | | | | | | | Sanitize class names before registerService/query | ||||
| * | | Sanitize class names before registerService/query | Robin McCorkell | 2015-07-30 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | Leading backslashes are removed, so a `registerService('\\OC\\Foo')` can still be resolved with `query('OC\\Foo')`. | ||||
* | | | Merge pull request #18127 from owncloud/dav-request-tests | Thomas Müller | 2015-08-12 | 5 | -0/+405 |
|\ \ \ | | | | | | | | | add test framework for doing full request webdav tests | ||||
| * | | | fix setup/teardown | Robin Appelman | 2015-08-11 | 1 | -11/+18 |
| | | | | |||||
| * | | | split out creating the sabre dav server to it's own factory | Robin Appelman | 2015-08-11 | 1 | -31/+13 |
| | | | | |||||
| * | | | add test framework for doing full request webdav tests | Robin Appelman | 2015-08-11 | 5 | -0/+416 |
| | | | | |||||
* | | | | Merge pull request #17852 from owncloud/register-alias-factory | Robin McCorkell | 2015-08-11 | 2 | -14/+47 |
|\ \ \ \ | | | | | | | | | | | Add test for factories | ||||
| * | | | | add test for factories | Bernhard Posselt | 2015-07-25 | 2 | -14/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use ref for factory test use a factory for registerAlias Ensure we construct SimpleContainer Use single instance of DIContainer in routing tests | ||||
* | | | | | Merge pull request #17868 from owncloud/x-forwarded-for | Thomas Müller | 2015-08-11 | 1 | -1/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | Set default 'forwarded for' headers for reverse proxy | ||||
| * | | | | | Add setup check for reverse proxy header configuration | Robin McCorkell | 2015-08-10 | 1 | -1/+48 |
| | | | | | | |||||
* | | | | | | Merge pull request #17932 from owncloud/fix_move_files | Thomas Müller | 2015-08-11 | 1 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the root folder with the nodes API | ||||
* | | | | | | | Merge pull request #17830 from ↵ | Joas Schilling | 2015-08-11 | 1 | -0/+43 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-17825-dont-silently-ignore-invalid-consumers-extensions Throw a InvalidArgumentException when a consumer/extension is invalid | ||||
| * | | | | | | | Throw a InvalidArgumentException when a consumer/extension is invalid | Joas Schilling | 2015-07-23 | 1 | -0/+43 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #18096 from sualko/patch-1 | Morris Jobke | 2015-08-10 | 4 | -56/+56 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | add data: to allowed image domains | ||||
| * | | | | | | | add more unit tests for data: as allowed image domain | sualko | 2015-08-10 | 3 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | add unit test for data: as allowed image domain | sualko | 2015-08-07 | 1 | -53/+53 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #17919 from rullzer/php_supported_check | Thomas Müller | 2015-08-10 | 1 | -0/+45 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Display warning in security & setup warnings if php version is EOL | ||||
| * | | | | | | | | Display warning in security & setup warnings if php version is EOL | Roeland Jago Douma | 2015-07-29 | 1 | -0/+45 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder | Thomas Müller | 2015-08-10 | 3 | -53/+83 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Automatic db prefix query builder | ||||
| * | | | | | | | | | Remove unnecessary DB prefixes from existing query builder usages | Joas Schilling | 2015-08-10 | 2 | -19/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Automatically prefix table names with *PREFIX* unless specified | Joas Schilling | 2015-08-10 | 1 | -34/+64 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Use DI | Roeland Jago Douma | 2015-08-10 | 2 | -18/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Register OCP\Capability\IManager at DIContainer * Add register capabilities to appframework * Register capabilities in DI way * Make unit test pass again * Remove CapabiltiesManager from OCP | ||||
* | | | | | | | | | Added Capabilities Manager | Roeland Jago Douma | 2015-08-10 | 2 | -0/+171 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This should allow the capabilities to be intergrated into the appframework * Unit tests * Throw exception if closure does not return ICapability instance | ||||
* | | | | | | | | Merge pull request #18124 from owncloud/share-permwrongvar | Morris Jobke | 2015-08-07 | 1 | -3/+60 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | 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 | -3/+60 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #13641 from owncloud/cache-storage-status | Vincent Petry | 2015-08-07 | 2 | -0/+170 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Store storage availability in database | ||||
| * | | | | | | | | Fix mounting wrapped storages resulting in many-layered wrapping | Robin McCorkell | 2015-07-20 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+149 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | Following the spec: | Thomas Müller | 2015-08-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "`statuscode`: The OCS status code of the response, everything except 100 MUST be handled as failure." | ||||
* | | | | | | | | Merge pull request #18035 from owncloud/ocs-2.0 | Bernhard Posselt | 2015-08-05 | 3 | -7/+52 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Adding ocs/v2.php with status code mapper | ||||
| * | | | | | | | | Return 200 not null - we should return consistent types | Thomas Müller | 2015-08-05 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix unit test within OCSController | Thomas Müller | 2015-08-03 | 1 | -4/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove duplicate and unused code | Thomas Müller | 2015-08-03 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Adding ocs/v2.php with status code mapper | Thomas Müller | 2015-08-03 | 1 | -0/+40 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #18057 from owncloud/import_root_certificates | Thomas Müller | 2015-08-05 | 1 | -7/+18 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | disable "ssl root certificate" settings if user can't mount external storages | ||||
| * | | | | | | | | also block certificate management in the back-end if external storages are ↵ | Bjoern Schiessle | 2015-08-04 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled for the user | ||||
* | | | | | | | | | Use StringUtils::equals on CSRF token and add unit tests | Lukas Reschke | 2015-08-04 | 1 | -0/+95 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove pointless unit test | Thomas Müller | 2015-08-04 | 1 | -7/+0 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | always update file cache, the cache can handle partial data correctly if the ↵ | Bjoern Schiessle | 2015-07-31 | 1 | -3/+5 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | file doesn't already exists in the file cache | ||||
* | | | | | | | Merge pull request #17805 from owncloud/avatar-handle-errors | Roeland Douma | 2015-07-31 | 1 | -4/+17 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [avatar] add error handlers for avatar setup | ||||
| * | | | | | | | [avatar] add error handlers for avatar setup | Morris Jobke | 2015-07-30 | 1 | -4/+17 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add colon to translated string use placeholder in t() Adding a size limitation for avatar upload Unit test for file size Fix typo & display server side error message | ||||
* | | | | | | | Fix incorrect test naming | Robin McCorkell | 2015-07-30 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `tesOverrideService()` was incorrect and wasn't getting called by PHPUnit. Also, the unit test itself was wrong, but went unnoticed because of point 1. | ||||
* | | | | | | | Merge pull request #17981 from owncloud/correct-regex | Thomas Müller | 2015-07-30 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Correct regular expressions | ||||
| * | | | | | | | Add more unit tests | Lukas Reschke | 2015-07-30 | 1 | -0/+2 |
| | | | | | | | |