diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
| commit | 4753cc3ebde9867ab4deb1979fb4231b0c847426 (patch) | |
| tree | c6944e947bc84c8716b57b7e2b06ef51efccb3db /apps/contacts/templates/part.importaddressbook.php | |
| parent | 6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 (diff) | |
| parent | f3b30e4658c4dde82b56b458c672fa5edcba5d6b (diff) | |
| download | nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.tar.gz nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.zip | |
Merge branch 'master' into multi_app_dir
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
Diffstat (limited to 'apps/contacts/templates/part.importaddressbook.php')
| -rw-r--r-- | apps/contacts/templates/part.importaddressbook.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php index 0e2956ddaf4..01f8dd77d0a 100644 --- a/apps/contacts/templates/part.importaddressbook.php +++ b/apps/contacts/templates/part.importaddressbook.php @@ -7,10 +7,6 @@ */ ?> <td id="importaddressbook_dialog" colspan="6"> -<?php -if(OCP\App::isEnabled('files_encryption')) { - echo '<strong>'.$l->t('Currently this import function doesn\'t work while encryption is enabled.<br />Please upload your VCF file with the file manager and click on it to import.').'</strong>'; -} else { ?> <table> <tr> <th><?php echo $l->t('Select address book to import to:') ?></th> @@ -33,7 +29,6 @@ if(OCP\App::isEnabled('files_encryption')) { <input id="close_button" style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this);" value="<?php echo $l->t("Cancel"); ?>"> <iframe name="import_upload_target" id='import_upload_target' src=""></iframe> -<?php } ?> </td> <script type="text/javascript"> $(document).ready(function(){ |