diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-07-08 10:07:57 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-07-08 10:14:39 +0200 |
| commit | 54a1239680c353d908475ca912ea2005329a83fb (patch) | |
| tree | fd98bed50b40679b47dda68932a1c31a36276077 /settings | |
| parent | 16a3502cf1c234c9a066b6c78dd8695c3c9b2b95 (diff) | |
| download | nextcloud-server-54a1239680c353d908475ca912ea2005329a83fb.tar.gz nextcloud-server-54a1239680c353d908475ca912ea2005329a83fb.zip | |
Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
Conflicts:
lib/config.php
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/templates/personal.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/templates/personal.php b/settings/templates/personal.php index dbb8c232c22..06dfb03cc6d 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -102,7 +102,7 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <legend><strong><?php p($l->t('WebDAV'));?></strong></legend> <code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br /> - <em><?php p($l->t('Use this address to connect to your ownCloud in your file manager'));?></em> + <em><?php print_unescaped($l->t('Use this address to <a href="%s/server/5.0/user_manual/files/files.html" target="_blank">access your Files via WebDAV</a>', array($defaults->getDocBaseUrl())));?></em> </fieldset> <?php foreach($_['forms'] as $form) { |