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

38399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
bec4b468c3
No need to log guzzle exception 
When getting/requesting a shared secret there is no need to log the full
exception when an unexpected status code is returned since this won't
really tell us anything as the bad stuff happened on a remote server

Fixes #3380

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-21 11:29:01 +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
Roeland Jago Douma
c4bd01456b Merge pull request #4408 from nextcloud/accesslist_ng 
Move systemtags and comments to new accesslist functions
 2017-04-21 08:58:52 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Morris Jobke
f5b900b654 Merge pull request #4412 from individual-it/master 
deleted forgotten code in test
 2017-04-20 18:04:32 -05:00
Morris Jobke
9536cbf739 Merge pull request #4409 from nextcloud/socialharing_mail 
Allow social sharing to specify if a new window is opened
 2017-04-20 17:59:55 -05:00
Morris Jobke
8a743e0359 Merge pull request #4404 from Ardinis/master 
Remove json handling for files_external:config
 2017-04-20 17:59:35 -05:00
Morris Jobke
b99d2b78bd Merge pull request #3595 from nextcloud/dav-sharing-changes 
Restrict DAV share handling to the owner only
 2017-04-20 16:44:16 -05:00
Morris Jobke
5d18e4243d
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:01:26 -05:00
Artur Neumann
faf55adb90 deleted forgotten code in test 
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-20 22:27:51 +05:45
Morris Jobke
6b41d82f4c Merge pull request #4411 from nextcloud/fix-it 
Remove accidentially commited module
 2017-04-20 10:53:03 -05:00
Morris Jobke
ec07791acc
Remove accidentially commited module 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 10:51:05 -05:00
Björn Schießle
810fb7ff2c Merge pull request #4402 from nextcloud/fix-clickable-area 
Fix clickable area in share permissions menu
 2017-04-20 16:49:00 +02:00
Björn Schießle
a4086a6ec5 Merge pull request #4303 from nextcloud/enforce-password-mailshare 
allow admin to enforce password on mail shares
 2017-04-20 16:46:36 +02:00
Morris Jobke
6c294c3407
fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00
Morris Jobke
9d07ec5a96
Fix casing 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00
Bjoern Schiessle
aa54d31bd2
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:27 +02: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
428d7cdb5e
improve mail text 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
f00c1eccf7
create activity if a password was send by mail 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
f0651cb066
allow to set a password for shares which where created without a password before the admin started to enforce the password 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-20 16:33:26 +02:00
Bjoern Schiessle
7a8f8cbb33
templates no longer needed 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
Roeland Jago Douma
48fd0ee9f0
Allow social sharing to specify if a new window is opened 
For example mail shares should not open a new window because it looks
weird.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-20 16:32:46 +02:00
Roeland Jago Douma
4004e39f75
Move systemtags and comments to new accesslist functions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-20 14:34:28 +02:00
Joas Schilling
73b6cd1061
Fix invalid Dav test 
PHP Warning:  Declaration of PublicCalendarTest::testPrivateClassification()
should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared)
in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:54:20 +02:00
Joas Schilling
ec2f2b75be
Make sure we use a new encryption module all the time 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:48:14 +02:00
Joas Schilling
06e60f88c5
Don't assume the admin didn't configure Opcache correctly... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:17:21 +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
b2deb6deb0
Use the correct class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:55:11 +02:00
Joas Schilling
0de5fc9020
Import some classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:54:14 +02:00
Joas Schilling
ada615eb86
Use the correct Dummy and Backend class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:48:51 +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
d2d9f74707
Fix warning with undefined method 
Trying to configure method "getRemember" 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 12:37:59 +02:00
Joas Schilling
a0ada9aab4
Don't use deprecated getMock() anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:30:21 +02:00
Joas Schilling
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
Joas Schilling
38c901fadf
Delete the correct config value 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:23:12 +02:00
Joas Schilling
547f6ee009
Only loop over Test cases 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:21:39 +02:00
Ardinis
71118214f9 reviewed 2017-04-20 11:31:04 +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
Joas Schilling
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
Joas Schilling
088f4422f9
Fix remaining "PHP Inspection" warnings 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 10:44:11 +02:00
Joas Schilling
62ef59616d
Add public access modifier to all methods 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 10:44:11 +02:00
Joas Schilling
c2d1e6e7ff
Restrict share handling to the owner only 
Otherwise group members can remove the share for the complete group,
remove edit permissions and even single user shares for other users.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 10:44:11 +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
0556104cd3 Merge pull request #4384 from nextcloud/renderHtml-fix 
Rename renderHTML to renderHtml
 2017-04-19 17:52:37 -05:00
Morris Jobke
16b8397765
Fix clickable area in share permissions menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-19 17:41:26 -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