2249c77a06
Also remove failure notification if no update is available
...
* error happened and vanished the notification should also
vanish even if no update is available
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 10:59:58 +02:00
3668673d7b
Create a notification when the update server couldn't be reached for some days
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:58 +02:00
4ea79a5bbe
[tx-robot] updated from transifex
2017-03-25 01:07:45 +00:00
40228c0c2b
added quit option in commentstabview.js
...
added quit option in notif in app.js
added quit option in notif in file-upload.js
added quit option in notif in fileinfomodel.js
added quit option in notif in filelist.js
added quit option in notif in filelist.js
added quit option in notif in tagsplugin.js
added quit option in notif in statusmanager.js
added quit option in notif in external.js
added quit option in notif in versionstabview.js
added quit option in notif in notification.js
changes according to the latest review.
timeout removed since there is a button to close it
translation capability added
typo fixed
test files updated
small errors fixed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
d8e8d7b60e
[master] Fix branding
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 12:20:22 +01:00
8904fb1cf3
[tx-robot] updated from transifex
2017-03-10 01:08:01 +00:00
98c56f9adb
[tx-robot] updated from transifex
2017-03-08 01:07:47 +00:00
53195b156c
[tx-robot] updated from transifex
2017-03-02 16:48:52 +00:00
aecec74a04
[tx-robot] updated from transifex
2017-03-01 01:07:42 +00:00
d754227b4c
[tx-robot] updated from transifex
2017-02-21 01:08:46 +00:00
41276f720b
[tx-robot] updated from transifex
2017-02-15 01:07:29 +00:00
7113af3f91
[tx-robot] updated from transifex
2017-02-14 01:07:20 +00: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
1952560ac7
[tx-robot] updated from transifex
2017-02-01 01:06:57 +00:00
b614547ff8
[tx-robot] updated from transifex
2017-01-28 01:06:59 +00:00
a5aeddc810
[tx-robot] updated from transifex
2017-01-27 01:07:18 +00:00
09a46b7bd6
[tx-robot] updated from transifex
2017-01-12 01:07:43 +00:00
b29149402c
Fix update notification tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:09:47 +01:00
315645ada3
Only add the link when the user can follow it.
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:24:09 +01:00
acbf0d151f
Set the link of the notification on render instead of creation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:59 +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
2e0cf21f7f
[tx-robot] updated from transifex
2017-01-04 12:09:43 +00: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
b399ad2fee
[tx-robot] updated from transifex
2016-12-28 01:07:41 +00:00
3fc4e1b5b9
[tx-robot] updated from transifex
2016-12-26 01:09:23 +00:00
d498d0982e
Hide update notification if notification center is enabled
...
* then the notification center already contains this info
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-21 15:44:06 +01:00
f50252c7c1
[tx-robot] updated from transifex
2016-12-20 12:02:31 +00:00
edec1fafe7
Update app versions and requirements
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
0c6c85bafb
[tx-robot] updated from transifex
2016-12-12 01:07:18 +00:00
7cb99e74db
[tx-robot] updated from transifex
2016-12-10 01:07:15 +00:00
74d1b0bada
[tx-robot] updated from transifex
2016-12-08 01:07:26 +00:00
2a647f4d3a
[tx-robot] updated from transifex
2016-12-06 01:07:19 +00:00
dda39728e3
[tx-robot] updated from transifex
2016-12-05 01:07:41 +00:00
3bea7ac6ac
[tx-robot] updated from transifex
2016-12-04 01:07:30 +00:00
5ba13dd0e4
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-02 09:37:08 +01:00
1aefbed55f
Highlight the app name in the notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 15:36:22 +01:00
917cac5436
Use the settings icon for the update notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 15:36:22 +01: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
97af4f762d
[tx-robot] updated from transifex
2016-11-20 01:06:44 +00:00
7100a1b347
Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard
...
Adds copy tooltip to clipboards
2016-11-16 17:57:35 +01:00
b7e6e9f83c
Fix tooltips - they now properly change on click
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 15:43:26 +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
d969fc4ac6
[tx-robot] updated from transifex
2016-11-11 01:07:18 +00:00
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
20f45e6fe4
[tx-robot] updated from transifex
2016-11-01 01:06:57 +00:00
8acb54aa0b
Add update support
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:47 +01:00
ad597d498d
[tx-robot] updated from transifex
2016-10-28 00:07:11 +00:00
103bf6dd28
Switch to public API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-21 09:09:26 +02:00
943d9737e4
[tx-robot] updated from transifex
2016-10-18 00:06:51 +00:00
92c24a91fa
[tx-robot] updated from transifex
2016-10-14 00:07:00 +00:00
5158328190
remove unneeded variable & proper element creation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-10 14:06:43 +02:00
0beecbf2c5
[tx-robot] updated from transifex
2016-10-08 00:06:50 +00:00
838e258b44
[tx-robot] updated from transifex
2016-10-07 00:07:04 +00:00
66ae43880b
[tx-robot] updated from transifex
2016-10-05 00:06:57 +00:00
db57190e33
Use new URL schema
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-04 12:49:55 +02:00
b74c12c3f5
Use the readable version for notifications
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-04 12:49:27 +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
4b873b35b7
[tx-robot] updated from transifex
2016-09-29 00:07:08 +00:00
0f321fe116
Merge pull request #1534 from nextcloud/svg-optimization
...
Svgo optimization
2016-09-28 23:05:48 +02:00
1602e82363
UpdateState is empty if no update is available
...
This leads to log messages such as "Undefined index: updaterEnabled at /media/psf/nextcloud/apps/updatenotification/lib/Controller/AdminController.php#116".
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-09-28 12:37:08 +02:00
e2670e62eb
[tx-robot] updated from transifex
2016-09-28 00:10:20 +00:00
71830b285c
Svgo optimization
...
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
3e00554d35
Respect updater kill switch and fall back to download button
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-09-27 14:47:59 +02:00
810f72df46
[tx-robot] updated from transifex
2016-09-27 00:09:46 +00:00
a43c680d9f
Merge pull request #1499 from nextcloud/updater
...
Add repair step and revert "Open updater" button
2016-09-26 22:28:21 +02:00
4064010c29
Revert "Fix tests"
...
This reverts commit 27a3c68d84
2016-09-26 13:44:50 +02:00
a086011e00
[tx-robot] updated from transifex
2016-09-25 00:09:40 +00:00
3f740966dc
Revert "Show an update button instead of the updater"
...
This reverts commit 202ae42506
2016-09-23 13:11:08 +02:00
b30c79b63c
[tx-robot] updated from transifex
2016-09-23 00:09:45 +00:00
d24e78d1ff
[tx-robot] updated from transifex
2016-09-21 00:09:40 +00:00
bcc4b5cd0a
[tx-robot] updated from transifex
2016-09-18 00:09:26 +00:00
4fdee00c27
[tx-robot] updated from transifex
2016-09-15 00:12:37 +00:00
7ffadc7e26
[tx-robot] updated from transifex
2016-09-14 00:10:31 +00:00
feb85981cd
[tx-robot] updated from transifex
2016-09-13 00:11:21 +00:00
60c22dd074
Fix more sniffing
2016-09-12 16:48:11 +02:00
cf57055960
[tx-robot] updated from transifex
2016-09-12 00:09:35 +00:00
96d176d1e8
[tx-robot] updated from transifex
2016-09-11 00:09:14 +00:00
341d4f0c01
[tx-robot] updated from transifex
2016-09-10 00:09:19 +00:00
f5aafdc897
[tx-robot] updated from transifex
2016-09-09 00:09:31 +00:00
27a3c68d84
Fix tests
2016-09-08 11:13:36 +02:00
202ae42506
Show an update button instead of the updater
2016-09-08 10:59:14 +02:00
b992bf2142
[tx-robot] updated from transifex
2016-09-08 00:10:21 +00:00
5bf17607b3
Fix layout of success message and text
2016-09-07 16:51:25 +02:00
1110ef52ed
[tx-robot] updated from transifex
2016-09-07 00:09:25 +00:00
5d48809609
[tx-robot] updated from transifex
2016-09-06 00:09:18 +00:00
4a5cd74fb2
[tx-robot] updated from transifex
2016-09-01 00:09:24 +00:00
56a9997435
use simple bell as update notification icon
2016-08-19 13:59:33 +02:00
39c180117e
[tx-robot] updated from transifex
2016-08-17 13:30:52 +00:00
0cc8b8b244
[tx-robot] updated from transifex
2016-08-17 00:09:19 +00:00
717e22267a
Merge branch 'master' into implement_712
2016-08-16 18:31:59 +02:00
d14c6ef78c
Merge pull request #860 from nextcloud/fix_updatenotifcations_warnings
...
Fix deprecated getMock warning
2016-08-16 14:50:31 +02:00
6c6338b810
Merge branch 'master' into implement_712
2016-08-15 21:55:09 +02:00
7ffb7b0d84
Use MockBuilder instead of createMock
...
CI uses an older PHPUnit
2016-08-15 16:43:22 +02:00
8a7a0f3287
Add unit tests
2016-08-15 16:25:34 +02:00
f3124b5052
[tx-robot] updated from transifex
2016-08-15 00:12:16 +00:00
3b948f7694
Fix deprecated getMock warning
2016-08-14 15:45:45 +02:00
a133e7970d
make updatenotification settings appear as if it is part of the version part in server settings
2016-08-13 00:29:39 +02:00
35358bdde0
[tx-robot] updated from transifex
2016-08-12 00:10:18 +00:00
8261ccce1b
Merge branch 'master' into implement_712
2016-08-11 19:37:17 +02:00
e8ea67139b
superfluous
2016-08-11 16:42:37 +02:00
14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope
2016-08-11 14:48:21 +02:00
1eb8b951c2
more admin page splitup improvements
...
* bump version to ensure tables are created
* make updatenotification app use settings api
* change IAdmin::render() to getForm() and change return type from Template to TemplateResponse
* adjust User_LDAP accordingly, as well as built-in forms
* add IDateTimeFormatter to AppFramework/DependencyInjection/DIContainer.php. This is important so that \OC::$server->query() is able to resolve the
constructor parameters. We should ensure that all OCP/* stuff that is available from \OC::$server is available here. Kudos to @LukasReschke
* make sure apps that have settings info in their info.xml are loaded before triggering adding the settings setup method
2016-08-10 15:21:25 +02:00
d6bee61131
[tx-robot] updated from transifex
2016-08-10 00:09:59 +00:00
dae6432ae7
Increment the versions and adjust the capitilization
2016-08-08 16:45:40 +02:00
c44c9a55f4
[tx-robot] updated from transifex
2016-08-05 00:10:09 +00:00
2565a39361
[tx-robot] updated from transifex
2016-07-30 00:11:16 +00:00
937577f7bc
[tx-robot] updated from transifex
2016-07-29 00:09:49 +00:00
95a0714973
[tx-robot] updated from transifex
2016-07-27 00:09:48 +00:00
7400ff05ac
Also increase the min version
2016-07-22 14:46:52 +02:00
6062b6365b
bumb compatible app versions for core apps
2016-07-22 13:04:23 +02:00
03cb588ea9
Merge pull request #500 from nextcloud/bump_version
...
Bump version
2016-07-22 10:03:42 +02:00
813f0a0f40
Fix apps/
2016-07-21 18:13:57 +02:00
86129a8b88
Increase app versions
2016-07-21 15:50:30 +02:00
b7c5a59adf
[tx-robot] updated from transifex
2016-07-21 00:09:07 +00:00
b23d3c6418
[tx-robot] updated from transifex
2016-07-18 14:08:51 +00:00
d6907fe84d
[tx-robot] updated from transifex
2016-07-16 00:09:18 +00:00
c108d816ac
[tx-robot] updated from transifex
2016-07-09 00:09:16 +00:00
a84250e0af
[tx-robot] updated from transifex
2016-07-08 00:09:25 +00:00
4a0efa38c0
[tx-robot] updated from transifex
2016-07-07 08:58:00 +00:00
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
cf7afabf62
Added escaping html code when building link to documentation.
2016-07-05 06:59:11 +02:00
52336b2038
Changed the creation of the update notification link to generate the js object from concated string.
2016-07-04 22:57:10 +02:00
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
409672d981
Fix update notification text
...
* thanks to ungesundes_halbwissen @ transifex
2016-06-29 16:05:51 +02:00
2b0f053126
[tx-robot] updated from transifex
2016-06-29 05:52:18 -04:00
894b7d93f6
[tx-robot] updated from transifex
2016-06-28 01:57:10 -04:00
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
3d65979f0a
[tx-robot] updated from transifex
2016-06-25 01:56:48 -04:00
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
19b531fd14
fix more strings
2016-06-20 13:14:24 +02:00
bd13353c4d
[tx-robot] updated from transifex
2016-06-20 01:54:50 -04:00
d65c56d7de
[tx-robot] updated from transifex
2016-06-18 01:58:51 -04:00
cc532bb14a
[tx-robot] updated from transifex
2016-06-17 02:00:01 -04:00
be4a29d75f
[tx-robot] updated from transifex
2016-06-15 05:54:49 +00:00
3840466f9a
[tx-robot] updated from transifex
2016-06-13 12:21:11 +00:00
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
355f50bd6c
[tx-robot] updated from transifex
2016-06-09 06:16:41 +00:00
4234892a60
[tx-robot] updated from transifex
2016-06-04 02:01:18 -04:00
f9f8fb7bf2
[tx-robot] updated from transifex
2016-06-02 01:55:16 -04:00
a9f666f36e
[tx-robot] updated from transifex
2016-06-01 01:56:03 -04:00
b2e524b936
[tx-robot] updated from transifex
2016-05-31 01:54:58 -04:00
985063a7e2
[tx-robot] updated from transifex
2016-05-30 01:57:01 -04:00
c870e77546
[tx-robot] updated from transifex
2016-05-29 01:55:25 -04:00
c778fa062c
[tx-robot] updated from transifex
2016-05-28 01:55:21 -04:00
a95275d27b
[tx-robot] updated from transifex
2016-05-27 01:55:35 -04:00
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
338106124f
Fix failing update notifications tests
2016-05-25 12:11:51 +02:00
a1e872aad6
Add a URL to the notifications
2016-05-24 11:26:54 +02:00
12ec0dfe3c
The setting only affects available core updates
2016-05-24 11:26:54 +02:00
823e4911c9
Add tests for the Notifier
2016-05-24 11:26:53 +02:00
96691138df
Add tests for the background job
2016-05-24 11:26:53 +02:00
c34788918d
Make the group selectable
2016-05-24 11:26:52 +02:00
d2553a4f6e
Dismiss the notifications when the update is already installed
2016-05-24 11:26:52 +02:00
752ec68e18
Add a notifier that parses the notifications
2016-05-24 11:26:52 +02:00
aac990eddf
Add a background job that generates notifications when an update is available
2016-05-24 11:26:51 +02:00
67162e636e
[tx-robot] updated from transifex
2016-05-20 01:54:52 -04:00
7c28f62e20
[tx-robot] updated from transifex
2016-05-15 01:55:34 -04:00
1fb7be42e5
[tx-robot] updated from transifex
2016-05-10 03:30:51 -04:00
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
9ad4a89816
Move comments, systemtags and updatenotifications to PSR-4
2016-05-03 10:20:59 +02:00
023c8b0eac
[tx-robot] updated from transifex
2016-04-30 01:55:54 -04:00
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
1626850fc9
Remove deprecated HTTPHelper
2016-04-18 17:28:10 +02:00
5c3183cedd
Move version check code out of class Updater
2016-04-18 17:12:59 +02:00
82da373ee7
[tx-robot] updated from transifex
2016-03-31 01:55:24 -04:00
dd5bbc31f2
[tx-robot] updated from transifex
2016-03-29 01:55:16 -04:00
a092fe3bf8
[tx-robot] updated from transifex
2016-03-28 01:55:08 -04:00
4b3af9dfe7
[tx-robot] updated from transifex
2016-03-24 01:57:28 -04:00
e6fb139eb9
[tx-robot] updated from transifex
2016-03-23 01:57:22 -04:00
aa5bb56010
[tx-robot] updated from transifex
2016-03-22 01:55:40 -04:00
35bc315f59
[tx-robot] updated from transifex
2016-03-21 01:55:40 -04:00
ace1812026
[tx-robot] updated from transifex
2016-03-17 01:56:06 -04:00
2c6617da60
[tx-robot] updated from transifex
2016-03-15 01:55:47 -04:00
e0998c27ff
[tx-robot] updated from transifex
2016-03-14 01:56:12 -04:00
5862a067d9
[tx-robot] updated from transifex
2016-03-12 01:55:36 -05:00
1ed831564e
[tx-robot] updated from transifex
2016-03-11 01:55:49 -05:00
41aae971a9
Merge pull request #23050 from owncloud/href-target-blank
...
make sure links open in new tabs
2016-03-10 10:54:53 +01:00
96d70aa270
[tx-robot] updated from transifex
2016-03-10 01:55:35 -05:00
ecbe4aea31
make sure links open in new tabs
2016-03-09 18:49:46 +01:00
afe3fdbf49
[tx-robot] updated from transifex
2016-03-09 01:55:42 -05:00
31c89bd3a2
Merge pull request #22885 from owncloud/master-show-version-to-update-to
...
Show version to update to properly
2016-03-08 09:41:52 +01:00
a8bafb9bf3
[tx-robot] updated from transifex
2016-03-08 01:55:39 -05:00
c07b731689
[tx-robot] updated from transifex
2016-03-07 01:56:53 -05:00
6f6d659f56
Merge pull request #22888 from owncloud/use-custom-header
...
Use custom header
2016-03-06 19:53:35 +01:00
05d0d9e9e2
[tx-robot] updated from transifex
2016-03-06 01:55:08 -05:00
4301e30741
Use custom header
...
PHP in CGI mode eats the Authorization header => 💣
2016-03-05 23:04:49 +01:00
4caa9e18b0
Show version to update to properly
...
Properly shows the version that will be updated to.
2016-03-05 21:58:58 +01:00
a98f5c03dc
[tx-robot] updated from transifex
2016-03-05 01:56:08 -05:00
e3a0a69c73
Add release channel selection back
...
Allows to select the release channels again and also shows the last check date
2016-03-04 14:37:35 +01:00
8885cb1eb9
Increase all versions on master which is now 9.1
2016-03-02 08:53:42 +01:00
702c1a8962
[tx-robot] updated from transifex
2016-03-02 01:56:33 -05:00
a39332832c
[tx-robot] updated from transifex
2016-02-28 01:55:12 -05:00
32f4bea0ae
[tx-robot] updated from transifex
2016-02-25 01:58:06 -05:00
fe29feae9a
[tx-robot] updated from transifex
2016-02-17 01:56:11 -05:00
7942f3d7ec
[tx-robot] updated from transifex
2016-02-16 08:49:12 -05:00
3503eb69f2
Adding transifex to new core apps
2016-02-16 14:40:10 +01:00
ab5768f7dd
Only register admin page when update is available
...
Fixes https://github.com/owncloud/core/issues/22353
2016-02-12 18:45:42 +01:00
5680743c2b
Harden updater authentication
...
- Reset tokens after 2 hours as discussed at https://github.com/owncloud/updater/issues/220#issuecomment-182033453
- Used BCrypt for storing the password in the config.php. This makes it substantially harder in case of a leakage of the token to bruteforce it. In the future we can evaluate also an HMAC including the IP. That's a bit tricker though at the moment considering that we support reverse proxies. Didn't feel brave enough to touch that dragon now as well ;)
2016-02-10 16:31:11 +01:00
b9e3ed1468
Add SSO for updater application
...
Allows logging-in into the updater application by visiting the admin panel and pressing "Open updater".
2016-02-09 20:28:30 +01:00
abc675d87e
Move update notification code into app
...
Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small.
Furthermore also makes some more code unit-testable...
2016-02-09 18:05:51 +01:00
Morris Jobke
Joas Schilling
Nextcloud bot
noveens
Lukas Reschke
Roeland Jago Douma
Michael Grosser
skjnldsv
Arthur Schiwon
Roeland Jago Douma
Robin Appelman
Thomas Pulzer
Thomas Pulzer
Lukas Reschke
Jenkins for ownCloud
Joas Schilling
Thomas Müller
Jan-Christoph Borchardt