706131b394
add icewind/searchdav
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-28 14:24:18 +01:00
b5a6f03362
Merge pull request #3643 from nextcloud/replace-deprecated-tipsy
...
Replace deprecated $.tipsy(...) by $.tooltip(...)
2017-02-28 10:49:14 +01:00
8e370bbf28
Refactor provision api app's UserControllerTest
...
* Replace deprecated getMock with createMock
* Use createMock consistently
* Use php's ::class references
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-28 10:40:49 +01:00
2f980ca76c
Fix saving backup codes by using a correct data uri
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-28 10:20:30 +01:00
b72b02778d
Merge pull request #2997 from nextcloud/fix_2957
...
Allow groups with / in sabre
2017-02-28 00:34:08 -06:00
86149508d0
fix typo
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 00:14:34 -06:00
7fc3129f0c
[tx-robot] updated from transifex
2017-02-28 01:07:54 +00:00
3e7e49884e
Replace deprecated $.tipsy(...) by $.tooltip(...)
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-27 22:25:05 +01:00
c75b5a5614
Properly handle groups with a /
...
If a group contains a slash the principal URI becomes
principals/groups/foo/bar. Now the URI is plit on '/' so this creates
issues ;)
Fixes #2957
* Add tests for groups with /
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-02-27 17:07:18 +01:00
f3a7b7eaa3
[tx-robot] updated from transifex
2017-02-27 01:19:49 +00:00
db6eb85ad2
don't setted status when file is lock
2017-02-25 16:12:53 +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
a113ca68eb
Merge pull request #3598 from nextcloud/issue-3583-shared-addressbooks-fail-on-legacy-endpoint
...
Use the correct principal for shared addressbooks
2017-02-24 16:36:39 +01:00
b26568133f
Merge pull request #3605 from nextcloud/single-user
...
Clean up single user mode
2017-02-24 08:52:26 +01:00
97b6c1496e
[tx-robot] updated from transifex
2017-02-24 01:21:37 +00:00
6bd4e1f65b
Use the correct principal for shared addressbooks
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-23 14:16:00 +01:00
dda15b74cb
add posibility to remove all personal data from lookup server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-23 12:27:24 +01:00
9533f4e5ed
Clean up single user mode
...
Single user mode basically disables WebDAV, OCS and cron execution. Since
we heavily rely on WebDAV and OCS also in the web UI it's basically useless.
An admin only sees a broken interface and can't even change any settings nor
sees any files. Also sharing is not possible.
As this is at least the case since Nextcloud 9 and we haven't received any
reports for this it seems that this feature is not used at all so I removed it.
The encryption commands now rely on the well tested maintenance mode.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-22 23:02:31 -06:00
54317e80c0
[tx-robot] updated from transifex
2017-02-23 01:18:48 +00: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
a2e16fd5ba
Merge pull request #3418 from nextcloud/add-groups-to-userinfo
...
add groups to user info output
2017-02-22 12:26:47 +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
db80fbd1cb
Merge pull request #3413 from nextcloud/theming-appdata
...
Move theming images to AppData
2017-02-22 10:16:33 +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
2836b54236
Merge pull request #3557 from marncz/master
...
Fixed path in other folders search
2017-02-21 20:20:17 +01: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
d754227b4c
[tx-robot] updated from transifex
2017-02-21 01:08:46 +00:00
20ad3f33d0
Fixed path in other folders search
...
Signed-off-by: Marcin Czarnecki <marcin.czarnecki@protonmail.com>
2017-02-21 00:38:46 +00:00
a4266f59ae
Merge pull request #3521 from nextcloud/ldap-fix-uuid-attr-detection
...
Fix Borken UUID Attribute Detection
2017-02-20 21:34:55 +01:00
866b218f37
Fix misleading wording: searching is affected, not user access.
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-20 19:26:16 +01:00
e5ddb40a3e
Add test for creating AppData folder
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-20 15:48:22 +01:00
d3f774d035
Merge pull request #3505 from robert-scheck/autoindex
...
Only request "IndexIgnore" if mod_autoindex is loaded
2017-02-20 14:25:09 +01:00
25a2cb8c6e
Only request "IndexIgnore" if mod_autoindex is loaded
...
Signed-off-by: Robert Scheck <robert@fedoraproject.org>
2017-02-20 13:09:15 +01:00
51f06bb1f8
[tx-robot] updated from transifex
2017-02-19 01:07:37 +00:00
ce97ab92c6
add tests to DB group
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:12:30 +01:00
42ddb12fd9
Background jobs can take 4k of characters only. We find a good batch size.
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 20:06:25 +01:00
497ee3e3e6
Add repair steps
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 18:45:33 +01:00
45615cc940
add integration test for uuid attr detection
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 12:05:51 +01:00
c1bb89d65b
[tx-robot] updated from transifex
2017-02-17 01:07:58 +00:00
f87812fdd6
Fix determining the UUID attribute, default of the override is null
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 02:06:10 +01:00
b740a21399
Fix integration test by not relying on Fake instances
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-02-17 02:04:42 +01:00
3f0134622d
Use createMock
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:39 +01:00
b2cbe3530d
Use ::class in tests and correct import
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:39 +01:00
88a0ef7d4a
Add tests for theming migration step
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
345d1f1291
Adapt ThemingController tests
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
60d77ceccb
Add repair step to move existing theming images
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
6a9d5d60dc
Move theming images to AppData
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-02-16 15:13:38 +01:00
47c6a8019f
[tx-robot] updated from transifex
2017-02-16 01:07:44 +00:00
b1c4b445da
Merge pull request #3449 from nextcloud/notify-subfolder-self-test
...
Make the notify self test for subfolders more reliable
2017-02-15 20:33:05 +01:00
2d8b7b875b
Merge pull request #2704 from nextcloud/2fa-fix-backup-codes-print
...
print the backup codes tab and not the current one
2017-02-15 20:18:48 +01:00
52ef851da3
Merge pull request #3421 from espro/freeipa-uuid-fix
...
Update uuidAttributes list to include FreeIPA's ipauniqueid
2017-02-15 08:07:58 -06:00
cd49eb36e8
Merge pull request #3485 from nextcloud/Popovermenu-files-css-fix
...
Popovermenu files css fix
2017-02-15 12:33:08 +01:00
44186cab85
Merge pull request #3473 from nextcloud/fix-addressbook-deletion
...
Address book data lost when any user receiving a share is deleted
2017-02-15 11:34:03 +01:00
813802238b
Merge pull request #3487 from nextcloud/fix-files-header-name
...
Fix app name of files app
2017-02-15 11:30:30 +01:00
41276f720b
[tx-robot] updated from transifex
2017-02-15 01:07:29 +00:00
b5b541d084
Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection
...
Fix DI of the cloud id manager into apps
2017-02-14 17:42:53 -06:00
b954c2f186
Fix app name of files app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-14 17:36:23 -06:00
31d56155d4
Css fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-15 00:09:32 +01:00
7e9411b929
this is public
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 16:56:56 +01:00
c5dffc465c
Merge pull request #3472 from nextcloud/enable-avatars-always
...
Always enable avatars
2017-02-14 09:22:02 -06:00
0be2921966
Fix DI of the cloud id manager into apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-14 12:47:46 +01:00
57122e8d89
Test fix
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 10:47:07 +01:00
36b8558ff6
tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 09:33:04 +01:00
b8fcd3ce27
getUsersOwnAddressBooks
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-14 09:21:33 +01: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
5b9f96a434
Merge pull request #3324 from nextcloud/fix-2431
...
LDAP's checkPassword should only catch when a user was not found, fixes #2431
2017-02-13 23:21:08 +01:00
88047aaea7
[tx-robot] updated from transifex
2017-02-13 01:07:10 +00:00
f9d94edb0f
[tx-robot] updated from transifex
2017-02-12 01:07:26 +00:00
01b3da612b
[tx-robot] updated from transifex
2017-02-11 01:07:23 +00:00
abf0606054
Merge pull request #3430 from nextcloud/fix-ios-client-detection
...
Fix detection of the new iOS app
2017-02-10 14:24:45 -06:00
5acebb911b
fix self test for non leading slash
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 18:04:59 +01:00
d9a6353bc1
Make the notify self test for subfolders more reliable
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 17:38:29 +01:00
f7b8a31d63
Update uuidAttributes list to include FreeIPA's ipauniqueid
...
Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
2017-02-10 10:23:13 -05:00
929648ce2c
Add integration tests for legacy DAV endpoints
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 16:18:04 +01:00
a88fc0c283
Merge pull request #3181 from nextcloud/fix-favorite-activity-mail
...
Make sure the file information is available when sending the email
2017-02-10 11:35:45 +01:00
33fb86f68b
Fix detection of the new iOS app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:10:21 +01:00
8a74ab88d8
add transifex config for sharebymail
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 19:53:32 -06:00
c2e61362cc
[tx-robot] updated from transifex
2017-02-10 01:07:02 +00:00
2ca8339d01
add groups to user info output
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-09 16:23:10 +01: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
f6cd5200a2
clean cloud ids
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:31:06 +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
a359d0d7c7
remove test for removed code
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +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
1a591cea97
Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array
...
Make sure ownCloud 8.2 activities also can get displayed
2017-02-08 14:47:45 +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
1aba2d9ed8
[tx-robot] updated from transifex
2017-02-08 01:07:09 +00:00
d79838ac9b
Add tests for getUser()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:01:28 +01:00
881c7275a2
Add tests for getFile()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:49:32 +01:00
c031c77e3c
Make sure ownCloud 8.2 activities also can get displayed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:30:23 +01:00
5e4bbb394c
[tx-robot] updated from transifex
2017-02-07 01:08:50 +00:00
fa96b9e356
[tx-robot] updated from transifex
2017-02-06 01:07:04 +00:00
e4a74568e6
[tx-robot] updated from transifex
2017-02-05 01:07:05 +00:00
9ce8437b8b
Merge pull request #3353 from nextcloud/mobile-view-files-fix
...
Fix files mobile view
2017-02-04 21:00:40 +01:00
03bbda913d
[tx-robot] updated from transifex
2017-02-04 01:07:20 +00:00
49bce91404
[tx-robot] updated from transifex
2017-02-03 01:07:21 +00:00
d318e2b005
Fix Sharing app description
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-02 16:22:21 +01:00
b946ec9d6c
[tx-robot] updated from transifex
2017-02-02 01:07:05 +00:00
e0e5b32f94
Fix files mobile view
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-02-01 18:39:27 +01:00
1952560ac7
[tx-robot] updated from transifex
2017-02-01 01:06:57 +00:00
5bad417e57
Merge pull request #2044 from nextcloud/login-credential-store
...
Login credential store
2017-01-30 19:30:04 -06:00
9a13fac418
[tx-robot] updated from transifex
2017-01-31 01:07:05 +00:00
687e38c409
Merge pull request #2970 from nextcloud/notify-self-test
...
Add self-test for files_external:notify
2017-01-30 17:15:57 -06:00
9983e05121
LDAP's checkPassword should only catch when a user was not found, fixes #2431
...
Also fixes error processing after ldap_search, due to different return format
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-30 17:06:51 +01:00
64e9a1aec0
Merge pull request #3176 from nextcloud/default-value-datadir
...
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
bbcb1dd2e0
[tx-robot] updated from transifex
2017-01-30 01:07:14 +00:00
f4de328695
[tx-robot] updated from transifex
2017-01-29 01:06:55 +00:00
b614547ff8
[tx-robot] updated from transifex
2017-01-28 01:06:59 +00:00
8b95bd29ee
Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
...
Add navigation via info.xml (#26785 )
2017-01-27 11:25:26 -06:00
90c011379c
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:51:00 +01:00
d14ff70050
add unit tests for smb notify backend
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:45 +01:00
72eeb8fd22
add notify self test
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:41 +01:00
c7536f7877
switch occ files_external:notify to new notify mechanism
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:37 +01:00
269747985e
Add a more powerful notify mechanism
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:33 +01:00
0aa211eefb
Add missing smb files
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-27 10:44:29 +01:00
27f8a832e4
Force to specify the name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-27 09:44:11 +01:00
a5aeddc810
[tx-robot] updated from transifex
2017-01-27 01:07:18 +00:00
426c8e3be1
Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug
...
fix shared-as-busy events for owner
2017-01-26 17:30:51 -06:00
dd0d469833
Merge pull request #3272 from nextcloud/fix_user_controller
...
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
2017-01-26 18:37:36 +01:00
ce240a45e6
Merge pull request #3160 from nextcloud/streams52
...
update icewind/streams to 0.5.2
2017-01-26 14:55:37 +01:00
c9ecd64d36
update icewind/streams to 0.5.2
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 12:19:32 +01:00
97d3020027
fix shared-as-busy events for owner
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-01-26 12:06:07 +01:00
3afd3c3a3d
Merge pull request #3265 from nextcloud/brute-force-protection-public-link-auth
...
add brute force protection for public link authentication
2017-01-26 12:05:16 +01:00
3e6c40eeb4
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:31:08 +01:00
3a603ab8b4
Merge pull request #3264 from nextcloud/ldap-deny-long-dns
...
Gracefully deny users or groups with too long DNs
2017-01-26 01:15:43 -06:00
feab1e5b94
Merge pull request #3162 from nextcloud/ldap-ocs
...
Part 1 of LDAP Backend OCS Api
2017-01-25 22:45:34 -06:00
05e3aa491a
[tx-robot] updated from transifex
2017-01-26 01:07:15 +00:00
6fe3cfa1e3
Merge pull request #3244 from nextcloud/settings-icon
...
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06: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
03ae7b654f
Gracefully deny users or groups with too long DNs
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-25 17:10:51 +01:00
ffe2543a57
Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api
...
add data from the users profile to the provisioning api
2017-01-25 15:44:36 +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
95ef625a9d
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 11:24:42 +01:00
5086335643
unify endpoints form core and the the provisioning api
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 11:20:35 +01:00
c3e57d228f
[tx-robot] updated from transifex
2017-01-25 01:10:00 +00:00
f9c3639607
add icon for encryption settings on personal page
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:59:36 -06:00
e46410e856
Add icon to admin page sidebar for LDAP
...
* follow up to nextcloud/server#3151
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:54:32 -06:00
e09bba5e36
Merge pull request #3151 from nextcloud/navigation-icons
...
add icons to navigation of personal & admin settings
2017-01-24 10:56:31 -06:00
fee42647fb
add data from the users profile to the provisioning api
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 14:23:18 +01: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
30e9d67ee9
[tx-robot] updated from transifex
2017-01-24 01:07:14 +00:00
f19feccf9f
Merge pull request #3209 from nextcloud/fix-theming-typo
...
Fix typo in theming description
2017-01-23 13:54:52 -06:00
Robin Appelman
Lukas Reschke
Christoph Wurst
Morris Jobke
Nextcloud bot
Roeland Jago Douma
vkuimov
Roeland Jago Douma
Joas Schilling
Bjoern Schiessle
John Molakvoæ
Frédéric Fortier
Marcin
Arthur Schiwon
Julius Haertl
Robert Scheck
John Molakvoæ (skjnldsv)
Brent Bloxam
Marius Blüm
Georg Ehrke