Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #596 from nextcloud/adjust-mysql-install-error | Björn Schießle | 2016-07-27 | 1 | -1/+9 |
|\ | | | | | Fix misleading MySQL DB creation error (#25485) | ||||
| * | Fix misleading MySQL DB creation error (#25485) | Vincent Petry | 2016-07-27 | 1 | -1/+9 |
| | | | | | | | | | | | | | | Whenever the GRANT ALL failed, it used to display "Database creation failed" which is incorrect. It's only the privleges setting that failed. This moves the privilege setting message to DEBUG and makes it more precise. | ||||
* | | Merge pull request #582 from nextcloud/checks-from-js | Joas Schilling | 2016-07-27 | 1 | -79/+0 |
|\ \ | | | | | | | Generate the checks list in JS | ||||
| * | | Remove php side of check registration | Joas Schilling | 2016-07-27 | 1 | -79/+0 |
| |/ | |||||
* / | Allow DI of the workflow manager by the OCP interface | Joas Schilling | 2016-07-27 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #565 from nextcloud/workflowengine | Joas Schilling | 2016-07-27 | 3 | -0/+183 |
|\ | | | | | Add workflowengine | ||||
| * | Add workflowengine | Morris Jobke | 2016-07-26 | 3 | -0/+183 |
| | | |||||
* | | Merge pull request #566 from nextcloud/setup-port | Morris Jobke | 2016-07-27 | 1 | -10/+26 |
|\ \ | | | | | | | revert to old setup connection logic | ||||
| * | | revert to old setup connection logic | Robin Appelman | 2016-07-26 | 1 | -10/+26 |
| |/ | |||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-27 | 2 | -0/+2 |
|/ | |||||
* | Merge pull request #292 from nextcloud/recent-files | William Bargent | 2016-07-25 | 5 | -2/+98 |
|\ | | | | | Add "Recent" file listing | ||||
| * | use limit instead of since when listing recent files | Robin Appelman | 2016-07-22 | 3 | -45/+11 |
| | | |||||
| * | add recent files to node api | Robin Appelman | 2016-07-22 | 4 | -1/+131 |
| | | |||||
| * | Fix storage id with storage jail | Robin Appelman | 2016-07-22 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #509 from nextcloud/appframework_magic_allow_default_vars | Morris Jobke | 2016-07-25 | 1 | -0/+6 |
|\ \ | | | | | | | AppFramework add default values (ApiController) as parameters | ||||
| * | | Inject parameters | Roeland Jago Douma | 2016-07-22 | 1 | -0/+6 |
| |/ | |||||
* | | Merge pull request #550 from nextcloud/ldap-integration-test-autoloader | Morris Jobke | 2016-07-25 | 1 | -1/+1 |
|\ \ | | | | | | | fix autoloading in LPAP integration tests, resolves #544 | ||||
| * | | fix autoloading in LPAP integration tests, resolves #544 | Arthur Schiwon | 2016-07-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #523 from Faldon/master | Joas Schilling | 2016-07-25 | 3 | -4/+10 |
|\ \ \ | | | | | | | | | Renamed file logging | ||||
| * | | | Changed code style and made use of '===' comparison. | Thomas Pulzer | 2016-07-22 | 1 | -1/+4 |
| | | | | |||||
| * | | | Reverted the default syslog tag to avoid breaking existing systems. | Thomas Pulzer | 2016-07-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changed logtype to file instead of owncloud. | Thomas Pulzer | 2016-07-22 | 4 | -5/+8 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. | ||||
* | | | Merge pull request #530 from nextcloud/fix-theme-loading | Morris Jobke | 2016-07-25 | 2 | -2/+10 |
|\ \ \ | | | | | | | | | Make sure we try to autoload the class | ||||
| * | | | Make sure we try to autoload the class | Joas Schilling | 2016-07-22 | 2 | -2/+10 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-25 | 2 | -0/+4 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-24 | 2 | -0/+4 |
| | | | |||||
* | | | Check if an app provide two-factor-auth providers before we try to use them | Robin Appelman | 2016-07-23 | 1 | -9/+11 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-23 | 6 | -14/+20 |
|/ / | |||||
* / | Set proper status code in OCS AppFramework Middleware | Roeland Jago Douma | 2016-07-22 | 1 | -1/+6 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-22 | 8 | -0/+8 |
| | |||||
* | Merge pull request #507 from nextcloud/run-le-script | Morris Jobke | 2016-07-21 | 673 | -1330/+2138 |
|\ | | | | | Update emails and license headers with latest changes | ||||
| * | Update with robin | Joas Schilling | 2016-07-21 | 278 | -272/+278 |
| | | |||||
| * | Fix others | Joas Schilling | 2016-07-21 | 673 | -1061/+1863 |
| | | |||||
* | | Merge pull request #480 from nextcloud/fix_ocs_response_format | Lukas Reschke | 2016-07-21 | 4 | -6/+25 |
|\ \ | |/ |/| | AppFramework default response for OCS is xml | ||||
| * | AppFramework do not get default response | Roeland Jago Douma | 2016-07-20 | 4 | -6/+25 |
| | | | | | | | | | | | | | | | | | | The OCSResponse differs from other responses in that it defaults to XML. However we fell back to json by default. This makes sure that if nothing is set we don't pass anything. Which defaults then to the controllers default (which is often 'json') but in the case of the OCSResponse 'xml'. | ||||
* | | Revert "Remove "Help" link from personal sidebar" | Lukas Reschke | 2016-07-21 | 1 | -4/+2 |
| | | | | | | | | This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779. | ||||
* | | Merge branch 'master' of https://github.com/nextcloud/server | Lukas Reschke | 2016-07-21 | 2 | -4/+4 |
|\ \ | |||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-21 | 2 | -4/+4 |
| | | | |||||
* | | | Fix typo | Lukas Reschke | 2016-07-21 | 1 | -1/+1 |
|/ / | |||||
* | | Link to proper clients | Lukas Reschke | 2016-07-21 | 1 | -4/+3 |
| | | |||||
* | | Port ↵ | Lukas Reschke | 2016-07-21 | 2 | -1/+19 |
| | | | | | | | | https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c6df to master | ||||
* | | Use proper certificates | Lukas Reschke | 2016-07-21 | 1 | -2/+9 |
| | | | | | | | | Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9 | ||||
* | | Use proper documentation links | Lukas Reschke | 2016-07-21 | 1 | -2/+2 |
| | | | | | | | | Since it is just faking the 10 we need to hardcode this here... | ||||
* | | Merge pull request #479 from nextcloud/add-bruteforce-throttler | Lukas Reschke | 2016-07-21 | 7 | -22/+282 |
|\ \ | |/ |/| | Implement brute force protection | ||||
| * | Mitigate race condition | Lukas Reschke | 2016-07-20 | 1 | -1/+4 |
| | | |||||
| * | JSON encode the values | Lukas Reschke | 2016-07-20 | 1 | -1/+1 |
| | | |||||
| * | Implement brute force protection | Lukas Reschke | 2016-07-20 | 7 | -22/+279 |
| | | | | | | | | | | | | | | | | | | 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 | 8 | -1/+198 |
|\ \ | | | | | | | [master] Port Same-Site Cookies to master | ||||
| * | | [master] Port Same-Site Cookies to master | Lukas Reschke | 2016-07-20 | 8 | -1/+198 |
| |/ | | | | | | | Fixes https://github.com/nextcloud/server/issues/50 | ||||
* | | Merge pull request #466 from nextcloud/escape-special-characters | Lukas Reschke | 2016-07-20 | 2 | -3/+3 |
|\ \ | | | | | | | Escape special characters (#25429) |