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

13773 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
51e658da2a Join if block to preceding if chain 
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 13:17:46 +02:00
Daniel Calviño Sánchez
dcc8cce28b Fix double hashing of shared link passwords 
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Roeland Jago Douma
1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables 
Remove unused variables
 2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 18:20:51 -05:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Roeland Jago Douma
867b3ee234 Merge pull request #4396 from nextcloud/scan-non-existing 
show error when trying to scan non existing path
 2017-04-21 19:47:33 +02:00
Roeland Jago Douma
d46b155916 Merge pull request #4428 from nextcloud/file-by-id-limit-user 
limit the user when searching for a file by id if we know the user already
 2017-04-21 19:43:53 +02:00
Robin Appelman
6fbe991afb
limit the user when searching for a file by id if we know the user already 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-21 17:11:26 +02:00
Roeland Jago Douma
e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems 
Fix unit test problems
 2017-04-21 09:35:01 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Bjoern Schiessle
972b4c04e2
respect password policy for auto generated passwords 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
d8dcd72118
allow admin to enforce password on mail shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Robin Appelman
a0e5107c0b
check for existence before we start the db transaction 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-20 13:25:49 +02:00
Joas Schilling
8c703c954d
Fix theming tests 
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:10:34 +02:00
Joas Schilling
9871e4eaee
Kill dead code 
> No tests found in class "Test\Share\MailNotificationsTest".

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:43:19 +02:00
Joas Schilling
140580f9d8 Merge pull request #4398 from nextcloud/fix_accesslistcode 
Get proper accesslist for userFolder
 2017-04-20 11:03:22 +02:00
Roeland Jago Douma
ae2db5e60d
Get proper accesslist for userFolder 
If the accesslist is requested for a users root folder we should
properly construct the path

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-20 10:28:32 +02:00
Joas Schilling
799b229a68 Merge pull request #4381 from nextcloud/2954_take_2 
Fix group settings routes and fix route regression
 2017-04-20 10:25:16 +02:00
Nextcloud bot
adf316c3af
[tx-robot] updated from transifex 2017-04-20 00:07:36 +00:00
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
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml 
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-19 15:46:41 -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
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
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
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
Roeland Jago Douma
d12ec7cff1
Revert "Match slashes in ../{id} resource routes" 
This reverts commit 31f9be7a75.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-18 21:50:36 +02: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
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
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