mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,381 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

38381 Commits

Author SHA1 Message Date
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
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
Morris Jobke 01c9d00e1d Merge pull request #4387 from nextcloud/fix-little-glitch 
Fix font-weight of settings button
 2017-04-19 14:45:48 -05:00
Morris Jobke a55f5c0173 Merge pull request #4388 from nextcloud/remove-unused-stuff 
Remove unused CSS styles
 2017-04-19 14:45:32 -05:00
Morris Jobke 3c892d6ad5 Merge pull request #4386 from nextcloud/improve-menu-css 
Improve menu CSS
 2017-04-19 13:12:31 -05:00
Morris Jobke 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
Roeland Jago Douma ac9d0fd14c Merge pull request #4385 from nextcloud/remove-unused-css 
Remove unused CSS
 2017-04-19 19:27:05 +02:00
Lukas Reschke e91b8b452c Merge pull request #4395 from nextcloud/fix_4394 
Do not show empty admin sections
 2017-04-19 17:01:27 +02:00
Roeland Jago Douma 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
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
Lukas Reschke b7fe28bba1
Fix indentation 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-19 12:03:54 +02:00
Roeland Jago Douma 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
Morris Jobke 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
Morris Jobke 6fa7e41047
Fix font-weight of settings button 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-18 21:38:49 -05:00
Morris Jobke 74936e15d1
Remove unused CSS 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-18 20:36:54 -05: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
Morris Jobke 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