20a0a18fbd
Fix reshare with user activity message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
1084cdb613
fix path
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
5c7ad6d3ec
Merge some CSS files using our SCSS compiler
...
This saves around 4 requests on the average page load.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:35:31 +01:00
7e95837097
Merge pull request #3955 from nextcloud/downstream-27113
...
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
fd0e42e093
[tx-robot] updated from transifex
2017-03-21 01:08:16 +00:00
5bfce597a9
[CI] Can we get some faster phpunit execution? ( #27113 )
...
* Don't backup globals and static attributes
* Unset global variable to remove impact on followup tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 12:34:05 -06:00
0c1b7fdcb5
return failed cache if the shared storage failed to setup
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:31:34 +01:00
f2e981e269
also set nonmaskedstorage in error cases
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:17:53 +01:00
35f6b8716e
Merge pull request #3884 from nextcloud/downstream-26956
...
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
25f772d592
Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
...
Correctly escape the footer description from theming
2017-03-20 11:56:29 +01:00
78ee125c34
Fix public link download button
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:39:46 -06:00
a4ce440392
Ignore NoUserException for shares from ghosts
...
Add unit tests for FailedStorage init from SharedStorage
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:43:24 -06:00
528a903a7b
[tx-robot] updated from transifex
2017-03-20 01:07:43 +00:00
ef789f8480
Merge pull request #3906 from nextcloud/shares-circles-2
...
Support Circles
2017-03-19 20:45:55 +01:00
1983606f80
[tx-robot] updated from transifex
2017-03-19 01:08:20 +00:00
69694012ab
shares-circles
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
bd97b7d130
Use DI
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
199405ddc0
Safer queries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:56 +01:00
0a1135a7cc
Better output
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:25 +01:00
e8750f618b
Correctly escape the footer description from theming
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:11:41 +01:00
5155a5288c
Add CleanupRemoteStorages command
...
cleanup files, address review
Fix CleanupRemoteStoragesTest tests
Fix test expectation.
Added files count to check filecache deletion.
Sort by numeric id for deterministic test results
Removed precise order test and added storage check
Remove inaccurate removal message check which has a different order on
Oracle.
Added more checks to confirm that existing storages still exist.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:52 -06:00
377fdf3860
Skip null groups in group manager ( #26871 ) ( #26956 )
...
* Skip null groups in group manager (#26871 )
* Skip null groups in group manager
* Also skip null groups in group manager's search function
* Add more group null checks in sharing code
* Add unit tests for null group safety in group manager
* Add unit tests for sharing code null group checks
* Added tests for null groups handling in sharing code
* Ignore moveShare optional repair in mount provider
In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.
* Adjust null group handing + tests
* Fix new group manager tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:03 -06:00
5683365a2c
[tx-robot] updated from transifex
2017-03-17 01:07:41 +00:00
39afcbd49f
Merge pull request #3679 from nextcloud/socialsharing
...
Add social sharing
2017-03-16 23:08:47 +01:00
13aae43d89
Fix layout of sharing buttons
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-14 22:52:28 -06:00
fbd2dd49b6
use closure to properly defer l10n initialization ( #27328 )
2017-03-13 08:52:54 +01:00
0dd0242d2f
[tx-robot] updated from transifex
2017-03-13 01:08:19 +00:00
37fcc41004
[tx-robot] updated from transifex
2017-03-12 01:08:05 +00:00
a5ba1f7803
Remove legacy class OC_Group and OC_User
...
* basically a straight replacement of the wrapped code at the calling code parts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-09 17:35:09 -06:00
fd71b8bde8
Move social buttons to menu
...
* If there are social sharing buttons move them and the copy action to a
menu
* If there are no social sharing buttons just leave the copy action
where it is directly
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-03 13:27:06 +01:00
b55ce43ba5
[tx-robot] updated from transifex
2017-03-03 01:07:45 +00:00
53195b156c
[tx-robot] updated from transifex
2017-03-02 16:48:52 +00:00
556b958af2
[tx-robot] updated from transifex
2017-02-25 01:25:07 +00:00
dd6d2893a6
Merge pull request #3588 from GreenArchon/issue_#3461
...
Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs
2017-02-24 17:25:21 +01:00
621f920d68
Merge pull request #3567 from nextcloud/autocomplete-settings
...
some sharing settings
2017-02-22 16:30:21 +01:00
fe46c6f743
use (int) instead of intval for performance reasons
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-22 15:14:36 +01:00
182bfd9f23
Merge pull request #3570 from nextcloud/fix-share-loading
...
Fix position of share autocomplete loading icon
2017-02-22 10:20:56 +01:00
a08dfd9951
[tx-robot] updated from transifex
2017-02-22 01:12:24 +00:00
f0b588621c
Fix position of share autocomplete loading icon
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:39:32 -06:00
02ea84f50f
properly include class
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:24:40 -06:00
8e3d0fecd2
Use intval() for validation of config options
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-21 17:22:06 -06:00
869ea38ffe
allow to configure a min-length of search strings for auto-compeltion and a max number for of results returned
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-21 18:31:20 +01:00
cc511ac7b8
Typecast filecache 'storage' as int to return it as documented, fixes #3461
...
Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
2017-02-20 22:23:27 -05:00
51f06bb1f8
[tx-robot] updated from transifex
2017-02-19 01:07:37 +00:00
c5dffc465c
Merge pull request #3472 from nextcloud/enable-avatars-always
...
Always enable avatars
2017-02-14 09:22:02 -06:00
7113af3f91
[tx-robot] updated from transifex
2017-02-14 01:07:20 +00:00
200a28255e
Always enable avatars
...
* we introduced this setting in the begining because our
avatar support caused some performance issues, but we
fixed them and should only provide one way how Nextcloud
looks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 17:53:33 -06:00
01b3da612b
[tx-robot] updated from transifex
2017-02-11 01:07:23 +00:00
c2e61362cc
[tx-robot] updated from transifex
2017-02-10 01:07:02 +00:00
bf88060a98
Merge pull request #3297 from nextcloud/cloud-id-resolve
...
Add a single public api for resolving a cloud id to a user and remote and back
2017-02-09 14:54:32 +01:00
3c4b539fdf
[tx-robot] updated from transifex
2017-02-09 01:07:10 +00:00
976cff780b
register cloudidmanager for files_sharing
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
54e39d4b93
Fix files sharing legacy as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
d318e2b005
Fix Sharing app description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-02 16:22:21 +01:00
1952560ac7
[tx-robot] updated from transifex
2017-02-01 01:06:57 +00:00
bbcb1dd2e0
[tx-robot] updated from transifex
2017-01-30 01:07:14 +00:00
b614547ff8
[tx-robot] updated from transifex
2017-01-28 01:06:59 +00:00
ed55b87b65
add brute force protection for public link authentication
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 18:17:08 +01:00
5873a0a7d4
Merge pull request #3231 from nextcloud/allow-editing-public-links
...
allow editing single files shared as public link
2017-01-25 15:35:57 +01:00
c3e57d228f
[tx-robot] updated from transifex
2017-01-25 01:10:00 +00:00
92d7dd4781
allow editing single files shared as public link
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 13:41:27 +01:00
47c63e6a3e
fix public sharing buttons
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:08:10 +01:00
a1f9425e65
fix log and app name
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
bfa50a4444
more cleanup
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
7eec5e0c27
Merge pull request #3190 from nextcloud/fix-sharing-popover
...
Fix #3174
2017-01-22 20:40:48 +01:00
0d6e3ca86b
Merge pull request #3187 from nextcloud/inputs-scss-optimisation
...
Inputs.scss rewritting and optimisation
2017-01-22 11:41:49 -06:00
4c47b8e3a3
Fixed public share download button
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:32:51 +01:00
0a400c4259
Fixed sharing js
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:26:59 +01:00
6a617fa721
Fixed public share header buttons
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 17:25:02 +01:00
ba8a9a9cd2
Login and authenticate inputs fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 16:38:07 +01:00
012e521239
[tx-robot] updated from transifex
2017-01-22 01:07:52 +00:00
f40e5b73f7
Fix #3174
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-21 19:06:57 +01:00
4bbd52b3f9
[tx-robot] updated from transifex
2017-01-18 01:07:38 +00:00
b1a82969e6
[tx-robot] updated from transifex
2017-01-17 01:07:54 +00:00
c35ea15916
[tx-robot] updated from transifex
2017-01-11 15:20:22 +00:00
a5bf14ada3
Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
...
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
4f9ff96f79
[tx-robot] updated from transifex
2017-01-09 08:24:58 +00:00
d9035e2805
[tx-robot] updated from transifex
2017-01-05 13:09:52 +00:00
0c11209d33
allow to access mail shares even if public links are disabled
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
fdf10e242d
Merge pull request #2850 from nextcloud/downstream-26603
...
Fixed size issues on main detail view and disappearing of share recipients (#26603 )
2017-01-02 21:19:43 +01:00
0d24e5d5f9
[tx-robot] updated from transifex
2017-01-02 01:07:33 +00:00
52b734b3e4
[tx-robot] updated from transifex
2016-12-29 01:07:59 +00:00
3fc4e1b5b9
[tx-robot] updated from transifex
2016-12-26 01:09:23 +00:00
969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients ( #26603 )
...
* fixed size issues on main detail view and disappearing of share recipients
* Changes due to code comments
* Moved reloadProperties() to FileInfoModel
* Solved Scrutinizer issues
* Bugfix: undefined value used on error
* check if options are set for FileInfoModel.initialize()
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
b4d779977a
fix tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 19:33:09 +01:00
14256d631c
Use group display name in sharing API + UI
2016-12-22 18:35:32 +01:00
6789685c4e
Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
...
Remove config change hook that deletes link shares (#26612 )
2016-12-22 14:45:20 +01:00
000ba6484f
When grouping shares, sort by stime then id ( #26777 )
...
If share times are equal, the first share should still win instead of
having the shares swapped.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
9473ab5c19
Remove config change hook that deletes link shares ( #26612 )
...
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.
A future cleanup could be done through a background job.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
6fd421cc3c
Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
...
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
5b474e72d5
Merge pull request #2673 from nextcloud/shared-scanner-unmasked
...
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
6de0eb0b74
Remove leading slash from sharing activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
5d0897b8d7
use unmasked permissions in shared scanner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
cd1929382f
Merge pull request #2654 from nextcloud/increase-master-version
...
Update app versions and requirements
2016-12-14 11:20:58 +01:00
9e353f6289
Fix overwriting parameter
...
Fixes #2641
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
edec1fafe7
Update app versions and requirements
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
edd01e3ce4
Merge pull request #2637 from nextcloud/mount-cache-storageid
...
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
bbe24d29ca
reuse cacheentry
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
43374292b1
update phpdoc
...
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
9ef8d25e46
Download a file in a subfolder in a sharedlink is not working
...
the $node created using the path (GET) parameter is not used when executing fileListDownloaded()
2016-12-11 18:32:28 -01:00
74d1b0bada
[tx-robot] updated from transifex
2016-12-08 01:07:26 +00:00
ea801d7d7c
[tx-robot] updated from transifex
2016-12-07 01:07:46 +00:00
3bea7ac6ac
[tx-robot] updated from transifex
2016-12-04 01:07:30 +00:00
1131338562
Merge pull request #2486 from nextcloud/shared-storage-mask
...
apply permissions mask for shared storage
2016-12-02 23:39:48 +01:00
14219c1082
Fix loader position and visibility
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:11 +01:00
ef04bea5fb
Fix popover arrow
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 18:10:08 +01:00
02ee4f958c
apply permissions mask for shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-02 17:59:02 +01:00
8a12f0bc8f
Fix unshare delete icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-02 17:52:24 +01:00
0853f0e7a8
Remove white background from loading icon
...
* allows to use the loading icon on non-white background (disabled input fields for example)
* fixes #2466
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-02 12:39:12 +01:00
ac1bf3c2b7
Merge pull request #2432 from nextcloud/activity-mail-language
...
Make sure the activity emails can be sent in the users language
2016-12-01 23:01:00 +01:00
a87638c6ab
Merge pull request #2371 from nextcloud/issue-2369-add-share-indicator-for-mail-shares
...
Add share indicator for mail shares
2016-12-01 12:17:56 +01:00
b2f46bfa04
Adjust all implementations in the server repo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
4ca7f9c896
[tx-robot] updated from transifex
2016-12-01 01:07:17 +00:00
05b86faccc
Display link share icon when toggling share
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-30 09:35:38 +01:00
09e5e38591
Add an icon when the file is shared by mail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-30 09:21:58 +01:00
db84c1c872
Fix missing text for downloads on mobile
...
* fixes #2362
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-29 17:06:09 +01:00
a984f4b430
Fix #2384
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-29 07:06:41 +01:00
e8ea9a5d27
[tx-robot] updated from transifex
2016-11-29 01:06:47 +00:00
9def8225c0
Fix image_src link
...
The link in the image_src link (used for previews on Social Media such as Facebook) was still using the old route. This changes it to use the new route.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 16:20:57 +01:00
4e682d4113
[tx-robot] updated from transifex
2016-11-28 01:06:56 +00:00
9788cf04ee
[tx-robot] updated from transifex
2016-11-27 01:07:08 +00:00
8f4ec8583d
[tx-robot] updated from transifex
2016-11-26 01:06:57 +00:00
e75dede590
fix some outdated naming
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-24 16:05:05 +01:00
1c564fd554
Fix placeholder typo in public link activity
...
https://www.transifex.com/nextcloud/nextcloud/translate/#152/files_sharing/101548786/
2016-11-23 21:43:14 +01:00
59db9fada2
Merge pull request #2281 from nextcloud/fix-translation
...
Fix language typo
2016-11-23 17:53:21 +01:00
14f01dbe33
Fix language typo
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-23 16:55:49 +01:00
2eca9cc384
Merge pull request #2262 from nextcloud/specify-parameters-on-public-download
...
Specify the parameters on public download
2016-11-23 14:02:38 +01:00
a36d26950e
Only do stuff when its a remote-share activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 22:46:18 +01:00
e9336dddd5
Specify the parameters on public download
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 20:14:42 +01:00
08ef7356f6
Merge pull request #2165 from nextcloud/sharing-activities-update
...
Move file sharing activities to the new API
2016-11-22 10:19:15 +01:00
b0cf78aa1e
[tx-robot] updated from transifex
2016-11-22 01:06:54 +00:00
7b3855a375
Add config switch
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
15c075eba8
Fix lookup url
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:01 +01:00
f7f70028d1
Search on lookup server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
ba9b17c906
[tx-robot] updated from transifex
2016-11-21 01:06:58 +00:00
6c11c54434
Merge pull request #2196 from nextcloud/cache-owner-displayname
...
cache the displayname of the share owner
2016-11-18 13:51:24 +01:00
ccdf387041
Merge pull request #2184 from nextcloud/share-join-cache
...
Get the share root info directly when querying for shares
2016-11-18 11:33:33 +01:00
dbd7f6dea6
cache the displayname of the share owner
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-18 11:26:00 +01:00
00fffae47f
[tx-robot] updated from transifex
2016-11-18 01:07:04 +00:00
6fa5c18a79
Merge pull request #2136 from nextcloud/sharing-layout
...
Sharing layout fixes
2016-11-18 00:40:46 +01:00
a32c781326
use copy icon for local link rather than link icon to prevent confusion with sharing
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:46:07 +01:00
88865e9728
properly align input box items in share tab view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:11:49 +01:00
5eab1cdece
fix layout of sharing list
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:02:33 +01:00
b85459964c
fix getting root entry when not provided by the share provider
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:39 +01:00
2f03fcab4a
let the share backend get the node cacheentry to save queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
065753f0ae
dont use the source cache/storage until needed
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 18:48:38 +01:00
30e7c27d86
reuse the known rootinfo in the shared cache when possible
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-17 14:59:31 +01:00
ab18d2f55e
[tx-robot] updated from transifex
2016-11-17 01:07:02 +00:00
b373f52fa8
only use one kind of hack for the storage wrappers of the sharing code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 19:04:47 +01:00
bdaf334c53
Move file sharing activities to the new API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 16:45:08 +01:00
bc1008ac38
Use 11.0 instead 9.2
...
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
571c5aac5e
[tx-robot] updated from transifex
2016-11-15 01:07:05 +00:00
42d754becd
Merge pull request #2084 from nextcloud/files_drop_avatars_disabled
...
Fixes files_drop when avatars are disabled
2016-11-14 17:14:09 +01:00
ff96fffe39
Merge pull request #2100 from nextcloud/do_not_increse_link_share_perms
...
Fixes not allowed increasing of link share permissions
2016-11-14 15:21:08 +01:00
16a110e803
Merge pull request #2067 from nextcloud/fileinfo-lazy-substorages
...
only query substorages to calculate the final mtime/size/etag when we need it
2016-11-14 11:39:02 +01:00
8c1cd07de3
[tx-robot] updated from transifex
2016-11-14 01:07:06 +00:00
965981486f
Fixes not allowed increasing of link share permissions
...
Fixes the following:
1. user0 shares folder with user1 (RO but with sharing permissions)
2. user1 shares by link
3. user1 send 'publicUpload=true' OCS request to the link share
before this increased the permissions of the link share. Which should
not happen.
now: API reponds with an error that the permissions can't be increased.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 20:29:34 +01:00
1056692fff
Fixes files_drop when avatars are disabled
...
Fixes : #2080
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-13 14:39:38 +01:00
150b86a7db
[tx-robot] updated from transifex
2016-11-13 01:07:09 +00:00
d969fc4ac6
[tx-robot] updated from transifex
2016-11-11 01:07:18 +00:00
cbc6118f51
Only check the sharing backends for file/folder items
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-10 16:46:01 +01:00
cbcdf69dc2
only query substorages to calculate the final mtime/size/etag lazily
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-10 13:59:22 +01:00
cfda17d8f3
[tx-robot] updated from transifex
2016-11-10 01:07:14 +00:00
1ad3043e4f
Merge pull request #1998 from nextcloud/share-by-mail-notification
...
add share by mail activity
2016-11-08 17:37:46 +01:00
5f15020b9b
Merge pull request #1618 from nextcloud/show-folder-shared-status
...
make it possible to share the current folder
2016-11-08 16:23:47 +01:00
25bcd71d02
add activity if a file was shared by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:58:52 +01:00
087dab85b4
add activity for share by mail
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-08 15:42:07 +01:00
742ece8b7a
Fix styling of the breadcrumbs icon
...
* properly center share icon
* also apply styles for public share icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-08 11:14:36 +01:00
6c323496ab
fix share icon position and remove debug log
2016-11-08 10:36:39 +01:00
8d7df51a0e
[tx-robot] updated from transifex
2016-11-08 01:06:57 +00:00
0c1fd16d54
Add tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 21:02:23 +01:00
07d027feeb
Show link icon when shared by link
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 15:38:56 +01:00
b39a17e499
Actually update the state
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 14:58:45 +01:00
8de4d4f76e
detail fixes for share current folder
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-07 14:58:45 +01:00
1190ce1dd5
Listen to sharetab changes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-07 14:58:45 +01:00
c55718ae5e
update breadcrumb view whenever the share information on the directory info model changes
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
36cf779140
the root folder must not be shared
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
5bf7e5533d
visually reflect sharing state of current folder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
9e5e120ef9
refactor share permission logic into own method to reuse it for the share tab
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
bc1cb8a6d0
let users share the curren folder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
c5597baf88
show whether the current folder was shared or not
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
fb562e93cc
Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tad
...
Cleanup OC_Group usage a bit
2016-11-04 22:40:34 +01:00
04ece69a33
Cleanup OC_Group usage a bit
...
This is deprecated internal stuff. Should not be used anymore.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-04 20:55:47 +01:00
bf9376a7f6
Fixed disappearing of share info in file view
2016-11-04 10:37:30 +01:00
55af6b45f7
More tests
...
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
3822bceea2
Move publicpreview over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
8471219b7c
[tx-robot] updated from transifex
2016-11-03 01:07:06 +00:00
39573e602d
Merge pull request #1978 from nextcloud/remove-send-mail-option
...
Remove send mail option
2016-11-02 22:36:05 +01:00
d235c4833f
remove the 'shareapi_allow_mail_notification' setting
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 21:17:05 +01:00
7e701504be
Remove upload_limit in files app as it is not needed with PUT upload ( #26069 )
...
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:43:35 +01:00
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
ffebc050d0
Merge pull request #1887 from nextcloud/downstream-26370
...
Added functions to check etag of elements - integration tests
2016-11-02 14:57:45 +01:00
7da3ba3f91
Merge pull request #657 from nextcloud/share-by-mail
...
New share provider: Share by mail
2016-11-02 11:04:33 +01:00
e5bc45c349
Fix OCS API to be able to remove group shares from self as recipient
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 08:49:58 +01:00
122fbf0092
[tx-robot] updated from transifex
2016-11-02 01:07:09 +00:00
6e52091c8e
remove unused variable
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:11:30 +01:00
6d7520b1e2
unit tests updated and new added
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
7436e45c91
if we have a exact match, either for the federated cloud id or for the
...
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
392c8a115f
unified way to display remote shares and mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
8c8a019b7e
show correct display name if we have the user in one of our address books
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
60a3893ca8
improve search for federated cloud ids and email adresses
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
77f74b9780
handle case if no share-by-mail share provider is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
96c40d14a1
update permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
a17c6a485d
add share by mail share provider
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
20f45e6fe4
[tx-robot] updated from transifex
2016-11-01 01:06:57 +00:00
8d83e239f3
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:45 +01:00
6d2d069c17
[tx-robot] updated from transifex
2016-10-31 01:06:55 +00:00
a08a4b5981
Merge pull request #1955 from nextcloud/issue_#1776
...
Issue-1776: Add unshare function to 3-dot menu.
2016-10-30 11:27:57 +01:00
1187a8c183
[tx-robot] updated from transifex
2016-10-30 00:06:56 +00:00
2d91831b50
Issue-1776: Add unshare function to 3-dot menu.
...
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
2016-10-29 17:07:06 +02:00
740659a04c
Move away from OC_L10N
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 21:46:28 +02:00
ad597d498d
[tx-robot] updated from transifex
2016-10-28 00:07:11 +00:00
9984eba727
[tx-robot] updated from transifex
2016-10-27 00:07:01 +00:00
a973c1bfb9
[tx-robot] updated from transifex
2016-10-26 00:07:12 +00:00
01a85a98f2
Merge pull request #1876 from nextcloud/shareesAPI_email
...
Add ShareesAPI E-mail search
2016-10-25 13:53:59 +02:00
e23a298a81
[tx-robot] updated from transifex
2016-10-25 09:36:09 +00:00
e8c359d86e
Merge pull request #1897 from nextcloud/fix-public-button
...
fix button on public upload page for mobile
2016-10-25 11:03:21 +02:00
d4515ae603
fix button on public upload page
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-24 23:26:56 +02:00
0abcc630a5
Fix public files_drop page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 21:45:00 +02:00
7a6dbeb398
Make files_drop work
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 21:45:00 +02:00
59c5be1cc5
Use Webdav PUT for uploads in the web browser
...
- uses PUT method with jquery.fileupload for regular and public file
lists
- for IE and browsers that don't support it, use POST with iframe
transport
- implemented Sabre plugin to handle iframe transport and redirect the
embedded PUT request to the proper handler
- added RFC5995 POST to file collection with "add-member" property to
make it possible to auto-rename conflicting file names
- remove obsolete ajax/upload.php and obsolete ajax routes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 21:45:00 +02:00
a28528a254
Add ShareesAPI E-mail search
...
* Allow to search for SHARE_TYPE_EMAIL (4)
* Added tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 14:59:32 +02:00
b130267e58
Import the used classes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-24 14:33:54 +02:00
b4ebf03bef
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 13:25:59 +02:00
f589f1a1d6
Move files_sharing Controllers => Controller
...
lib/Controller is the default location for controllers. So lets put them
all in there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 11:46:25 +02:00
6604e76e94
Fix middleware tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
ea07bbc562
Move Share20OCS to ShareAPIController
...
It was already a controller just still residing in its old location.
* Moved ShareAPIController to user plain userID instead of user object
* Moved Share20OCS to ShareAPIController
* Removed initisation of class from Application.php and leave it to the
AppFramework
* Fixed tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 09:52:34 +02:00
7792902808
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-21 21:43:15 +02:00
e0d919bbfc
Adding Open Graph Support for public shares http://ogp.me/
...
In case no preview is available we display the ownCloud logo
Fix unit test
2016-10-21 21:42:40 +02:00
2799b0a821
Merge pull request #1835 from nextcloud/downstream-24948
...
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 23:48:15 +02:00
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace
2016-10-20 20:27:44 +02:00
d4976e5554
Fix post_unshareFromSelf hook parameter format
...
When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.
This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.
2016-10-20 16:09:08 +02:00
5e48ce98c7
Merge pull request #1784 from nextcloud/fix-activity-filter-names
...
Adjust wording to make the separation between sharing and files more clear
2016-10-19 09:45:30 +02:00
0c8bd9fa49
Merge pull request #1788 from nextcloud/share-link-whitespace
...
add whitespace above share link so it's visually distinguished more
2016-10-18 20:19:58 +02:00
9f2e370ed7
add whitespace above share link so it's visually distinguished more
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-18 19:43:18 +02:00
b112493d1a
Adjust wording to make the separation between sharing and files clearer
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-18 17:18:14 +02:00
2bb031ecc6
Merge pull request #1606 from nextcloud/search-detail
...
search design details
2016-10-18 13:48:01 +02:00
943d9737e4
[tx-robot] updated from transifex
2016-10-18 00:06:51 +00:00
00ed841559
[tx-robot] updated from transifex
2016-10-15 00:06:56 +00:00
2de59d8a2a
remove unneeded unlock
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:40 +02:00
ab10a54836
remove duplicate trait
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:38 +02:00
f63f0aa1ae
get node by path as fallback
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
9754724c8b
fix getting recipient share in ocs api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:37 +02:00
7d1e800c15
fix share tests not passing path
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:36 +02:00
1b3b816a0a
re-use the share node while formating if we already have it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:35 +02:00
3845d4ec9a
more robust test setup
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
7ce68ce6ac
phpunit is weird
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:34 +02:00
37eded7e7c
Always unlock node after trying to create a share
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
3f40bb69f8
[tx-robot] updated from transifex
2016-10-10 00:06:58 +00:00
9fc3209d2c
[tx-robot] updated from transifex
2016-10-09 00:06:49 +00:00
0beecbf2c5
[tx-robot] updated from transifex
2016-10-08 00:06:50 +00:00
f2b1a1781c
Merge pull request #1568 from nextcloud/test-running-coverage-also-for-db
...
[Test] Generate coverage for DB group
2016-10-05 14:37:25 +02:00
a1f5364d7f
Generate coverage for quick DB tests
...
This adds the "QUICKDB" group which excludes some tests that abuse unit tests as integration tests as displayed in https://github.com/nextcloud/server/issues/1626
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-05 13:55:44 +02:00
671f16f706
Add icons to activity navigation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-05 11:38:06 +02:00
96af627bb7
fix sharing icon's alignment and add padding to the unshare icon
2016-10-03 09:35:54 +02:00
07a1be2e06
[tx-robot] updated from transifex
2016-10-03 00:12:47 +00:00
6297d201df
[tx-robot] updated from transifex
2016-10-02 00:16:25 +00:00
da03018add
[tx-robot] updated from transifex
2016-10-01 00:08:23 +00:00
99076a8c0d
[tx-robot] updated from transifex
2016-09-30 00:08:13 +00:00
498b7399c1
Inject IHTTPClientService
...
Otherwise the unit test execution will do a ton of external HTTP requests which fail and then timeout…
See https://blackfire.io/profiles/compare/3c67acfa-a11e-4aec-bcd4-c945b006f01e/graph for reference
Pretty similar to https://github.com/nextcloud/server/pull/1565
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-29 00:26:20 +02:00
0f321fe116
Merge pull request #1534 from nextcloud/svg-optimization
...
Svgo optimization
2016-09-28 23:05:48 +02:00
f4eee1d3a5
Merge pull request #1512 from nextcloud/share-alttext
...
Display "Share" alt text for share action icon (#26158 )
2016-09-28 20:44:15 +02:00
71830b285c
Svgo optimization
...
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
fc65093694
Merge pull request #1460 from nextcloud/fed-share-retry
...
[upstream] Fix fed share test call to return proper result
2016-09-26 13:59:28 +02:00
f07d146644
Display "Share" alt text for share action icon ( #26158 )
...
Downstreaming of https://github.com/owncloud/core/pull/26158
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-26 10:30:11 +02:00
a086011e00
[tx-robot] updated from transifex
2016-09-25 00:09:40 +00:00
b30c79b63c
[tx-robot] updated from transifex
2016-09-23 00:09:45 +00:00
6a873acf46
[tx-robot] updated from transifex
2016-09-22 00:11:32 +00:00
118c9d58fe
Fix fed share test call to return proper result
...
Fixes an issue where retrying a previously failed federated share would
not properly reset the availability flag because the return value was
undefined instead of "true".
2016-09-20 12:11:26 +02:00
f4a4578f0d
[tx-robot] updated from transifex
2016-09-19 00:09:33 +00:00
cb6e16ab5c
[tx-robot] updated from transifex
2016-09-17 00:10:14 +00:00
9fa288f12b
[tx-robot] updated from transifex
2016-09-16 00:09:34 +00:00
4fdee00c27
[tx-robot] updated from transifex
2016-09-15 00:12:37 +00:00
56d37e27bc
Fix tests
2016-09-13 09:40:59 +02:00
fb52b1af67
Allow increasing permissions for share owner
...
In some cases, the owner of the share is also recipient through a group
share. The owner must still be able to increase permissions in that
situation.
2016-09-13 09:40:59 +02:00
a45cfbc2d2
search design details
2016-09-09 18:01:00 +02:00
ba104233b0
Move remote_shares OCS endpoint to AppFramework
2016-09-09 07:40:33 +02:00
f5aafdc897
[tx-robot] updated from transifex
2016-09-09 00:09:31 +00:00
c16aefcff5
Merge pull request #1317 from nextcloud/add-sharing-disclaimer
...
Adding a optional disclaimer to the anonymous upload page
2016-09-08 21:18:28 +02:00
5ac26d12f0
Merge pull request #1247 from nextcloud/storage-id-global-cache
...
more efficient querying of numeric storage ids
2016-09-08 21:09:14 +02:00
268c5a0aa0
Adjust test
2016-09-08 20:34:04 +02:00
9a2ae2fe7d
Fix tests
2016-09-08 20:11:21 +02:00
6bb95de1c5
Adding a optional disclaimer to the anonymous upload page
2016-09-08 18:44:27 +02:00
9adf78c155
dont show shares you own in "shared with you"
2016-09-07 18:38:08 +02:00
e8e950a4d2
more efficient querying of numeric storage ids
2016-09-07 17:22:40 +02:00
7c0951244a
Deprecate getEditionString()
2016-09-06 16:05:28 +02:00
c629761fea
Fix getMock files_sharing
2016-09-06 09:29:27 +02:00
8b484eedf0
[tx-robot] updated from transifex
2016-09-05 00:09:10 +00:00
fc02c4a980
[tx-robot] updated from transifex
2016-09-04 00:09:21 +00:00
e7f618ef14
[tx-robot] updated from transifex
2016-09-03 00:09:24 +00:00
4a5cd74fb2
[tx-robot] updated from transifex
2016-09-01 00:09:24 +00:00
a0af513a4a
Merge pull request #1201 from nextcloud/usermountcache-orphanedshare
...
[master] Usermountcache orphanedshare
2016-08-31 15:07:13 +02:00
423378ea17
Added closeCursor in SharedMount numeric id
2016-08-30 19:49:31 +02:00
669b0bc2ae
Prevent error with orphaned shares when updating user mount cache
2016-08-30 19:49:23 +02:00
ec9fd67bc5
Allow space for federated share id search
2016-08-30 11:11:59 +02:00
6c365cb06d
A shared storage is never a home storage - fixes #25582
2016-08-29 14:13:26 +02:00
Joas Schilling
Morris Jobke
Lukas Reschke
Roeland Jago Douma
Nextcloud bot
Thomas Müller
Robin Appelman
Vincent Petry
Maxence Lange
Jörn Friedrich Dreyer
Roeland Jago Douma
Björn Schießle
John Molakvoæ
Frédéric Fortier
Christoph Wurst
John Molakvoæ (skjnldsv)
Michael Jobst
Arthur Schiwon
Maxence Lange
Jan-Christoph Borchardt
Michael Jobst
Michael Grosser
Marius Blüm
Julia Bode
Thomas Müller
Joas Schilling
skjnldsv