From ba8fbb60dafee399389181b535ccc5060acd538c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 21 Jul 2011 11:15:13 +0200 Subject: [PATCH 1/2] removed the "same as friendika" note from the license line --- addon/impressum/impressum.php | 2 +- addon/piwik/piwik.php | 2 +- addon/statusnet/statusnet.php | 6 +++--- addon/twitter/twitter.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addon/impressum/impressum.php b/addon/impressum/impressum.php index b93d9eef64..b760c7e0d9 100644 --- a/addon/impressum/impressum.php +++ b/addon/impressum/impressum.php @@ -4,7 +4,7 @@ * Description: Plugin to add contact information to the about page (/friendika) * Version: 1.0 * Author: Tobias Diekershoff - * License: 3-clause BSD license (same as Friendika) + * License: 3-clause BSD license */ function impressum_install() { diff --git a/addon/piwik/piwik.php b/addon/piwik/piwik.php index 3cc136d299..8389416e98 100644 --- a/addon/piwik/piwik.php +++ b/addon/piwik/piwik.php @@ -12,7 +12,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License: 3-clause BSD license (same as Friendika) +* License: 3-clause BSD license * * Configuration: * Add the following two lines to your .htconfig.php file: diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index 63cdd28df6..062884b967 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -10,7 +10,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License:3-clause BSD license (same as Friendika) + * License:3-clause BSD license * * Configuration: * To activate the plugin itself add it to the $a->config['system']['addon'] @@ -155,8 +155,8 @@ function statusnet_settings_post ($a,$post) { goaway($a->get_baseurl().'/settings/addon'); } else { if (isset($_POST['statusnet-pin'])) { - // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen - logger('got a StatusNet security code'); + // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen + logger('got a StatusNet security code'); $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 7f2b2e1c79..26b324acaa 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -11,7 +11,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License:3-clause BSD license (same as Friendika) + * License:3-clause BSD license * * Configuration: * To use this plugin you need a OAuth Consumer key pair (key & secret) From a213a9babfaa8029e54d529803a47464f44dc5b0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 23 Jul 2011 07:41:20 +0200 Subject: [PATCH 2/2] dispy ACL into the fancybox --- view/theme/dispy/jot-header.tpl | 5 ++ view/theme/dispy/jot.tpl | 22 +++--- view/theme/dispy/style.css | 121 ++++++++++++++++++++++++++------ 3 files changed, 117 insertions(+), 31 deletions(-) diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index eb88f00c1f..5d4babb9d4 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -70,6 +70,11 @@ tinyMCE.init({