]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Fri, 14 Apr 2017 11:42:40 +0000 (13:42 +0200)]
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>
Roeland Jago Douma [Fri, 14 Apr 2017 06:16:43 +0000 (08:16 +0200)]
Merge pull request #4330 from nextcloud/activities-for-password-mail-change
Add activities when email or password is changed
Roeland Jago Douma [Fri, 14 Apr 2017 06:15:55 +0000 (08:15 +0200)]
Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
Make BruteForceProtection annotation more clever
Nextcloud bot [Fri, 14 Apr 2017 00:07:36 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 13 Apr 2017 21:28:07 +0000 (16:28 -0500)]
Fix autoloader
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Lukas Reschke [Thu, 13 Apr 2017 20:50:44 +0000 (22:50 +0200)]
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>
Morris Jobke [Thu, 13 Apr 2017 18:11:47 +0000 (13:11 -0500)]
Merge pull request #4326 from nextcloud/downstream-27562
Reorder the entries of the log for easier reading
Lukas Reschke [Thu, 13 Apr 2017 18:02:15 +0000 (20:02 +0200)]
Merge pull request #4308 from nextcloud/lost-password-email
Update email template for lost password email
Morris Jobke [Thu, 13 Apr 2017 17:16:38 +0000 (12:16 -0500)]
Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
Fix login controller test and consolidate login
Morris Jobke [Thu, 13 Apr 2017 17:16:12 +0000 (12:16 -0500)]
Improve PHPDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 13 Apr 2017 17:10:37 +0000 (12:10 -0500)]
Merge pull request #4337 from nextcloud/fix-adblock-share-icon
Fix AdBlock blocking share icon, ref #866
Joas Schilling [Wed, 12 Apr 2017 11:04:28 +0000 (13:04 +0200)]
Use constants
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Thu, 13 Apr 2017 17:01:57 +0000 (12:01 -0500)]
Merge pull request #4341 from nextcloud/local-link-explanation
Explain local link
Jos Poortvliet [Thu, 13 Apr 2017 09:30:35 +0000 (11:30 +0200)]
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>
Lukas Reschke [Thu, 13 Apr 2017 16:53:56 +0000 (18:53 +0200)]
Merge pull request #4336 from nextcloud/add-ratelimiting
Add support for ratelimiting via annotations
Morris Jobke [Thu, 13 Apr 2017 15:40:12 +0000 (10:40 -0500)]
Merge pull request #4342 from nextcloud/update-certificate-bundle
Update CA bundle
Roeland Jago Douma [Thu, 13 Apr 2017 14:08:29 +0000 (16:08 +0200)]
Merge pull request #4344 from nextcloud/dont-load-handlebars
Don't load handlebars in template
Lukas Reschke [Thu, 13 Apr 2017 12:01:21 +0000 (14:01 +0200)]
Don't load handlebars in template
It's already loaded in core.json
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Joas Schilling [Thu, 13 Apr 2017 10:35:08 +0000 (12:35 +0200)]
No need for those emails anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 13 Apr 2017 10:34:34 +0000 (12:34 +0200)]
Send an email to the old address on email change
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 13 Apr 2017 10:34:02 +0000 (12:34 +0200)]
Allow to read the old email on the hook as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Thu, 13 Apr 2017 10:28:24 +0000 (12:28 +0200)]
Merge pull request #4313 from nextcloud/ldap-name-change
Change LDAP method names
Joas Schilling [Thu, 13 Apr 2017 09:58:19 +0000 (11:58 +0200)]
Move logic into new class with DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Wed, 12 Apr 2017 21:00:02 +0000 (23:00 +0200)]
Remove expired attempts
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 20:26:09 +0000 (22:26 +0200)]
Add tests for multiple parameters
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 20:19:45 +0000 (22:19 +0200)]
Enable testing app in CI step
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 20:17:59 +0000 (22:17 +0200)]
Update static autoloadermap
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 20:14:11 +0000 (22:14 +0200)]
Move to dedicated MiddleWare
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 19:53:47 +0000 (21:53 +0200)]
Fix .drone.yml
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 19:37:10 +0000 (21:37 +0200)]
Add isset() as it can be an empty result
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 19:27:40 +0000 (21:27 +0200)]
Register in ServerContainer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Wed, 12 Apr 2017 18:32:48 +0000 (20:32 +0200)]
Add support for ratelimiting via annotations
This allows adding rate limiting via annotations to controllers, as one example:
```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```
Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Thu, 13 Apr 2017 09:55:12 +0000 (11:55 +0200)]
Update CA bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Joas Schilling [Thu, 13 Apr 2017 09:49:02 +0000 (11:49 +0200)]
Send an email on password change
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Thu, 13 Apr 2017 09:26:05 +0000 (11:26 +0200)]
Merge pull request #4340 from nextcloud/remove-invalid-route
Remove invalid route
Joas Schilling [Wed, 12 Apr 2017 13:19:45 +0000 (15:19 +0200)]
Add activities when email or password is changed
Signed-off-by: Joas Schilling <coding@schilljs.com>
Lukas Reschke [Thu, 13 Apr 2017 09:05:44 +0000 (11:05 +0200)]
Remove invalid route
Said file doesn't exist anymore and accessing it would just return a 500
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Thu, 13 Apr 2017 08:51:09 +0000 (10:51 +0200)]
Merge pull request #3966 from nextcloud/downstream-26570
Override config.php values through environment variables
Morris Jobke [Thu, 13 Apr 2017 06:04:11 +0000 (01:04 -0500)]
Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
Dont create a log entry on email login
Nextcloud bot [Thu, 13 Apr 2017 00:08:02 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Lukas Reschke [Wed, 12 Apr 2017 21:14:12 +0000 (23:14 +0200)]
Merge pull request #4338 from nextcloud/handlebars-min
Move to handlebars.min.js
Roeland Jago Douma [Wed, 12 Apr 2017 20:22:38 +0000 (22:22 +0200)]
Move to handlebars.min.js
core.js is now below 1mb!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Morris Jobke [Tue, 11 Apr 2017 22:24:58 +0000 (17:24 -0500)]
Update email template for lost password email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Wed, 12 Apr 2017 19:23:11 +0000 (21:23 +0200)]
Merge pull request #4307 from nextcloud/sharing-emails
New emails for sharebymail
Lukas Reschke [Wed, 12 Apr 2017 18:58:05 +0000 (20:58 +0200)]
Merge pull request #4335 from nextcloud/jquery-ui-min
Moved to jquery-ui.custom.min.js
Morris Jobke [Wed, 12 Apr 2017 18:11:00 +0000 (13:11 -0500)]
Merge pull request #4282 from nextcloud/oci-connect-string
use the same oci connectstring in all code paths
Roeland Jago Douma [Wed, 12 Apr 2017 18:03:00 +0000 (20:03 +0200)]
Moved to jquery-ui.custom.min.js
Shaves off about 200kb of the default loaded js libs
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 12 Apr 2017 17:57:16 +0000 (19:57 +0200)]
Merge pull request #4306 from nextcloud/followup-3905
Favorites integration tests for shared files
Morris Jobke [Wed, 12 Apr 2017 17:55:09 +0000 (12:55 -0500)]
Merge pull request #4331 from nextcloud/query-builder-sum
Add sum() to the query function builder
Morris Jobke [Wed, 12 Apr 2017 17:34:42 +0000 (12:34 -0500)]
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 11 Apr 2017 20:00:37 +0000 (15:00 -0500)]
Favorites integration tests for shared files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 12 Apr 2017 16:44:26 +0000 (11:44 -0500)]
Merge pull request #4329 from nextcloud/move-out-shared-folder
Fix moving files out of a shared folder
Joas Schilling [Wed, 12 Apr 2017 13:33:35 +0000 (15:33 +0200)]
Dont add click-button text for plaintext mails
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 12 Apr 2017 13:33:14 +0000 (15:33 +0200)]
No newlines when heading is empty
Signed-off-by: Joas Schilling <coding@schilljs.com>
Bjoern Schiessle [Wed, 12 Apr 2017 10:43:55 +0000 (12:43 +0200)]
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Joas Schilling [Wed, 12 Apr 2017 09:52:58 +0000 (11:52 +0200)]
Use instance name as alt-text
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 12 Apr 2017 09:52:33 +0000 (11:52 +0200)]
Don't duplicate the sentence with the header
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Tue, 11 Apr 2017 21:18:31 +0000 (16:18 -0500)]
Use new email design for sharebymail emails
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 11 Apr 2017 21:17:44 +0000 (16:17 -0500)]
Properly escape heading, body and button text
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 11 Apr 2017 21:13:34 +0000 (16:13 -0500)]
Add addBodyButton to add a single button to email templates
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 12 Apr 2017 04:21:04 +0000 (23:21 -0500)]
Change LDAP method names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Robin Appelman [Wed, 12 Apr 2017 14:09:35 +0000 (16:09 +0200)]
Add sub() to the query function builder
Signed-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Wed, 12 Apr 2017 14:04:03 +0000 (16:04 +0200)]
Merge pull request #4325 from nextcloud/downstream-27522
Optimize put - Dont try to fetch filecache for not existing filecache…
Björn Schießle [Wed, 12 Apr 2017 14:01:07 +0000 (16:01 +0200)]
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
Discover federatedsharing endpoints
Roeland Jago Douma [Wed, 12 Apr 2017 13:56:15 +0000 (15:56 +0200)]
Merge pull request #4323 from nextcloud/downstream-27613
Allow file upload when storage is unlimited
Roeland Jago Douma [Wed, 12 Apr 2017 13:54:46 +0000 (15:54 +0200)]
Merge pull request #4324 from nextcloud/downstream-27581-27602
Fix casing of same origin frame option
Jan-Christoph Borchardt [Wed, 12 Apr 2017 13:04:12 +0000 (15:04 +0200)]
Fix AdBlock blocking share icon, ref #866
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Robin Appelman [Wed, 12 Apr 2017 12:56:51 +0000 (14:56 +0200)]
use unjailed path when moving files out of a shared storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Wed, 12 Apr 2017 12:55:47 +0000 (14:55 +0200)]
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
Signed-off-by: Robin Appelman <robin@icewind.nl>
Joas Schilling [Wed, 12 Apr 2017 11:23:55 +0000 (13:23 +0200)]
Simplify the test
Signed-off-by: Joas Schilling <coding@schilljs.com>
Juan Pablo Villafáñez [Tue, 4 Apr 2017 08:12:41 +0000 (10:12 +0200)]
Reorder the entries of the log for easier reading
Piotr M [Tue, 28 Mar 2017 12:49:06 +0000 (14:49 +0200)]
Optimize put - Dont try to fetch filecache for not existing filecache in encription
Joas Schilling [Wed, 12 Apr 2017 10:37:32 +0000 (12:37 +0200)]
Fix casing of same origin frame option
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 12 Apr 2017 10:27:47 +0000 (12:27 +0200)]
Allow file upload when storage is unlimited
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 12 Apr 2017 09:09:42 +0000 (11:09 +0200)]
Merge pull request #3905 from nextcloud/downstream-27069
Add integration test for trashbin
Björn Schießle [Wed, 12 Apr 2017 08:57:09 +0000 (10:57 +0200)]
Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update
[files_trashbin] Remove unneeded update steps
Björn Schießle [Wed, 12 Apr 2017 08:56:25 +0000 (10:56 +0200)]
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update
[files_sharing] Remove unneeded update steps
Björn Schießle [Wed, 12 Apr 2017 08:54:20 +0000 (10:54 +0200)]
Merge pull request #4312 from nextcloud/cleanup-name
Update comments to Nextcloud
Lukas Reschke [Wed, 12 Apr 2017 08:16:42 +0000 (10:16 +0200)]
Merge pull request #4315 from nextcloud/cleanup-files_external-update
[files_external] Remove unneeded update steps
Lukas Reschke [Wed, 12 Apr 2017 08:15:59 +0000 (10:15 +0200)]
Merge pull request #4309 from nextcloud/remove-unused-code
Removes unused code for link share emails
Lukas Reschke [Wed, 12 Apr 2017 08:15:06 +0000 (10:15 +0200)]
Merge pull request #4310 from nextcloud/allow-plain-text-email
Allow to set text versions for the plain text email
Lukas Reschke [Wed, 12 Apr 2017 08:14:04 +0000 (10:14 +0200)]
Merge pull request #4314 from nextcloud/remove-not-needed-update.php
Remove update.php of files app
Morris Jobke [Wed, 12 Apr 2017 05:52:27 +0000 (00:52 -0500)]
[files_trashbin] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 12 Apr 2017 05:49:50 +0000 (00:49 -0500)]
[files_sharing] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 12 Apr 2017 05:45:19 +0000 (00:45 -0500)]
[files_external] Remove unneeded update steps
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 12 Apr 2017 05:35:12 +0000 (00:35 -0500)]
Remove update.php of files app
* contains only update steps for 8.1/8.2 to 9.0 update
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 12 Apr 2017 04:16:27 +0000 (23:16 -0500)]
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Wed, 12 Apr 2017 00:07:44 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 11 Apr 2017 22:45:05 +0000 (17:45 -0500)]
Allow to set text versions for the plain text email
* allows different texts for HTML and text version of the email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 11 Apr 2017 22:32:48 +0000 (17:32 -0500)]
Removes unused code for link share emails
* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 11 Apr 2017 20:09:27 +0000 (15:09 -0500)]
Merge pull request #4304 from nextcloud/add-email-template-to-ocp
Add IEMailTemplate to public OCP API
Morris Jobke [Fri, 17 Mar 2017 05:54:13 +0000 (23:54 -0600)]
Add drone.yml config
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Vincent Petry [Wed, 1 Feb 2017 09:54:10 +0000 (10:54 +0100)]
Add integration test for trashbin
Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Tue, 11 Apr 2017 19:29:58 +0000 (21:29 +0200)]
Merge pull request #4302 from nextcloud/test-integration-test
[Integration Tests] Clear opcode cache after config change
Lukas Reschke [Tue, 11 Apr 2017 19:22:39 +0000 (21:22 +0200)]
Remove constructor from interface
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Roeland Jago Douma [Tue, 11 Apr 2017 19:01:12 +0000 (21:01 +0200)]
Merge pull request #3876 from nextcloud/downstream-26583
Share api expanded by tags
Morris Jobke [Tue, 11 Apr 2017 17:07:02 +0000 (12:07 -0500)]
Merge pull request #4285 from nextcloud/bump-md5
[js] Bump blueimp-md5
Lukas Reschke [Tue, 11 Apr 2017 11:58:18 +0000 (13:58 +0200)]
Clear opcode cache after config change
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Michael Jobst [Thu, 10 Nov 2016 08:13:25 +0000 (09:13 +0100)]
share api expanded by tags (#26583)
* share api expanded by tags
* Modified files_sharing JS Unit tests
* modified tests. renamed request parameter. refactoring
* Update Share20OCS.php
Added missing function description
* Update Helper.php
Added missing function description
* Update Helper.php
implicit boolean conversion to !empty()
* Update Share20OCSTest.php
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 11 Apr 2017 16:53:01 +0000 (11:53 -0500)]
Merge pull request #4293 from nextcloud/fix_4248
Do reload shared views