From 03b5e3aa0c99ce6c290156ddccc9cba6744f245d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 7 Mar 2012 21:12:31 -0800 Subject: reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) --- mod/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/network.php b/mod/network.php index 8da1561a0..27c6e315b 100755 --- a/mod/network.php +++ b/mod/network.php @@ -470,7 +470,7 @@ function network_content(&$a, $update = 0) { if(count($r)) { foreach($r as $rr) - if(! array_key_exists($rr['item_id'],$parents_arr)) + if(! in_array($rr['item_id'],$parents_arr)) $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); -- cgit v1.2.3 From b7bfff12b9adc6fd4e5508719854dce37460e68c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 8 Mar 2012 16:25:14 +1100 Subject: Update README --- README | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README b/README index 152d481ea..d85d98aad 100644 --- a/README +++ b/README @@ -1,4 +1,11 @@ Friendica Social Communications Server ====================================== +http://friendica.com + Welcome to the free social web. + + +Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers. + +Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today. \ No newline at end of file -- cgit v1.2.3 From 1fcbc7aa5a0b560b99201320a64e4e7671665613 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 8 Mar 2012 14:49:07 +0100 Subject: add links to /profiles, add some icons to diabook/icons, fixes in css --- view/theme/diabook/icons/bluebug.png | Bin 0 -> 1032 bytes view/theme/diabook/icons/lupe.png | Bin 0 -> 697 bytes view/theme/diabook/nav.tpl | 8 ++++- view/theme/diabook/profile_vcard.tpl | 64 +++++++++++++++++++++++++++++++++++ view/theme/diabook/style.css | 35 ++++++++++++++++--- 5 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 view/theme/diabook/icons/bluebug.png create mode 100755 view/theme/diabook/icons/lupe.png create mode 100644 view/theme/diabook/profile_vcard.tpl diff --git a/view/theme/diabook/icons/bluebug.png b/view/theme/diabook/icons/bluebug.png new file mode 100644 index 000000000..3979e7d8e Binary files /dev/null and b/view/theme/diabook/icons/bluebug.png differ diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png new file mode 100755 index 000000000..f8b228347 Binary files /dev/null and b/view/theme/diabook/icons/lupe.png differ diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index dc339131d..c7c00e20c 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -119,7 +119,8 @@
  • $usermenu.1
    • {{ endfor }} - {{ if $nav.notifications }}
  • $nav.notifications.1
    • {{ endif }} + {{ if $nav.profiles }}
  • $nav.profiles.3
    • {{ endif }} + {{ if $nav.notifications }}
  • $nav.notifications.1
    • {{ endif }} {{ if $nav.messages }}
  • $nav.messages.1
    • {{ endif }} {{ if $nav.contacts }}
  • $nav.contacts.1
    • {{ endif }} @@ -141,6 +142,11 @@ +
    +
    $langselector
    +
    + +