From d78201cf50f6530c60c6a0abcc0392b461c81ec7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:23:41 +0100 Subject: [PATCH 01/10] make sure all config done with the installer is represented in the emergency backup template as well --- htconfig.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htconfig.php b/htconfig.php index f98e9efc06..3dd2f34a71 100644 --- a/htconfig.php +++ b/htconfig.php @@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4"; $default_timezone = 'America/Los_Angeles'; +// Default system language + +$a->config['system']['language'] = 'en'; + // What is your site name? $a->config['sitename'] = "Friendica Social Network"; @@ -60,9 +64,16 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; +// Server-to-server private message encryption (RINO) is allowed by default. +// Encryption will only be provided if this setting is true and the +// PHP mcrypt extension is installed on both systems +// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated + +$a->config['system']['rino_encrypt'] = 2; + // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; +$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozerosmoothly'; // default system theme From bf7314e46ec7d1b698b01a64a3e1da26d5ef34bd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:24:51 +0100 Subject: [PATCH 02/10] Revert "make sure all config done with the installer is represented in the emergency backup template as well" This reverts commit d78201cf50f6530c60c6a0abcc0392b461c81ec7. --- htconfig.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/htconfig.php b/htconfig.php index 3dd2f34a71..f98e9efc06 100644 --- a/htconfig.php +++ b/htconfig.php @@ -26,10 +26,6 @@ $a->config['system']['db_charset'] = "utf8mb4"; $default_timezone = 'America/Los_Angeles'; -// Default system language - -$a->config['system']['language'] = 'en'; - // What is your site name? $a->config['sitename'] = "Friendica Social Network"; @@ -64,16 +60,9 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems -// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated - -$a->config['system']['rino_encrypt'] = 2; - // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozerosmoothly'; +$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; // default system theme From a9b3c6d9d7d114d6f257a5b1c3d2ac50177630cf Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:26:22 +0100 Subject: [PATCH 03/10] make sure all config done with the installer is represented in the emergency backup template as well --- htconfig.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/htconfig.php b/htconfig.php index f98e9efc06..222be83839 100644 --- a/htconfig.php +++ b/htconfig.php @@ -26,6 +26,10 @@ $a->config['system']['db_charset'] = "utf8mb4"; $default_timezone = 'America/Los_Angeles'; +// Default system language + +$a->config['system']['language'] = 'en'; + // What is your site name? $a->config['sitename'] = "Friendica Social Network"; @@ -60,9 +64,16 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; +// Server-to-server private message encryption (RINO) is allowed by default. +// Encryption will only be provided if this setting is true and the +// PHP mcrypt extension is installed on both systems +// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated + +$a->config['system']['rino_encrypt'] = 2; + // allowed themes (change this from admin panel after installation) -$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero'; +$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly'; // default system theme From 94694aae86d38a8a609dc99e3eb9dc6170a0c350 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:45:13 +0100 Subject: [PATCH 04/10] RInO is not true / false anymore --- htconfig.php | 6 +++--- view/templates/htconfig.tpl | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htconfig.php b/htconfig.php index 222be83839..41317c4608 100644 --- a/htconfig.php +++ b/htconfig.php @@ -65,9 +65,9 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems -// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated +// Encryption will only be provided if this setting is set to a non zero +// value and the PHP mcrypt extension is installed on both systems +// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt $a->config['system']['rino_encrypt'] = 2; diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 7c90ee0de4..78a2e47df2 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -80,8 +80,9 @@ $a->config['system']['maximagesize'] = 800000; $a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems +// Encryption will only be provided if this setting is set to a non zero +// value and the PHP mcrypt extension is installed on both systems +// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt $a->config['system']['rino_encrypt'] = {{$rino}}; From 275a1c6574fa67a30487323cab328ce921494f1f Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 2 Feb 2017 06:06:23 +0000 Subject: [PATCH 05/10] Preparation to add the social network "pnut" --- boot.php | 2 ++ include/contact_selectors.php | 1 + include/contact_widgets.php | 3 +++ 3 files changed, 6 insertions(+) diff --git a/boot.php b/boot.php index a58b41f429..993c15bca1 100644 --- a/boot.php +++ b/boot.php @@ -245,6 +245,7 @@ define ( 'NETWORK_STATUSNET', 'stac'); // Statusnet connector define ( 'NETWORK_APPNET', 'apdn'); // app.net define ( 'NETWORK_NEWS', 'nntp'); // Network News Transfer Protocol define ( 'NETWORK_ICALENDAR', 'ical'); // iCalendar +define ( 'NETWORK_PNUT', 'pnut'); // pnut.io define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder /** @}*/ @@ -274,6 +275,7 @@ $netgroup_ids = array( NETWORK_APPNET => (-17), NETWORK_NEWS => (-18), NETWORK_ICALENDAR => (-19), + NETWORK_PNUT => (-20), NETWORK_PHANTOM => (-127), ); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 6b827baf31..62d79d877a 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -89,6 +89,7 @@ function network_to_name($s, $profile = "") { NETWORK_TWITTER => t('Twitter'), NETWORK_DIASPORA2 => t('Diaspora Connector'), NETWORK_STATUSNET => t('GNU Social'), + NETWORK_PNUT => t('pnut'), NETWORK_APPNET => t('App.net') ); diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 1e35db2c78..d077a065e1 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -66,6 +66,9 @@ function unavailable_networks() { if (!get_config("system","diaspora_enabled")) $networks[] = NETWORK_DIASPORA; + if (!plugin_enabled("pnut")) + $networks[] = NETWORK_PNUT; + if (!sizeof($networks)) return ""; From 2483e7cda7dd3486bd4f16333391ad62f112ff18 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Fri, 3 Feb 2017 19:00:04 +0100 Subject: [PATCH 06/10] Make links visually different from normal text --- view/theme/vier/dark.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css index 99850f2826..e4c86fd317 100644 --- a/view/theme/vier/dark.css +++ b/view/theme/vier/dark.css @@ -8,6 +8,9 @@ hr { background-color: #343434 !important; } a, .wall-item-name, .fakelink { color: #989898 !important; } +.wall-item-content a { + font-weight: bold; + } .btn, .btn:hover{ color: #989898; border: 2px solid #0C1116; From a71f7aefbb8cf1677236db58019053a4303f3161 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Feb 2017 19:00:55 +0100 Subject: [PATCH 07/10] Bugfix: frio - the tabbar should be hidden if it is in the section element --- view/theme/frio/css/style.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 74eb25d08b..7f74ed55f6 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1719,6 +1719,12 @@ img.acpopup-img { } /* Menubar Tabs */ +section > ul.tabbar { +/* The tabbar shouldn't' be visibile inside +the section element. Only after we have +moved it to the nav through js */ + display: none !important; +} #tabmenu, .tabbar, .tabbar > li { From 39da1f1d03ea89170e22ee44d69237fde4155483 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Fri, 3 Feb 2017 19:07:39 +0100 Subject: [PATCH 08/10] Update dark.css --- view/theme/vier/dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css index e4c86fd317..4ee1fb15e8 100644 --- a/view/theme/vier/dark.css +++ b/view/theme/vier/dark.css @@ -10,7 +10,7 @@ a, .wall-item-name, .fakelink { } .wall-item-content a { font-weight: bold; - } +} .btn, .btn:hover{ color: #989898; border: 2px solid #0C1116; From c12850250d5794c648ffefa01df413281c62b8b6 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Feb 2017 19:18:10 +0100 Subject: [PATCH 09/10] Bugfix: frio - move tabs to the top of the contacts-template --- view/theme/frio/templates/contacts-template.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl index 9a5109e871..d51298038b 100644 --- a/view/theme/frio/templates/contacts-template.tpl +++ b/view/theme/frio/templates/contacts-template.tpl @@ -1,8 +1,8 @@ +{{$tabs}} +
- {{$tabs}} - {{* The page heading with it's contacts counter *}}

{{$header}} {{if $total}} ({{$total}}) {{/if}}

From 7f1acdb8e9204f6e899ebab60d7a401f9a09da04 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Feb 2017 19:37:47 +0100 Subject: [PATCH 10/10] frio - append tabbar to nav only if it's a direct child of section --- view/theme/frio/js/theme.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index 51e390b34c..c149271804 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -40,9 +40,7 @@ $(document).ready(function(){ $(".field.select > select, .field.custom > select").addClass("form-control"); // move the tabbar to the second nav bar - if( $("ul.tabbar").length ) { - $("ul.tabbar").appendTo("#topbar-second > .container > #tabmenu"); - } + $("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu"); // add mask css url to the logo-img container //