Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix apps/ | Joas Schilling | 2016-07-21 | 679 | -1162/+2017 |
| | |||||
* | 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 |
| | | | | | |||||
| * | | | | Add OCSMiddleware to catch OCS exceptions | Roeland Jago Douma | 2016-07-20 | 6 | -0/+253 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * OCSException * OCSBadRequestException * OCSForbiddenException * OCSNotFoundException | ||||
* | | | | | Merge pull request #461 from nextcloud/session-styling | Morris Jobke | 2016-07-20 | 4 | -7/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Minor sessions/app password improvements | ||||
| * | | | | | sort tokens | Robin Appelman | 2016-07-20 | 2 | -3/+9 |
| | | | | | | |||||
| * | | | | | right allign last activity | Robin Appelman | 2016-07-20 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | fix apppassword table with only a few entries being streched | Robin Appelman | 2016-07-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Change "recent activity" to "last activity" | Robin Appelman | 2016-07-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | improve matching safari user agent | Robin Appelman | 2016-07-20 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #471 from nextcloud/storage-fopenspecialchars | Morris Jobke | 2016-07-20 | 2 | -7/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added storage tests for fopen with special chars | ||||
| * | | | | | | Added storage tests for fopen with special chars | Vincent Petry | 2016-07-20 | 2 | -7/+21 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to test special chars with unit tests. There is already a test for directories but there was none for file names. | ||||
* | | | | | | Merge pull request #390 from nextcloud/occ-user | Roeland Douma | 2016-07-20 | 6 | -0/+424 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | More occ user management commands | ||||
| * | | | | | | add occ command to show user information | Robin Appelman | 2016-07-19 | 2 | -0/+89 |
| | | | | | | | |||||
| * | | | | | | Add commands to add/remove users to/from groups | Robin Appelman | 2016-07-19 | 3 | -0/+156 |
| | | | | | | | |||||
| * | | | | | | add command to list groups | Robin Appelman | 2016-07-19 | 2 | -0/+91 |
| | | | | | | | |||||
| * | | | | | | add occ command to list users | Robin Appelman | 2016-07-19 | 2 | -0/+88 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #467 from nextcloud/use-clipboard-api | Roeland Douma | 2016-07-20 | 11 | -12/+809 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use clipboard api |