Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Changed logtype to file instead of owncloud. | Thomas Pulzer | 2016-07-22 | 13 | -31/+37 |
| | | | | | | | | | | | | | | - 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. | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-22 | 114 | -174/+200 |
| | |||||
* | Merge pull request #505 from nextcloud/fix-license-script | Morris Jobke | 2016-07-21 | 1 | -4/+8 |
|\ | | | | | Fix the license script | ||||
| * | only search the license header for @copyright statements | Bjoern Schiessle | 2016-07-21 | 1 | -2/+3 |
| | | |||||
| * | Fix the license script | Joas Schilling | 2016-07-21 | 1 | -2/+5 |
| | | |||||
* | | Merge pull request #496 from nextcloud/fix-config-generation | Morris Jobke | 2016-07-21 | 2 | -7/+7 |
|\ \ | | | | | | | Make the changes from doc fix persistant | ||||
| * | | Change the app name | Joas Schilling | 2016-07-21 | 1 | -1/+1 |
| | | | |||||
| * | | Make the changes from ↵ | Joas Schilling | 2016-07-21 | 1 | -6/+6 |
| | | | | | | | | | | | | https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant | ||||
* | | | Merge pull request #507 from nextcloud/run-le-script | Morris Jobke | 2016-07-21 | 1487 | -2939/+5010 |
|\ \ \ | | | | | | | | | Update emails and license headers with latest changes | ||||
| * | | | Update with robin | Joas Schilling | 2016-07-21 | 543 | -539/+809 |
| | | | | |||||
| * | | | Fix others | Joas Schilling | 2016-07-21 | 793 | -1261/+2207 |
| | | | | |||||
| * | | | Fix apps/ | Joas Schilling | 2016-07-21 | 679 | -1162/+2017 |
| | |/ | |/| | |||||
* | | | Merge pull request #374 from lpszBuffer/master | William Bargent | 2016-07-21 | 3 | -7/+27 |
|\ \ \ | | | | | | | | | Alters 'No Internet Connection' error message. #181 | ||||
| * | | | Alters 'No Internet Connection' error message. #181 | Derek | 2016-07-20 | 3 | -7/+27 |
| | | | | |||||
* | | | | 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'. | ||||
* | | | | Merge pull request #506 from nextcloud/update-mailmap | Joas Schilling | 2016-07-21 | 1 | -7/+8 |
|\ \ \ \ | | | | | | | | | | | Fix more mailmap entries | ||||
| * | | | | Fix more mailmap entries | Joas Schilling | 2016-07-21 | 1 | -7/+8 |
|/ / / / | |||||
* | | | | Merge pull request #501 from nextcloud/mailmap | Björn Schießle | 2016-07-21 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fix e-mail in mailmap | ||||
| * | | | Fix e-mail in mailmap | Roeland Jago Douma | 2016-07-21 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #477 from nextcloud/fix-layout-public-upload | Morris Jobke | 2016-07-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | move closing div to the right place | ||||
| * | | | move closing div to the right place | Bjoern Schiessle | 2016-07-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #484 from nextcloud/reenable-help-section | Morris Jobke | 2016-07-21 | 2 | -8/+6 |
|\ \ \ \ | | | | | | | | | | | [master] Reenable help section | ||||
| * | | | | Add proper links | Lukas Reschke | 2016-07-21 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Revert "Remove "Help" link from personal sidebar" | Lukas Reschke | 2016-07-21 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit deef15a3c7119b2965e7212ce53ba70e6baed779. | ||||
* | | | | | Merge pull request #486 from nextcloud/master-link-proper | Morris Jobke | 2016-07-21 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [master] Properly link to nextcloud | ||||
| * | | | | | [master] Properly link to nextcloud | Lukas Reschke | 2016-07-21 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #488 from nextcloud/brand-to-nextcloud | Morris Jobke | 2016-07-21 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | [master] Use proper branding | ||||
| * | | | | Use proper branding | Lukas Reschke | 2016-07-21 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | Stable9 has this already | ||||
* | | | | Merge branch 'master' of https://github.com/nextcloud/server | Lukas Reschke | 2016-07-21 | 24 | -30/+182 |
|\ \ \ \ | |||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-21 | 24 | -30/+182 |
| | | | | | |||||
* | | | | | 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 | ||||
* | | | | Add ownCloud cert | Lukas Reschke | 2016-07-21 | 1 | -0/+66 |
| | | | | |||||
* | | | | Use proper certificates | Lukas Reschke | 2016-07-21 | 3 | -87/+77 |
| | | | | | | | | | | | | | | | | Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9 | ||||
* | | | | Merge pull request #483 from nextcloud/use-proper-documentation-links | Lukas Reschke | 2016-07-21 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Use proper documentation links | ||||
| * | | | | 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... | ||||
* | | | | 10.0 beta it is | Lukas Reschke | 2016-07-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #479 from nextcloud/add-bruteforce-throttler | Lukas Reschke | 2016-07-21 | 25 | -68/+701 |
|\ \ \ \ | |_|/ / |/| | | | Implement brute force protection | ||||
| * | | | Mitigate race condition | Lukas Reschke | 2016-07-20 | 4 | -11/+57 |
| | | | | |||||
| * | | | JSON encode the values | Lukas Reschke | 2016-07-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Implement brute force protection | Lukas Reschke | 2016-07-20 | 25 | -68/+655 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 12 | -95/+634 |
|\ \ \ \ | | | | | | | | | | | [master] Port Same-Site Cookies to master | ||||
| * | | | | [master] Port Same-Site Cookies to master | Lukas Reschke | 2016-07-20 | 12 | -95/+634 |
| |/ / / | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/50 | ||||
* | | | | Merge pull request #466 from nextcloud/escape-special-characters | Lukas Reschke | 2016-07-20 | 6 | -8/+10 |
|\ \ \ \ | | | | | | | | | | | Escape special characters (#25429) | ||||
| * | | | | Escape special characters (#25429) | Aaron Wood | 2016-07-20 | 6 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Escape LIKE parameter * Use correct method in the AbstractMapping class * Change the getNamesBySearch method so that input can be properly escaped while still supporting matches * Don't escape hardcoded wildcard | ||||
* | | | | | Merge pull request #475 from nextcloud/ocs-middleware | Roeland Douma | 2016-07-20 | 8 | -0/+363 |
|\ \ \ \ \ | | | | | | | | | | | | | Add OCS Middleware | ||||
| * | | | | | Deprecate \OCP\API | Roeland Jago Douma | 2016-07-20 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Add unit tests | Roeland Jago Douma | 2016-07-20 | 1 | -0/+108 |
| | | | | | |