Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into implement_712 | Lukas Reschke | 2016-08-15 | 6 | -102/+163 |
|\ | |||||
| * | We have to mock the is_uploaded_file in the OC\Core\Controller namespace | Roeland Jago Douma | 2016-08-15 | 1 | -8/+10 |
| | | |||||
| * | Fix mock call in AvatarControllerTest | Roeland Jago Douma | 2016-08-15 | 1 | -12/+12 |
| | | |||||
| * | Use generated URL | Lukas Reschke | 2016-08-15 | 1 | -1/+1 |
| | | |||||
| * | Fix CheckSetupController tests | Lukas Reschke | 2016-08-15 | 1 | -60/+26 |
| | | |||||
| * | Fix template test | Lukas Reschke | 2016-08-15 | 1 | -1/+1 |
| | | |||||
| * | Fix tests for LoginController | Lukas Reschke | 2016-08-15 | 1 | -5/+4 |
| | | |||||
| * | Add reference to current user | Lukas Reschke | 2016-08-15 | 1 | -0/+1 |
| | | |||||
| * | Add new dependency | Lukas Reschke | 2016-08-15 | 1 | -1/+7 |
| | | |||||
| * | Don't use create mock | Lukas Reschke | 2016-08-15 | 1 | -14/+14 |
| | | | | | | | | Not compatible with this PHPunit version | ||||
| * | Use proper casing | Lukas Reschke | 2016-08-15 | 2 | -6/+4 |
| | | |||||
| * | Use createMock instead of deprecated getMock | Lukas Reschke | 2016-08-11 | 1 | -12/+12 |
| | | |||||
| * | Redirect users when already logged-in on login form | Lukas Reschke | 2016-08-11 | 1 | -0/+95 |
| | | |||||
* | | Use MockBuilder instead of createMock | Lukas Reschke | 2016-08-15 | 9 | -33/+33 |
| | | | | | | | | CI uses an older PHPUnit | ||||
* | | Add unit tests | Lukas Reschke | 2016-08-15 | 11 | -3/+1082 |
|/ | |||||
* | OCSController requires DataResponse | Roeland Jago Douma | 2016-08-10 | 1 | -52/+5 |
| | | | | | | The OCS Controller requires a DataResponse object to be returned. This means that all error handling will have to be done via exceptions thrown and handling in the middleware. | ||||
* | Merge pull request #529 from nextcloud/vendor-maintenance-downgrade | Lukas Reschke | 2016-08-10 | 1 | -1/+12 |
|\ | | | | | Allow downgrades of maintenance accross vendors | ||||
| * | Allow downgrades of maintenance accross vendors | Joas Schilling | 2016-07-22 | 1 | -1/+12 |
| | | |||||
* | | Merge pull request #691 from nextcloud/ocs_allow_all_old_routes | Lukas Reschke | 2016-08-09 | 1 | -7/+7 |
|\ \ | | | | | | | Allow ocs/v2.php/cloud/... routes | ||||
| * | | Allow ocs/v2.php/cloud/... routes | Roeland Jago Douma | 2016-08-08 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the possibilities of the old OCS API is that you can define the url yourself. This PR makes this possible again by adding an optional root elemenet to the route. Routes are thus: .../ocs/v2.php/<root>/<url> By default <root> = apps/<app> This will allow for example the provisioning API etc to be in ../ovs/v2/php/cloud/users | ||||
* | | | Merge pull request #746 from nextcloud/jail-root | Lukas Reschke | 2016-08-09 | 1 | -2/+11 |
|\ \ \ | | | | | | | | | getJailedPath expects $path to have a trailing / | ||||
| * | | | Adding test case for getPathById including a jailed cache where root is just ↵ | Thomas Müller | 2016-08-05 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | empty | ||||
* | | | | Hanlde Core and Settings app in AppFramework | Roeland Jago Douma | 2016-08-08 | 1 | -0/+51 |
| |/ / |/| | | | | | | | | | | | | | | 'core' and 'settings' are just apps but we treat them slightly different. Make sure that we construct the correct namespace so we can actually do automatic AppFramework stuff. | ||||
* | | | Move Share backends to PSR-4 instead of using class path (#24941) | Joas Schilling | 2016-08-05 | 1 | -2/+2 |
|/ / | |||||
* | | Fix RepairUnmergedShares to not skip valid repair cases | Vincent Petry | 2016-08-03 | 1 | -2/+42 |
| | | | | | | | | | | | | The repair step was a bit overeager to skip repairing so it missed the case where a group share exists without subshares but with an additional direct user share. | ||||
* | | Add repair step for unmerged shares (WIP) | Vincent Petry | 2016-08-03 | 1 | -0/+409 |
| | | |||||
* | | We should properly check for 'true' instaed of the bool | Roeland Jago Douma | 2016-08-01 | 1 | -1/+2 |
| | | |||||
* | | Dark hackery to not always disable CSRF for OCS controllers | Roeland Jago Douma | 2016-07-29 | 1 | -0/+55 |
| | | |||||
* | | Merge pull request #556 from nextcloud/nextcloud-version-check | Morris Jobke | 2016-07-29 | 1 | -1/+3 |
|\ \ | | | | | | | Allow apps to check for a given nextcloud version | ||||
| * | | Translate the server version for nextcloud | Joas Schilling | 2016-07-26 | 1 | -1/+3 |
| | | | |||||
* | | | Support subdir in the OCS v2 endpoint | Roeland Jago Douma | 2016-07-27 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | We should check against the ending substring since people could run their nextcloud in a subfolder. * Added test | ||||
* | | | fix enabled apps tests | Morris Jobke | 2016-07-27 | 1 | -0/+5 |
| | | | |||||
* | | | fix unit tests | Morris Jobke | 2016-07-26 | 1 | -2/+2 |
| | | | |||||
* | | | Add workflowengine | Morris Jobke | 2016-07-26 | 1 | -2/+4 |
|/ / | |||||
* | | Merge pull request #292 from nextcloud/recent-files | William Bargent | 2016-07-25 | 1 | -4/+169 |
|\ \ | | | | | | | Add "Recent" file listing | ||||
| * | | use limit instead of since when listing recent files | Robin Appelman | 2016-07-22 | 1 | -7/+6 |
| | | | |||||
| * | | fix test | Robin Appelman | 2016-07-22 | 1 | -1/+4 |
| | | | |||||
| * | | add recent files to node api | Robin Appelman | 2016-07-22 | 1 | -4/+167 |
| |/ | |||||
* | | Merge pull request #523 from Faldon/master | Joas Schilling | 2016-07-25 | 3 | -13/+13 |
|\ \ | | | | | | | Renamed file logging | ||||
| * | | Renamed test classes for file logging tests. | Thomas Pulzer | 2016-07-22 | 2 | -3/+3 |
| | | | |||||
| * | | Changed logtype to file instead of owncloud. | Thomas Pulzer | 2016-07-22 | 3 | -10/+10 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated the config sample to point to log_type='file' - Renamed the Class for logfile logging to File in namespace 'OC\Log\'. Changed the occurrences of 'OC\Log\Owncloud' to 'OC\Log\File'. - Renamed the Class for log:file command to File in namespace 'OC\Core\Command\Log\File'. Changed registration of the command to use 'OC\Core\Command\Log\File'. - Changed default Syslog tag to Nextcloud - Retained backwards compatibility for configs with 'logtype' => 'owncloud' - Adjusted tests for the new file log. Closes #490. | ||||
* / | Add tests | Roeland Jago Douma | 2016-07-22 | 1 | -1/+35 |
|/ | |||||
* | Merge pull request #479 from nextcloud/add-bruteforce-throttler | Lukas Reschke | 2016-07-21 | 5 | -25/+275 |
|\ | | | | | Implement brute force protection | ||||
| * | Mitigate race condition | Lukas Reschke | 2016-07-20 | 2 | -9/+49 |
| | | |||||
| * | Implement brute force protection | Lukas Reschke | 2016-07-20 | 5 | -25/+235 |
| | | | | | | | | | | | | | | | | | | Class Throttler implements the bruteforce protection for security actions in Nextcloud. It is working by logging invalid login attempts to the database and slowing down all login attempts from the same subnet. The max delay is 30 seconds and the starting delay are 200 milliseconds. (after the first failed login) | ||||
* | | Merge pull request #476 from nextcloud/port-same-site-cookies | Lukas Reschke | 2016-07-20 | 2 | -94/+431 |
|\ \ | | | | | | | [master] Port Same-Site Cookies to master | ||||
| * | | [master] Port Same-Site Cookies to master | Lukas Reschke | 2016-07-20 | 2 | -94/+431 |
| |/ | | | | | | | Fixes https://github.com/nextcloud/server/issues/50 | ||||
* | | Merge pull request #475 from nextcloud/ocs-middleware | Roeland Douma | 2016-07-20 | 1 | -0/+108 |
|\ \ | | | | | | | Add OCS Middleware | ||||
| * | | Add unit tests | Roeland Jago Douma | 2016-07-20 | 1 | -0/+108 |
| |/ | |||||
* | | Merge pull request #471 from nextcloud/storage-fopenspecialchars | Morris Jobke | 2016-07-20 | 1 | -6/+20 |
|\ \ | |/ |/| | Added storage tests for fopen with special chars |