wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38274 commits 157 branches 562 tags 714 MiB
Commit graph

38274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ardinis
3db84ed90a Remove json handling for files_external:config 
#4347
 2017-04-14 15:42:45 +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
Lukas Reschke
881539a9e0
Don't load handlebars in template 
It's already loaded in core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 14:01:21 +02:00
Joas Schilling
4f0e2640d7
No need for those emails anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:35:08 +02:00
Joas Schilling
786258ff30
Send an email to the old address on email change 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:34:34 +02:00
Joas Schilling
1110b51aa3
Allow to read the old email on the hook as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:34:02 +02:00
Lukas Reschke
51377f3d8c Merge pull request #4313 from nextcloud/ldap-name-change 
Change LDAP method names
 2017-04-13 12:28:24 +02:00
Joas Schilling
0eb08a510b
Move logic into new class with DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 12:01:10 +02:00
Lukas Reschke
e39e6d0605
Remove expired attempts 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:18 +02:00
Lukas Reschke
31ae39c569
Add tests for multiple parameters 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:18 +02:00
Lukas Reschke
3d425ce833
Enable testing app in CI step 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:18 +02:00
Lukas Reschke
54930ac926
Update static autoloadermap 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
a1ae5275f9
Move to dedicated MiddleWare 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
a05471eb43
Fix .drone.yml 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
511524c668
Add isset() as it can be an empty result 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:17 +02:00
Lukas Reschke
d729bde98c
Register in ServerContainer 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 12:00:16 +02:00
Lukas Reschke
66835476b5
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>
 2017-04-13 12:00:16 +02:00
Lukas Reschke
23d9902cf3
Update CA bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 11:56:09 +02:00
Joas Schilling
49fd41b21f
Send an email on password change 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 11:49:02 +02:00
Roeland Jago Douma
5505faa3d7 Merge pull request #4340 from nextcloud/remove-invalid-route 
Remove invalid route
 2017-04-13 11:26:05 +02:00
Joas Schilling
f23a36b0a6
Add activities when email or password is changed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-13 11:13:19 +02:00
Lukas Reschke
06f8ea247b
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>
 2017-04-13 11:05:44 +02:00
Lukas Reschke
01f3698175 Merge pull request #3966 from nextcloud/downstream-26570 
Override config.php values through environment variables
 2017-04-13 10:51:09 +02:00
Morris Jobke
7cb6038fca Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login 
Dont create a log entry on email login
 2017-04-13 01:04:11 -05:00
Nextcloud bot
396618fd19
[tx-robot] updated from transifex 2017-04-13 00:08:02 +00:00
Lukas Reschke
7ebcc045a2 Merge pull request #4338 from nextcloud/handlebars-min 
Move to handlebars.min.js
 2017-04-12 23:14:12 +02:00
Roeland Jago Douma
3eb6f88019
Move to handlebars.min.js 
core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-12 22:22:38 +02:00
Morris Jobke
1f962f9115
Update email template for lost password email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 15:19:53 -05:00
Roeland Jago Douma
b3b24172e4 Merge pull request #4307 from nextcloud/sharing-emails 
New emails for sharebymail
 2017-04-12 21:23:11 +02:00
Lukas Reschke
72ff33da1d Merge pull request #4335 from nextcloud/jquery-ui-min 
Moved to jquery-ui.custom.min.js
 2017-04-12 20:58:05 +02:00
Morris Jobke
a7da2ef977 Merge pull request #4282 from nextcloud/oci-connect-string 
use the same oci connectstring in all code paths
 2017-04-12 13:11:00 -05:00
Roeland Jago Douma
abe887cd48
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>
 2017-04-12 20:03:00 +02:00
Roeland Jago Douma
250eb34e81 Merge pull request #4306 from nextcloud/followup-3905 
Favorites integration tests for shared files
 2017-04-12 19:57:16 +02:00
Morris Jobke
124fdf8062 Merge pull request #4331 from nextcloud/query-builder-sum 
Add sum() to the query function builder
 2017-04-12 12:55:09 -05:00
Morris Jobke
ae4c2893a2
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-12 12:42:23 -05:00