a0ada9aab4
Don't use deprecated getMock() anymore
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:30:21 +02:00
24789ba0f4
Restoring the error handler within the error handler causes unexpected results
...
See http://php.net/manual/en/function.restore-error-handler.php#120879
for more information.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:23:34 +02:00
38c901fadf
Delete the correct config value
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:23:12 +02:00
547f6ee009
Only loop over Test cases
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-20 12:21:39 +02:00
140580f9d8
Merge pull request #4398 from nextcloud/fix_accesslistcode
...
Get proper accesslist for userFolder
2017-04-20 11:03:22 +02:00
b469882595
Merge pull request #4212 from individual-it/master
...
validate file name before uploading in upload only folder
2017-04-20 10:50:56 +02:00
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
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
adf316c3af
[tx-robot] updated from transifex
2017-04-20 00:07:36 +00:00
0556104cd3
Merge pull request #4384 from nextcloud/renderHtml-fix
...
Rename renderHTML to renderHtml
2017-04-19 17:52:37 -05:00
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
01c9d00e1d
Merge pull request #4387 from nextcloud/fix-little-glitch
...
Fix font-weight of settings button
2017-04-19 14:45:48 -05:00
a55f5c0173
Merge pull request #4388 from nextcloud/remove-unused-stuff
...
Remove unused CSS styles
2017-04-19 14:45:32 -05:00
3c892d6ad5
Merge pull request #4386 from nextcloud/improve-menu-css
...
Improve menu CSS
2017-04-19 13:12:31 -05:00
4be923e459
Improve menu CSS
...
* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 12:42:23 -05:00
ac9d0fd14c
Merge pull request #4385 from nextcloud/remove-unused-css
...
Remove unused CSS
2017-04-19 19:27:05 +02:00
e91b8b452c
Merge pull request #4395 from nextcloud/fix_4394
...
Do not show empty admin sections
2017-04-19 17:01:27 +02:00
be30ff59ef
Do not show empty admin sections
...
Fixes #4393
It is far from efficient code. But then again it is easy to understand
and I doubt admins will browse it 24/7
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-19 13:22:49 +02:00
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
b7fe28bba1
Fix indentation
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-19 12:03:54 +02:00
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
1dfd7de10e
Remove unused CSS styles
...
* could not find an traces of .popup and .arrow anywhere else
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 22:26:18 -05:00
6fa7e41047
Fix font-weight of settings button
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 21:38:49 -05:00
74936e15d1
Remove unused CSS
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 20:36:54 -05:00
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
febe01f571
[tx-robot] updated from transifex
2017-04-19 00:07:40 +00:00
6b490f45fd
[tx-robot] updated from transifex
2017-04-18 23:08:43 +00:00
269600a04f
Merge pull request #4369 from nextcloud/fix-translations
...
Fix translations
2017-04-18 18:01:50 -05:00
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
4b2d594c70
Merge pull request #4379 from nextcloud/nicely-designed-confirmation-mail
...
Beautify test email
2017-04-18 17:17:40 -05:00
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
1c0bffe87f
Fix translations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:40:53 -05:00
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
0a54d5a5dd
Beautify test email
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-18 16:18:00 -05:00
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
c40b7acb09
[tx-robot] updated from transifex
2017-04-18 20:47:45 +00:00
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
d2c4440ed6
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-18 15:08:38 -05:00
2850f09bf2
Make group settings routes explicit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-18 22:00:22 +02:00
d12ec7cff1
Revert "Match slashes in ../{id} resource routes"
...
This reverts commit 31f9be7a75
2017-04-18 21:50:36 +02:00
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
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
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
bf58d24b5c
remove accidently left over *f*it
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:53:49 +05:45
88f02f27a3
JS tests for upload only function
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:43:25 +05:45
cdb65eff34
refactor to make it easier to test
...
Signed-off-by: Artur Neumann <info@individual-it.net>
2017-04-18 20:42:36 +05:45
fcaa315c96
Fix some more stuff
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:11:29 +02:00
dfca672378
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 16:08:29 +02:00
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
a3922bbcdc
Better validation of allowed user names
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-18 14:29:34 +02:00
Joas Schilling
Roeland Jago Douma
Nextcloud bot
Morris Jobke
Roeland Jago Douma
Lukas Reschke
Jan-Christoph Borchardt
Christoph Wurst
Artur Neumann