Commit Graph

38334 Commits

Author SHA1 Message Date
Morris Jobke fbedea0807
Add PHPDoc and handle exception in ScanAppData as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:04:16 -05:00
Robin Appelman ce2dba0796
show error when trying to scan non existing path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-19 14:36:38 +02:00
Lukas Reschke a3569a1452 Merge pull request #4382 from nextcloud/use-proper-reply-to
Add "Reply-To" on ShareByMailProvider mails
2017-04-19 12:04:18 +02:00
Lukas Reschke b7fe28bba1
Fix indentation
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-19 12:03:54 +02:00
Roeland Jago Douma ad24b86013 Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
Adjust existing bruteforce protection code
2017-04-19 09:27:23 +02:00
Morris Jobke f1ddb939a0 Merge pull request #4371 from nextcloud/dont-allow-dot-usernames
Better validation of allowed user names
2017-04-18 20:04:32 -05:00
Nextcloud bot febe01f571
[tx-robot] updated from transifex 2017-04-19 00:07:40 +00:00
Nextcloud bot 6b490f45fd
[tx-robot] updated from transifex 2017-04-18 23:08:43 +00:00
Morris Jobke 269600a04f Merge pull request #4369 from nextcloud/fix-translations
Fix translations
2017-04-18 18:01:50 -05:00
Morris Jobke 34e0b21f41 Merge pull request #3585 from nextcloud/popover-clickable-area
expand clickable area of popover menu entries to full width
2017-04-18 17:59:42 -05:00
Morris Jobke 4b2d594c70 Merge pull request #4379 from nextcloud/nicely-designed-confirmation-mail
Beautify test email
2017-04-18 17:17:40 -05:00
Jan-Christoph Borchardt 535ec04245
expand clickable area of popover menu entries to full width
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-04-18 16:59:35 -05:00
Joas Schilling 1c0bffe87f
Fix translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
Morris Jobke 47fe5e8f41 Merge pull request #4380 from nextcloud/show-instance-name-in-from
Add instance name to default sender
2017-04-18 16:22:56 -05:00
Lukas Reschke 0a54d5a5dd
Beautify test email
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 16:18:00 -05:00
Morris Jobke d379ac7545 Merge pull request #4372 from nextcloud/smtp-password
Don't put the SMTP password into the HTML code
2017-04-18 16:13:31 -05:00
Nextcloud bot c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Lukas Reschke 203ef88509
Add "Reply-To" on ShareByMailProvider mails
Fixes https://github.com/nextcloud/server/issues/4209

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 22:23:07 +02:00
Morris Jobke d2c4440ed6
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 15:08:38 -05:00
Lukas Reschke bae64e810e
Add instance name to default sender
Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 21:44:37 +02:00
Christoph Wurst 24f5c44e2b Merge pull request #4376 from nextcloud/add-bruteforce-protection-to-change-self-password
Add bruteforce protection to changePersonalPassword
2017-04-18 21:43:11 +02:00
Lukas Reschke 805419bb95
Add bruteforce protection to changePersonalPassword
While the risk is actually quite low because one would already have the user session and could potentially do other havoc it makes sense to throttle here in case of invalid previous password attempts.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 17:55:51 +02:00
Joas Schilling fcaa315c96
Fix some more stuff
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:11:29 +02:00
Joas Schilling dfca672378
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:08:29 +02:00
Joas Schilling a5b4308a51
Don't put the SMTP password into the HTML code
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 15:44:20 +02:00
Joas Schilling a3922bbcdc
Better validation of allowed user names
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 14:29:34 +02:00
Nextcloud bot b072d2c49d
[tx-robot] updated from transifex 2017-04-18 00:07:25 +00:00
Nextcloud bot df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot 69e0e2420c
[tx-robot] updated from transifex 2017-04-16 00:07:23 +00:00
Morris Jobke 10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager
Access list to share manager
2017-04-15 13:06:24 -05:00
Nextcloud bot dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Lukas Reschke 727688ebd9
Adjust existing bruteforce protection code
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-14 13:42:40 +02:00
Roeland Jago Douma f40b9fa9bd Merge pull request #4330 from nextcloud/activities-for-password-mail-change
Add activities when email or password is changed
2017-04-14 08:16:43 +02:00
Roeland Jago Douma 6b79bf0960 Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
Make BruteForceProtection annotation more clever
2017-04-14 08:15:55 +02:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Morris Jobke 8e8b345fbd
Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 16:28:07 -05:00
Lukas Reschke 8149945a91
Make BruteForceProtection annotation more clever
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.

Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-13 23:05:33 +02:00
Morris Jobke d0c0f6cfc1 Merge pull request #4326 from nextcloud/downstream-27562
Reorder the entries of the log for easier reading
2017-04-13 13:11:47 -05:00
Lukas Reschke 81d3732bf5 Merge pull request #4308 from nextcloud/lost-password-email
Update email template for lost password email
2017-04-13 20:02:15 +02:00
Morris Jobke d36751ee38 Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
Fix login controller test and consolidate login
2017-04-13 12:16:38 -05:00
Morris Jobke ac05d6dd67
Improve PHPDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:16:12 -05:00
Morris Jobke ec034757fa Merge pull request #4337 from nextcloud/fix-adblock-share-icon
Fix AdBlock blocking share icon, ref #866
2017-04-13 12:10:37 -05:00
Joas Schilling 695696a4a6
Use constants
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-13 12:04:32 -05:00
Morris Jobke 13c71203bb Merge pull request #4341 from nextcloud/local-link-explanation
Explain local link
2017-04-13 12:01:57 -05:00
Jos Poortvliet a8b09c860e
Explain local link
The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR:
* renames local link to direct link
* adds a short explanation, noting it only works for users who have access to this file/folder.

As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think?

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-13 12:01:45 -05:00
Lukas Reschke f3dbfd68a2 Merge pull request #4336 from nextcloud/add-ratelimiting
Add support for ratelimiting via annotations
2017-04-13 18:53:56 +02:00
Morris Jobke 9b9ca0b34d Merge pull request #4342 from nextcloud/update-certificate-bundle
Update CA bundle
2017-04-13 10:40:12 -05:00
Roeland Jago Douma 0f8a098476 Merge pull request #4344 from nextcloud/dont-load-handlebars
Don't load handlebars in template
2017-04-13 16:08:29 +02:00
Roeland Jago Douma cab41118f6
Mail shares trigger the public key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 15:19:23 +02:00
Roeland Jago Douma 6a519abde8
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-13 14:56:05 +02:00