From 096ecba8836318b8c61ae70431ce7cff50c2cf8b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 20 Jul 2011 14:19:20 +0200 Subject: [PATCH 01/35] Use new ACL selector in photo edit --- view/photo_edit.tpl | 21 +++++++++++++++------ view/theme/duepuntozero/style.css | 1 + view/theme/loozah/style.css | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index ceb1ddca3..839e41ee7 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -19,13 +19,15 @@
- + + $permissions +
- -
@@ -35,3 +37,10 @@
+ + diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 6a909bc7d..e2b1a57dc 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1491,6 +1491,7 @@ input#dfrn-url { /** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper{ display:block!important; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 96702d320..c58bda5bb 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -1569,6 +1569,7 @@ padding: 5px 10px 0px; /** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper{ display:block!important; From ba8fbb60dafee399389181b535ccc5060acd538c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 21 Jul 2011 11:15:13 +0200 Subject: [PATCH 02/35] 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 b93d9eef6..b760c7e0d 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 3cc136d29..8389416e9 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 63cdd28df..062884b96 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 7f2b2e1c7..26b324aca 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 9290283040329875a73ee83fe3199501c5894d4b Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 21 Jul 2011 16:14:38 -0700 Subject: [PATCH 03/35] revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index a5ce5f5c3..74f46052b 100644 --- a/boot.php +++ b/boot.php @@ -1,6 +1,6 @@ Date: Thu, 21 Jul 2011 17:55:15 -0700 Subject: [PATCH 04/35] provide fake first arg to ajax updater --- include/main.js | 4 ++-- mod/network.php | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/main.js b/include/main.js index 288fd6f01..0e9c6ee75 100644 --- a/include/main.js +++ b/include/main.js @@ -149,8 +149,8 @@ prev = 'live-' + src; in_progress = true; - var udargs = ((netargs.length) ? '/' + netargs : ''); - var update_url = 'update_' + src + udargs + '?p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); + var udargs = ((netargs.length) ? '/?f=' + netargs : '?f='); + var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); $.get(update_url,function(data) { in_progress = false; diff --git a/mod/network.php b/mod/network.php index 28e540283..f05bf3e34 100644 --- a/mod/network.php +++ b/mod/network.php @@ -125,10 +125,10 @@ function network_content(&$a, $update = 0) { $o .= '
' . "\r\n"; $o .= "\r\n"; } @@ -208,7 +208,6 @@ function network_content(&$a, $update = 0) { $sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' "; - $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 From 77cea581b0c6ddfef59cfe69da4457628c18f022 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 21 Jul 2011 20:19:55 -0700 Subject: [PATCH 05/35] better fix for bug #107, last one was flawed --- include/main.js | 2 +- mod/community.php | 2 +- mod/network.php | 1 + mod/profile.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/main.js b/include/main.js index 0e9c6ee75..d17d923e4 100644 --- a/include/main.js +++ b/include/main.js @@ -149,7 +149,7 @@ prev = 'live-' + src; in_progress = true; - var udargs = ((netargs.length) ? '/?f=' + netargs : '?f='); + var udargs = ((netargs.length) ? '/' + netargs : ''); var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); $.get(update_url,function(data) { diff --git a/mod/community.php b/mod/community.php index 73feaabc6..cf43598b5 100644 --- a/mod/community.php +++ b/mod/community.php @@ -27,7 +27,7 @@ function community_content(&$a, $update = 0) { if(! $update) { $o .= ''; $o .= '
' . "\r\n"; - $o .= "\r\n"; + $o .= "\r\n"; } if(x($a->data,'search')) diff --git a/mod/network.php b/mod/network.php index f05bf3e34..000c9e2fe 100644 --- a/mod/network.php +++ b/mod/network.php @@ -126,6 +126,7 @@ function network_content(&$a, $update = 0) { $o .= '
' . "\r\n"; $o .= "\r\n"; + . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; \r\n"; } } From 6b806708d9b8973ce57fb13fcdfe116c1409b9a0 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 21 Jul 2011 20:21:41 -0700 Subject: [PATCH 06/35] typo --- mod/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/network.php b/mod/network.php index 000c9e2fe..7bdd3f3f1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -126,7 +126,7 @@ function network_content(&$a, $update = 0) { $o .= '
' . "\r\n"; $o .= " @@ -181,12 +184,17 @@ function initEditor(){ } } + function jotShare(id) { $('#like-rotator-' + id).show(); + $.get('share/' + id, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#like-rotator-' + id).hide(); - $(window).scrollTop(0); + initEditor(function(){ + tinyMCE.execCommand('mceInsertRawHTML',false,data); + $('#like-rotator-' + id).hide(); + $(window).scrollTop(0); + }); + }); } From a213a9babfaa8029e54d529803a47464f44dc5b0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 23 Jul 2011 07:41:20 +0200 Subject: [PATCH 08/35] 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 eb88f00c1..5d4babb9d 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -70,6 +70,11 @@ tinyMCE.init({ {{ endif }} -
+ -
+ -
+ -