Commit Graph

33429 Commits

Author SHA1 Message Date
Morris Jobke febf95ffb4 Merge pull request #496 from nextcloud/fix-config-generation
Make the changes from doc fix persistant
2016-07-21 23:37:22 +02:00
Morris Jobke 8c7d7d7746 Merge pull request #507 from nextcloud/run-le-script
Update emails and license headers with latest changes
2016-07-21 23:27:15 +02:00
William Bargent 6da54a6987 Merge pull request #374 from lpszBuffer/master
Alters 'No Internet Connection' error message. #181
2016-07-21 18:55:58 +01:00
Lukas Reschke 562e63cf69 Merge pull request #480 from nextcloud/fix_ocs_response_format
AppFramework default response for OCS is xml
2016-07-21 19:52:17 +02:00
Joas Schilling 0215b004da Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling ba87db3fcc Fix others 2016-07-21 18:13:57 +02:00
Joas Schilling 813f0a0f40 Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling 8ec019e105 Merge pull request #506 from nextcloud/update-mailmap
Fix more mailmap entries
2016-07-21 17:43:33 +02:00
Joas Schilling c2e76908b7 Fix more mailmap entries 2016-07-21 17:32:03 +02:00
Björn Schießle 3ae6254d35 Merge pull request #501 from nextcloud/mailmap
Fix e-mail in mailmap
2016-07-21 16:38:55 +02:00
Roeland Jago Douma fac430ea9a Fix e-mail in mailmap 2016-07-21 14:48:26 +02:00
Joas Schilling 1902105b5f Change the app name 2016-07-21 12:57:05 +02:00
Joas Schilling 9c6c902220 Make the changes from https://github.com/nextcloud/documentation/commit/6ccd2c5678b85d35a8673d784bef5c6c89e7ecb9 persistant 2016-07-21 12:26:48 +02:00
Morris Jobke dc5608d15a Merge pull request #477 from nextcloud/fix-layout-public-upload
move closing div to the right place
2016-07-21 09:28:35 +02:00
Morris Jobke ca6c2c7855 Merge pull request #484 from nextcloud/reenable-help-section
[master] Reenable help section
2016-07-21 09:19:11 +02:00
Morris Jobke 167caa1295 Merge pull request #486 from nextcloud/master-link-proper
[master] Properly link to nextcloud
2016-07-21 09:17:53 +02:00
Morris Jobke d14098736e Merge pull request #488 from nextcloud/brand-to-nextcloud
[master] Use proper branding
2016-07-21 09:16:56 +02:00
Lukas Reschke 14b1edeb5d Add proper links 2016-07-21 02:25:00 +02:00
Lukas Reschke 4f42c3d725 Revert "Remove "Help" link from personal sidebar"
This reverts commit deef15a3c7.
2016-07-21 02:25:00 +02:00
Lukas Reschke 90a529f8da [master] Properly link to nextcloud 2016-07-21 02:24:48 +02:00
Lukas Reschke e55c1542fa Use proper branding
Stable9 has this already
2016-07-21 02:24:36 +02:00
Lukas Reschke 01ab40f557 Merge branch 'master' of https://github.com/nextcloud/server 2016-07-21 02:24:06 +02:00
Lukas Reschke a9f2789df5 Fix typo 2016-07-21 02:23:42 +02:00
Derek b236100619 Alters 'No Internet Connection' error message. #181 2016-07-20 19:12:10 -05:00
Nextcloud bot b7c5a59adf [tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Lukas Reschke 7c6896f091 Link to proper clients 2016-07-21 01:56:47 +02:00
Lukas Reschke 19f770d0db Port https://github.com/nextcloud/server/commit/2d373416d8e54a7de84879a365c372a85104c6df to master 2016-07-21 01:43:32 +02:00
Lukas Reschke 38b2239b0d Add ownCloud cert 2016-07-21 01:34:43 +02:00
Lukas Reschke 977db0a162 Use proper certificates
Ports https://github.com/nextcloud/server/commit/bcf693539be82e872ba4d6cceb1f430a4bb841d9
2016-07-21 01:34:11 +02:00
Lukas Reschke acb820ffb8 Merge pull request #483 from nextcloud/use-proper-documentation-links
Use proper documentation links
2016-07-21 00:47:27 +02:00
Lukas Reschke 9a1ff29351 Use proper documentation links
Since it is just faking the 10 we need to hardcode this here...
2016-07-21 00:36:52 +02:00
Lukas Reschke 2d52cc9fe0 10.0 beta it is 2016-07-21 00:32:43 +02:00
Lukas Reschke c385423d10 Merge pull request #479 from nextcloud/add-bruteforce-throttler
Implement brute force protection
2016-07-21 00:31:02 +02:00
Lukas Reschke c1589f163c Mitigate race condition 2016-07-20 23:09:27 +02:00
Lukas Reschke adf67fac96 JSON encode the values 2016-07-20 22:47:33 +02:00
Lukas Reschke ba4f12baa0 Implement brute force protection
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)
2016-07-20 22:08:56 +02:00
Roeland Jago Douma e42f2f2650 AppFramework do not get default response
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'.
2016-07-20 22:05:43 +02:00
Lukas Reschke 020a2a6958 Merge pull request #476 from nextcloud/port-same-site-cookies
[master] Port Same-Site Cookies to master
2016-07-20 21:35:02 +02:00
Lukas Reschke a17ba2f488 Merge pull request #466 from nextcloud/escape-special-characters
Escape special characters (#25429)
2016-07-20 21:24:19 +02:00
Roeland Douma 78cad699fe Merge pull request #475 from nextcloud/ocs-middleware
Add OCS Middleware
2016-07-20 21:04:25 +02:00
Morris Jobke 9a7b27b238 Merge pull request #461 from nextcloud/session-styling
Minor sessions/app password improvements
2016-07-20 20:57:06 +02:00
Morris Jobke e08278494d Merge pull request #471 from nextcloud/storage-fopenspecialchars
Added storage tests for fopen with special chars
2016-07-20 20:56:59 +02:00
Roeland Douma 1088916eda Merge pull request #390 from nextcloud/occ-user
More occ user management commands
2016-07-20 20:36:33 +02:00
Roeland Douma 9f219f55f2 Merge pull request #467 from nextcloud/use-clipboard-api
Use clipboard api
2016-07-20 20:11:08 +02:00
Roeland Douma 26cf51403e Merge pull request #464 from nextcloud/master-change-load-order
[master] Change load order of auth backends so that we can throw an exception …
2016-07-20 20:08:22 +02:00
Roeland Douma ffc345b141 Merge pull request #468 from nextcloud/stringid-fix
Cast share id to string (#25402)
2016-07-20 20:06:46 +02:00
Roeland Jago Douma cff5be3d63 Deprecate \OCP\API 2016-07-20 20:03:53 +02:00
Roeland Jago Douma 5f32b57332 Add unit tests 2016-07-20 20:03:49 +02:00
Roeland Jago Douma ea47974a08 Add OCSMiddleware to catch OCS exceptions
* OCSException
* OCSBadRequestException
* OCSForbiddenException
* OCSNotFoundException
2016-07-20 20:03:49 +02:00
Lukas Reschke a299fa38a9 [master] Port Same-Site Cookies to master
Fixes https://github.com/nextcloud/server/issues/50
2016-07-20 18:37:57 +02:00