46d0d0cda1
fix appinfo parsing when a single localized option is provided
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-17 11:14:03 +02:00
9ee1febf62
Provide an option to disable HTML emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-16 19:00:05 +02:00
89a9d35d90
dont keep shared database locks when running cli scripts
...
For cli scripts we don't have the assumption that the universe will be cleaned up soon
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-11 19:21:45 +02:00
88c1b8edbd
Merge pull request #9024 from nextcloud/fix/app-fetcher-major-minor-versions
...
Fix version comparison with minor and patch level requirements
2018-04-11 15:48:23 +02:00
7a3ce073da
Merge pull request #8946 from nextcloud/log-exceptions-as-nested-array-2
...
Log exceptions as nested array instead of encoded json
2018-04-11 14:24:47 +02:00
185a260f6b
Merge pull request #9074 from nextcloud/ARGON2I
...
Add ARGON2I support to the hasher
2018-04-11 11:04:42 +02:00
ac939e8fd4
Fix version comparison with minor and patch level requirements
...
If an app requires a specific minor or path level server version,
the version_compare prevented the installation as only the major
version had been compared and that checks obviously returns `false`.
Now the full version is used for comparison, making it possible to
release apps for a specific minor or patch level version of Nextcloud.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-04-11 10:08:23 +02:00
b9583c6dce
Log exceptions as nested array instead of encoded json
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-04-10 15:53:43 +02:00
8b9bd37e4e
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-09 15:13:11 +02:00
84316aec66
Add ARGON2I support to the hasher
...
When on php7.2 we can use the new and improved ARGON2I hashing.
This adds support for that to the hasher. When verifying an old hash
we'll update rehash to move all hashes eventually to the new hash
function.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 15:43:50 +02:00
73e6eea57e
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:50:54 +02:00
c3900c9d0d
Merge pull request #9018 from nextcloud/fix-copy-encrypted-files
...
reset encryptionVersion to '1' if a file was stream copied
2018-04-03 18:24:27 +02:00
a0923d9ffb
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 18:01:23 +02:00
1d7b14dfb1
Use app version to generate scss filename
...
Fixed scsscacher tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 08:33:46 +02:00
af31fa82e8
Fix test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-22 12:06:45 +01:00
f843b7edfe
Merge pull request #8506 from nextcloud/use-appmanager
...
Use isInstalled of AppManger instead of reimplement it
2018-03-22 09:55:19 +01:00
514de5dfa1
Use isInstalled of AppManger instead of reimplement it
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 11:34:18 +01:00
934eade56f
Migrate tests for contacts manager to correct test class
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-21 10:43:18 +01:00
ec1e039790
Show EOL warning in the update section
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-20 15:52:30 +01:00
1088068c60
Remove \OCP\Files::tmpFolder
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:54:39 +01:00
47a3008141
Remove \OCP\Files::tmpFile
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:52:35 +01:00
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name
...
Full implement group display names
2018-03-15 12:07:30 +01:00
8d4b76c0e2
Remove deprecated OCP\Contacts
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-14 10:47:09 +01:00
7785c3752f
Remove deprecated HTTPHelper
...
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 21:54:56 +01:00
57eaa48e3d
Merge pull request #8788 from nextcloud/cleanup-oc_api
...
Remove unused methods and constants from legacy OC_API
2018-03-13 08:52:24 +01:00
a1232f46ca
Remove unused methods and constants from legacy OC_API
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 18:03:25 +01:00
2b335fd607
Use insertIfNotExist of the new interface
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 17:45:49 +01:00
432e529827
Merge pull request #8784 from nextcloud/remove-unused-deprecated-apphelper
...
Remove unused and deprecated class and interface AppHelper
2018-03-12 16:33:46 +01:00
f5c5c5181f
Remove unused and deprecated class and interface AppHelper
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 15:27:10 +01:00
44289ff134
Use proper method to format absolute timestamp
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-12 15:16:52 +01:00
054a45c079
Merge pull request #8710 from nextcloud/followup/8596/tests-for-user-pagination
...
Tests for email collaborators pagination
2018-03-09 11:21:21 +01:00
7a7c350a2d
Merge pull request #8716 from nextcloud/fix-cache-prefixing
...
Remove base url from global cache prefix
2018-03-08 21:12:54 +01:00
720e64ba55
Fixed caldav tests and metadata 2
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-08 17:13:50 +01:00
d80f13ef99
Fix Metadata tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-08 17:13:50 +01:00
882096653e
Fix calculation if there are more results
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-08 16:22:16 +01:00
3d7ae4aa97
Add tests for finding own email and user results pagination
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-08 13:26:26 +01:00
a2db959f5c
Merge pull request #8593 from eneiluj/master
...
Allow public page access to apps with group restrictions
2018-03-08 11:27:52 +01:00
3ad7daeda5
Add tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-08 11:05:18 +01:00
95366bbd1f
Fix tests to use ICacheFactory
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-07 15:09:43 +01:00
8d865483f4
Merge pull request #8714 from nextcloud/8705
...
Check if the cached js file exists
2018-03-07 14:45:43 +01:00
448a5e574e
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-07 14:04:21 +01:00
de56915605
Merge pull request #7419 from Abijeet/feature-7175
...
Fixes #7175 - Allow to search for email address in user management
2018-03-06 21:53:37 +01:00
d179186430
Remove testcase
...
Since a token now always requires a string we don't need to test for
null
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 16:14:46 +01:00
0c500e460f
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-05 09:06:51 +01:00
158aac00a0
Merge pull request #8289 from nextcloud/appdata_hardening
...
AppData hardening
2018-03-02 11:26:36 +01:00
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms
...
Let the admin configure the default share permissions
2018-02-27 13:44:34 +01:00
8b5997483c
Hardening of SimpleFile getContent
...
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 13:35:09 +01:00
01f420c7ac
Merge pull request #8051 from nextcloud/public-template
...
Public page template response
2018-02-27 13:33:19 +01:00
3285becdc1
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
1615312bf1
add share permissions to settings page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-02-27 12:29:25 +01:00
5a4aa2b7dd
Add test for PublicTemplateResponse
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-27 12:25:53 +01:00
6994bce951
Loglevel is an int
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 10:45:35 +01:00
4077f16aec
Make ILogger strict
...
* Make implementations strict
* Add scalar typehints
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 10:41:46 +01:00
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page
...
Provide translated error message for permission error
2018-02-26 17:50:21 +01:00
cf35c4b03a
Provide translated error message for permission error
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-26 17:00:29 +01:00
0ee45d3d20
Fix proper types
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-22 15:51:19 +01:00
e1bdeb786e
Merge pull request #8472 from nextcloud/strict_integritycheck
...
Make OC\IntegrityCheck strict
2018-02-22 10:01:50 +01:00
72e745be26
Handle strict typing in Checker and fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 21:09:08 +01:00
ca9f364fd4
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-21 10:55:52 +01:00
8e5120ce66
Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-size
...
Better result handling of email search
2018-02-20 23:02:53 +01:00
b30e035e25
Better result handling of email search
...
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-20 17:38:32 +01:00
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app
...
Add strict types to OC_App
2018-02-17 21:34:20 +01:00
9dc3b04802
Fix app version to be always string and neither array nor null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-17 16:05:13 +01:00
211212f4b3
App manager is not needed anymore
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 17:13:36 +01:00
17a26dfcc1
Validate the info.xml against the appstore schema file
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:23:51 +01:00
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities
...
Expose navigation entries as API endpoint
2018-02-15 16:55:12 +01:00
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6
...
update guzzlehttp/guzzle to 6.3.0
2018-02-14 22:26:19 +01:00
f9dbaf6f2a
Make sure we test the proper order in the NavigationManagerTest
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-12 17:22:32 +01:00
9b25ff9fcb
adjust httpclient to guzzle6
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-09 17:13:21 +01:00
df6e23c98c
add ci for swift primary storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-02-08 15:18:25 +01:00
26e0c14c6d
Merge pull request #8033 from nextcloud/s3-uploader
...
Use S3Client::upload instead of splitting single/multipart upload ourselves
2018-02-08 14:30:02 +01:00
047fb6d2c5
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-03 22:16:09 +01:00
b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-03 15:21:51 +01:00
5460166ff5
Add tests and class mapping
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-02-03 15:21:51 +01:00
372e06d742
Add all parameters to returnValueMap
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-31 14:15:12 +01:00
1429146083
Merge pull request #8096 from nextcloud/feature/6382/do-not-cache-settings-in-db-anymore
...
Do not cache the settings/sections in the database anymore
2018-01-31 12:49:45 +01:00
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss
...
SCSS hardening
2018-01-29 16:12:10 +01:00
d971b104ed
Do not cache the settings/sections in the database anymore
...
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-29 15:47:37 +01:00
7405dfb544
Update tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-29 14:37:18 +01:00
5ec7296f6d
Add tests for URL rewriting
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-26 19:56:13 +01:00
b9bbb894f8
Merge pull request #7916 from nextcloud/2fa_log
...
Add 2FA to logfile
2018-01-25 15:57:32 +01:00
8160d0bc2a
Merge pull request #8036 from nextcloud/phpunit6
...
Require PHPUnit 6.5 or higher
2018-01-25 14:50:46 +01:00
c92eff919e
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-25 13:25:09 +01:00
3917a54113
Class "ProgressBar" is declared "final" and cannot be mocked.
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-25 11:33:26 +01:00
bf2be08c9f
Fix risky tests without assertions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-25 11:33:25 +01:00
870023365c
Fix "Undefined method setExpectedException()"
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-24 18:10:16 +01:00
c3424df1f0
Require PHPUnit 6.5 or higher
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-24 17:23:59 +01:00
3499cbdb76
Use S3Client::upload instead of splitting single/multipart upload ourselves
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-24 17:22:05 +01:00
1daddd678e
Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin
...
Dont polute the log on DAV emaillogin
2018-01-24 14:00:01 +01:00
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions
...
Properly log the full exception instead of only the message
2018-01-23 11:56:02 +01:00
2a38605545
Properly log the full exception instead of only the message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
ef127a30ec
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-23 10:35:37 +01:00
d9b1492e03
Remove old repair steps that aren't executed anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-22 14:51:02 +01:00
c70927eaa0
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-19 14:00:27 +01:00
f0b7b2dedf
Merge pull request #7911 from nextcloud/improve-oc_image
...
Improve OC_Image code to not guess the type of input
2018-01-18 14:39:08 +01:00
3d4c698f44
Improve OC_Image code to not guess the type of input, but actually request the specific methods to be called
...
Followup to #7836
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-18 13:40:55 +01:00
1e7b20f615
Remove IAppConfig::setValue
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-17 21:41:57 +01:00
09f8a755ec
Remove IAppConfig::getValue
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-17 21:41:56 +01:00
6e29b8731e
Merge pull request #7914 from nextcloud/fix-7254
...
format self-mentions, but don't offer them
2018-01-17 14:59:46 +01:00
6fdd686111
do not offer the handle of the current user for auto completion
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-17 13:49:18 +01:00
3784fa2074
comments should compile mentions also if done by author
...
it is used by clients for formatting reasons, there is no reason not format
the author if her handle is included in the comment body.
It is unrelated to sending out notifications.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-17 13:48:43 +01:00
24c58d39f4
Merge pull request #7909 from nextcloud/fix-migration-type-hints
...
Fix the type hints of migrations and correctly inject the wrapped sch…
2018-01-17 13:47:58 +01:00
f8756d96bc
Merge pull request #7847 from nextcloud/avatarmanager_strict
...
Fixes for avatarmanager
2018-01-17 13:46:18 +01:00
4a5282ba21
Fix the type hints of migrations and correctly inject the wrapped schema into migrations
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-17 11:37:36 +01:00
4ef302c0be
Request->getHeader() should always return a string
...
PHPDoc (of the public API) says that this method returns string but it also returns null, which is not allowed in some method calls. This fixes that behaviour and returns an empty string and fixes all code paths that explicitly checked for null to be still compliant.
Found while enabling the strict_typing for lib/private for the PHP7+ migration.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-17 09:51:31 +01:00
cb0dbfa987
Merge pull request #7900 from nextcloud/strict_security
...
Make OCP\Security stricter
2018-01-17 09:29:32 +01:00
d1420ef481
Merge pull request #7901 from nextcloud/strict_cache_factory
...
Made the cache factory strict
2018-01-17 06:51:04 +01:00
0b464e5274
Merge pull request #7884 from nextcloud/cleanup-oc_user
...
Cleanup OC_User and OCP\User
2018-01-17 05:33:07 +01:00
0e0db37658
Make OCP\Security stricter
...
* Add typehints
* Add return types
* Opcode opts from phpstorm
* Made strict
* Fixed tests: No need to test bogus values anymore strict typing fixes
this
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 22:01:19 +01:00
c5fcfb0709
Made the cache factory strict
...
* Return types
* Typehints
* made strict
* fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-16 21:58:20 +01:00
55532f19d9
Cleanup OC_User and OCP\User
...
* mainly removes deprecated methods and old static code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-16 18:39:11 +01:00
326d55db81
Support arbitrary number of arguments for d:or and d:and in search queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-16 13:22:28 +01:00
7bc9a69c3f
Remove deprecated core API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-15 17:54:50 +01:00
419de27b6d
Merge pull request #7840 from nextcloud/dep_config
...
Remove deprecated \OCP\Config
2018-01-14 22:21:37 +01:00
48ea7251d7
Use \OC\User\Manager internally in the avatarmanager
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:32:54 +01:00
cf0a339997
Make OC\Security\RateLimiting strict
...
* Add return types
* Add scalar argument types
* Made strict
* Cleaned up phpstorm inspections
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 21:08:23 +01:00
8a41d05761
Remove deprecated \OCP\Config
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-13 14:25:04 +01:00
42b3aa3a0a
reuse query builder
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-01-12 13:57:55 +01:00
5b21650097
Don't lie about the preview mimetype
...
For legacy reasons we stored all the previews with a png extention.
However we did not put png data in them all the time.
This caused the preview endpoints to always report that a preview is a
png file. Which was a lie.
Since we abstract away from the storage etc in the previewmanager. There
is no need anymore to store them as .png files and instead we can use
the actual file extention.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-07 11:41:54 +01:00
e9eccf34f9
removes invalid tests, adapts another one
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 21:44:30 +01:00
4f3d52a364
never translate login names when requiring with a user id
...
where appropriate, the preLoginNameUsedAsUserName hook should be thrown.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:25:00 +01:00
2fde21e318
extend tests for status quo
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:24:56 +01:00
57050146f6
Move passwordconfirmation to its own midleware
...
Add tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 21:58:14 +01:00
1bcbeb24bc
disable password confirmation with SSO
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-01-02 20:30:37 +01:00
c0c4443ffc
Fixed tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
b71c9205ef
Correctly remove temp test directory tree
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
02bfc867ef
Added tests for various installations types
...
- With root installation
- Core css
- App inside server root
- Secondary apps directory outside server root
- With an installation in a sub directory
- Core css
- App inside server root
- Secondary apps directory outside server root
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:45 +01:00
89ca9cb35c
Fixed webroot for scss files
...
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-30 05:55:44 +01:00
aad01894e3
refactor user searching
...
add additional user searching tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-20 15:51:37 +01:00
0ff3c81fc1
Fix failing AvatarTest
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-19 18:49:27 +01:00
e550a3ddd8
Merge pull request #7562 from nextcloud/fix-wrongly-cached-result
...
Cache final result of update check
2017-12-19 10:12:33 +01:00
1beffa058a
Cache final result of update check
...
If the parsed data is not a valid response we should not cache it and only cache the preprocessed result set.
Fixes #7442
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 21:48:58 +01:00
094d41937a
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-18 21:06:52 +01:00
ec28c54dbc
Adds search by email function on the users screen.
...
Fixes #7175 .
- Updated the query to fetch the users in users > everyone tab.
- Updated the query to fetch the users in users > admin tab.
- Tested to ensure that the disabled users are also being fetched.
- Added test cases.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2017-12-16 17:18:05 +05:30
e8a4f83000
Fix and tests for MailPlugin
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-16 08:46:03 +01:00
b8778b0d85
Test fixes 2
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:32:53 +01:00
158f442f4f
Test fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-12-14 11:28:59 +01:00
54c227b6c4
Use cached app list
...
Followup to #7264
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-14 09:56:53 +01:00
f0202245ee
allow 'Nextcloud' in the user agent string of Android
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 12:16:01 +01:00
e8acf448eb
Merge pull request #6651 from nextcloud/remote-cloud-client
...
Add api clients for talking to remote clouds
2017-12-11 15:28:39 +01:00
7c39711798
Merge pull request #7427 from nextcloud/fix-white-color-in-emails
...
Fix email buttons for white theme
2017-12-11 15:16:28 +01:00
cce4c285db
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 14:33:54 +01:00
ed7beb929e
Merge pull request #6876 from nextcloud/always_img_avatar
...
Always generate avatar
2017-12-08 23:58:17 +01:00
5ce69e7c42
Add some more tests for ocs remote api
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
f1eb55fad7
refuse to use http if we know a remote has https
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-08 16:37:14 +01:00
8b734347b1
use formal version of German if default_language is set to 'de_DE'
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-30 17:29:08 +01:00
8e8fe6b8eb
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 14:23:15 +01:00
2a01c0f3f6
Fix current access list test and add one for $currentAccess === false
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:17:34 +01:00
3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending
...
Pass log level to log reporters
2017-11-27 17:49:46 +01:00
132764bff5
Pass log level to log reporters
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 16:46:47 +01:00
4a63727ed9
Merge pull request #7210 from nextcloud/pg10
...
add postgresql 10 compatibility to dbal
2017-11-27 16:40:58 +01:00
fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method
...
Remove unused mimetype detection method in OC_Image
2017-11-27 11:55:20 +01:00
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps
...
Cache fetched apps in update check
2017-11-27 11:48:59 +01:00
9ac878b6cb
Adjust tests for added lastCheck time
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 09:25:03 +01:00
dbb034f903
Remove unused mimetype detection method in OC_Image
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 07:46:32 +01:00
df61d43529
Make isUpdateAvailable non-static
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:01:02 +01:00
0e2f00ec59
Get the Installer via DI
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-25 12:00:57 +01:00
be4e921306
Use basename() instead of self implementation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 12:35:47 +01:00
da3004b8f5
add postgresql10 compatibility to dbal
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-22 17:57:17 +01:00
6bbda28881
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-17 20:41:58 +01:00
f32fbbca2e
Merge pull request #6840 from nextcloud/feature/5282/calendar_api
...
Calendar API for apps
2017-11-16 21:10:35 +01:00
a923e755e6
check if the user still exists before we try to cleanup the previews
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-14 20:26:18 +01:00
16549ae5fb
Merge pull request #7166 from nextcloud/enhancement/crash-report-context
...
Pass the exception context to the crash reporter
2017-11-14 15:07:33 +01:00
ad757805ca
Pass the exception context to the crash reporter
...
This should allow better reports as often the app id is passed
as context. While this is not used right now, I'd like to have this
for NC13 as adding it later will break the interface for existing apps
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 14:28:04 +01:00
ab0a3fbbbc
Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpath
...
{J,CS}SResourceLocator: account for symlinks in app path
2017-11-14 13:58:02 +01:00
4c5593998a
Add a mechanism to register crach reporters
...
This adds a crash reporter registry, which is meant for third party apps
to hook into the error logging/reporting chain. This way, external tools
like Sentry can be used to track and aggregate system crashes.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-11-14 12:20:05 +01:00
556b2a2b6f
implement CalendarManager
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-09 15:14:50 +01:00
a0aef6ab1b
Fix welcome text for better grammar in themed instances
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:27:38 +01:00
989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath
...
Allow getting the filepath when getting cached mounts by fileid
2017-11-09 00:04:25 +01:00
9c24b7be2d
tests: change helper scope
...
This seems to be the only way to have the same helpers used between
tests in a manner that works for both standalone phpunit and
autotest.sh.
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-08 12:44:54 -08:00
06ba1a8a02
JSResourceLocator: account for symlinks in app path
...
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
2017-11-07 14:54:21 -08:00
6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization
...
Enhance calendar invitation emails
2017-11-06 15:14:49 +01:00
e111da777a
Make L10N->l provide weekdayName
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:04 +01:00
e2805f02aa
Merge branch 'master' into autocomplete-gui
2017-11-01 15:37:29 +01:00
3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage
...
Improve mimetype detection for object storages
2017-11-01 11:04:15 +01:00
6ddda3d7d4
Merge pull request #6952 from nextcloud/correctly-search-for-results
...
Correctly search for existing collaboration results
2017-10-31 14:49:01 +01:00
6a51c1bc4f
Add foreign key support to OC
2017-10-30 18:57:19 +01:00
d5f1cef642
fix comment sorter
...
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 15:59:43 +01:00
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-27 14:35:34 +02:00
8660b9f0af
Unit tests for #6977
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-27 11:46:56 +02:00
405bbc1c61
Improve mimetype detection for object storages
...
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 16:31:59 +02:00
c733cdaa65
Use ::class in test mocks of encryption app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 13:56:56 +02:00
ab36980d20
Use ::class in test mocks of dav app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-26 10:16:12 +02:00
43b92b8e06
Add unit tests for SearchResult
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-25 11:21:05 +02:00
b88db3a389
Merge pull request #6921 from nextcloud/appmanager-securitymiddleware
...
Use proper DI for security middleware for app enabled check
2017-10-24 19:58:24 +02:00
43e498844e
Use ::class in test mocks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
ce0c45a4ea
Use proper DI for security middleware for app enabled check
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:36:28 +02:00
ca4278a4d7
Provide tests for future timestamp formatting
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 14:20:21 +02:00
fd6daf8d19
AutoCompletion backend
...
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:32 +02:00
1a99e0dab4
Merge pull request #6602 from nextcloud/s3-multipart-upload
...
Add multipart upload for s3
2017-10-11 16:10:58 +02:00
6292f665d7
Allow multiple settings and sections per app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-05 11:34:03 +02:00
2d62f97f1b
Merge pull request #6328 from nextcloud/split-sharees-api-logic
...
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
2017-10-04 15:43:44 +02:00
7525c387ce
dont run invalid path repair step when upgrading from 11.0.5.2 and later
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-10-03 16:27:26 +02:00
a3bdb318e9
Fix bigint handling on postgres
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-29 11:10:57 +02:00
3db3e65121
add tests for Lookup Plugin
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
a7a651f4a4
move splitUserRemote unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:25 +02:00
a28b1d91f9
split off former searchSharee unit test
...
also moves registering default plugins to Server for proper unit testing
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
3d1d03a511
split off getEmail tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
c92f7ee767
split off getRemote unit tests
...
adds two small fixes → they actually work \o/
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
b35760de27
split off getGroups unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:24 +02:00
dd9e191d37
split off getUsers unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-26 23:10:23 +02:00
292a704648
Merge pull request #6544 from nextcloud/fix/duplicate-session-token
...
Fix duplicate session token after remembered login
2017-09-25 17:39:02 +02:00
c257cd57d4
Handle SameSiteCookie check for index.php in AppFramework Middleware
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-24 21:07:16 +02:00
38568c362b
Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep
...
OC_OCS_Response is deprecated
2017-09-21 20:38:18 +02:00
eb00dbb593
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 18:30:20 +02:00
87e10f9e6a
OC_OCS_Response is deprecated
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-21 17:56:00 +02:00
385d6f098c
Add tests for multipart upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-09-21 14:47:34 +02:00
38bb6e1477
Fix duplicate session token after remembered login
...
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-09-20 21:39:31 +02:00
53057f2bd0
Merge pull request #5462 from nextcloud/add-frameancestor-support
...
Add CSP frame-ancestors support
2017-09-18 14:25:44 +02:00
705432ca6f
Add filter for `shareapi_allow_share_dialog_user_enumeration`
...
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.
Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-09-15 15:58:04 +02:00
ecf347bd1a
Add CSP frame-ancestors support
...
Didn't set the @since annotation yet.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-09-15 15:23:10 +02:00
fa402c74d2
Add tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:40 +02:00
473a1ecad1
Fix tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-09-15 14:31:39 +02:00
9163cf9241
Fix AppPassword 2FA auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-12 22:28:43 +02:00
8a79d0cc70
Merge pull request #6414 from nextcloud/share-notification-wrong-language
...
Use the language of the recipient for the share notification
2017-09-08 19:15:05 +02:00
8e46e6b827
Improve text: 'you have now' -> 'you now have'
...
Signed-off-by: Leon Klingele <leon@struktur.de>
2017-09-08 13:47:11 +02:00
7e625a8d22
Use the language of the recipient for the share notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-08 10:48:16 +02:00
5d4540f179
Merge pull request #6364 from nextcloud/fix_login_loop
...
Fix login with basic auth
2017-09-06 17:04:00 +02:00
15cd21d252
Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name
...
Set the meta data before everything
2017-09-05 16:08:57 +02:00
4e3c39c1d1
Fix tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-05 13:55:36 +02:00
b96485b6bd
Fix login with basic auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-09-05 12:24:41 +02:00
dea011243e
Fix unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-04 17:01:31 +02:00
4fd3240b5f
Merge pull request #6254 from nextcloud/async-bus-split
...
Allow configuring different command bus backends
2017-09-04 14:22:06 +02:00
1ebf91ec16
Add proper EOL
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-09-04 14:21:44 +02:00
84ea66dca8
Merge pull request #6296 from nextcloud/improve_2fa
...
Improve 2FA
2017-08-31 10:52:40 +02:00
84b7022118
Improve 2FA
...
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-29 20:27:36 +02:00
0b652648cc
Merge pull request #6177 from nextcloud/properly-add-slo-url
...
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
2017-08-26 18:50:52 +02:00
60ee450809
Merge pull request #5870 from nextcloud/generate-system-wide-key-pair
...
extend the identity proof manager to allow system wide key pairs
2017-08-24 18:36:35 +02:00
9731350ace
split async test bus for easier subclassing
2017-08-24 16:06:37 +02:00
9357cf735a
Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failed
...
Prevent SQL error message in case of error
2017-08-23 16:49:57 +02:00
2e4cd44556
Inject \OCP\IURLGenerator to make tests work
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-18 15:32:40 +02:00
a04feff9a7
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
...
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.
This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5nextcloud/user_saml#112 ,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.
Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-18 12:22:44 +02:00
ed8a98eaa1
Prevent SQL error message in case of error
...
`\OC\User\Database::createUser` can throw a PHP exception in case the UID is longer than
permitted in the database. This is against it's PHPDocs and we should cast this to `false`,
so that the regular error handling triggers in.
The easiest way to reproduce is on MySQL:
1. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel
2. Create user `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` in admin panel again
3. See SQL exception as error message
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-17 12:08:40 +02:00
1c38a83927
Always log cron execution
...
There was a setting to disable the last execution of cron. There is no known
problem with this write access and it was also questioned when this feature
was build in https://github.com/owncloud/core/pull/7689#issuecomment-38264707
Recently there was also a bug report about a non-visible last cron execution
(#6088 ) - let's better remove this.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-17 09:45:11 +02:00
a55e794bfd
Cleanup unused methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 14:29:26 +02:00
cf7c4a4439
Merge pull request #6123 from nextcloud/cleanup-shareItem
...
Cleanup usage of shareItem in internal code base
2017-08-15 13:57:00 +02:00
c5f14ac884
Merge pull request #6121 from nextcloud/cleanup-registerBackend
...
Use proper methods for registerBackend
2017-08-15 13:52:49 +02:00
8366dfa50b
Cleanup usage of shareItem in internal code base
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:57:18 +02:00
895b9c2309
Use proper methods for registerBackend
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:29:15 +02:00
3e13e94254
Use proper methods for checkPasswordProtectedShare
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 11:28:05 +02:00
f640b56bfa
Cleanup unused methods
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-15 10:09:47 +02:00
bae5be3dc1
add prefix to user and system keys to avoid name collisions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-10 14:27:35 +02:00
9524badccc
extend the identity proof manager to allow system wide key pairs
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-08-10 14:27:35 +02:00
1ea7f14f0a
Fix SessionTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:13:54 +02:00
26bf0ca9d4
Fix RepairMimeTypeTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:04:57 +02:00
db27bbf90d
Fix CacheTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:01:09 +02:00
8b0051eb40
Fix encryption test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 15:51:08 +02:00
ed3b391e47
Use symfony/translation for L10N plurals
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-07 19:53:36 +02:00
4633717f04
Move pre_shared and post_shared events to EventDispatcher
...
* Now listeners for those events get proper share objects.
* Legacy hooks still fired
* Updated tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-03 15:14:29 +02:00
2f8756754f
Fix last failures with oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-02 09:48:16 +02:00
Robin Appelman
Morris Jobke
Christoph Wurst
John Molakvoæ (skjnldsv)
Roeland Jago Douma
Björn Schießle
Joas Schilling
blizzz
Roeland Jago Douma
Julius Härtl
Abijeet
Tobia De Koninck
Lukas Reschke
Georg Ehrke
Kyle Fazzari
Piotr Mrowczynski
Thomas Citharel
Leon Klingele