-ma·trix: something within or from which something else originates, develops, or takes form +

Let's imagine a new internet. One that allows you to publish, communicate and share freely; yet the things you publish are only visible to those you choose. Period. Let's also imagine that this internet doesn't force you to remember a unique password for every site you wish to be involved with. Your website and your friends' websites connect together and they all just know who you are - yet what else they know about you is under your control. +

+ + +

+ +

+ma·trix: something within or from which something else originates, develops, or takes form +

Imagine an internet slightly different than what we have today. The internet of the future won't require logging in with passwords on every site you wish to access. It will just know who you are. An internet where you need to keep track of hundreds/thousands of passwords on hundreds/thousands of websites is fundamentally broken. But an internet with no privacy and where all your online activities are monitored and tracked is likewise broken. -

Imagine if you had an internet where the people using it could create new services and communicate freely and privately - and where you didn't need a different account on every website in the network in order to use each website. Where you had your own space and could share anything you wanted with anybody you wanted, any time you wanted. Where the things you share in private stay private instead of being under constant surveillance from advertising corporations and government intelligence agencies.

+ + +

+ +

diff --git a/assets/wide.css b/assets/wide.css index 84dbc47a2..77b7370a3 100644 --- a/assets/wide.css +++ b/assets/wide.css @@ -2,7 +2,7 @@ body { font-family: 'Ubuntu',Tahoma,Helvetica,Arial,sans-serif; color: #111111; /*color: rgba(0,0,0,0.0); */ - text-align: center; + text-align: center; /* background-image: url("redmatrixbkgd.jpg"); */ /*background: #ececec;*/ padding:0 0 22px 0; @@ -15,8 +15,8 @@ body { */ } -#intro-text { -color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; +#intro-textl, #intro-textr { +text-align: left; color:#444444;font-size:1.3em; } div.section-text { color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;text-align:justify; @@ -61,11 +61,11 @@ color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;tex #tagline { color: #880000; - width:600px; +/* width:600px; margin-top:0px; margin-bottom:20px; margin-left: auto; - margin-right: auto; + margin-right: auto; */ } -- cgit v1.2.3 From a2fa1a162d9526987539479b22a328e5298954e8 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 2 Feb 2014 13:59:20 +0100 Subject: Other not so elegant way of detecting touch screen devices But at least it seems to work --- view/tpl/chat.tpl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index a0c18f8d6..5c96e79fe 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -91,8 +91,19 @@ function update_chats(chats) { - - - - - -

- -

-Imagine

- - -

-ma·trix: something within or from which something else originates, develops, or takes form +Dream it. Do it. -

- -

- - - -

- -

- - - - -

Decentralised

No centralised servers means no one can censor your content or disable the network.

Nomadic Identity

You own and control your identity, and it can move freely inside the matrix.

- -

Freedom

Use a trusted hub, or run your own server. Move where you want and take your data and connections with you. The choices are yours.

Access Control

Share what you want with whom you want. Permissions extend to the entire matrix.

Got Zot?

Privacy

Privacy and encryption to suit your needs.

- - -

- -

Decentralise. Build a more robust network.

-Now open your eyes. We've done some amazing things with decentralisation technology over the last few years and have created a different kind of network. We call it the Red Matrix. Forget the old internet - it's hopelessly broken and increasingly being choked off in order to take your money and spy on you. We're building tomorrow's internet today. And we're doing things a bit differently than what you may be used to. We could wait for this new internet to be built, but we don't really trust the typical corporations and governmental bodies to do it right. So we're building it on top of the old internet. And we're building privacy into its DNA. And it's here now. -

-The Red Matrix is a decentralised network where the people using it are in charge and the size of your server farm and wealth do not offer any comparable advantage. Anybody may participate on a level playing field. Cloud storage, file sharing, communications, content creation and management belong to everybody and can be shared with anybody (or somebody, or nobody). This is only a representative sample of the services we plan to offer. In an internet where creativity is allowed to flourish and corporate overlords have no power, the door is open to entirely new forms of expression and applications. The Red Matrix software is free and open source; created by volunteers and distributed under the MIT license. -

-And the Red Matrix has Got Zot. -

-So what the heck is Zot? I'm glad you asked... -

- -
-

- -

Your identity is your own. One identity across the network.

- -

-Zot is a revolutionary protocol which provides decentralised communications and identity management across the matrix. The resulting platform can provide web services comparable to those offered by large corporate providers, but without the large corporate provider and their associated privacy issues. Communications and social networking are an integral part of the matrix. Any channel (and any services provided by that channel) can make full use of feature-rich social communications on a global scale. -

-We use the full power of the matrix to offer friend suggestions and directory services. You can also perform other things which would typically only be possibly on a centralised provider - such as "wall to wall" posts and private/multiple profiles and web content which can be tailored to the viewer. You won't find these features at all on other decentralised communication services. The difference is that Zot also provides decentralised identity services. This is what separates the men from the boys, and what makes life in the matrix so awesome. -

- -

-Zot's identity layer is unique. It's like OpenID on steroids. It provides invisible single sign-on across all sites in the matrix; as well as nomadic identity so that your communications with friends, family, and business partners won't be affected by the loss of your primary communication node - either temporarily or permanently. The important bits of your identity and relationships can be backed up to a thumb drive and may appear at any node in the matrix at any time - with all your friends and preferences intact. These nomadic instances are kept in sync so any instance can take over if another one is compromised or damaged. This protects you against not only major system failure, but also temporary site overloads and governmental manipulation. You cannot be silenced. You cannot be removed from the matrix. -

-As you browse the matrix viewing channels and their unique content, you are seamlessly authenticated as you go, even across completely different server hubs. No password dialogues. Nothing to type. You're just greeted by name on every new site you visit. How does Zot do that? We call it "magic-auth" because it really is technology that is so advanced as to be indistinguishable from magic. You login only once on your home hub (or any nomadic backup hub you have chosen). This allows you to access any authenticated services provided anywhere in the matrix - such as shopping and access to private information. This is just like the services offered by large corporate providers with huge user databases; however you can be a member of this community and a server on this network using a "plug computer" like a Rasberry Pi. Your password isn't stored on a thousand different sites where it can be stolen and used to clean out your bank accounts. -

- -

You control your data. Red Matrix enforces your permissions.

- -

-Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create. -

-Example: you want a photo to be visible to your family and three select friends, but not your work colleagues. In the matrix this is easy. Even if your family members, work colleagues, and friends all have accounts on different hubs. -

-Currently the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control. -

-Again, this type of control is available on large corporate providers, because they own the user database. Within the matrix, there is no need for a huge user database on your machine - because the matrix is your user database and for all intents and purposes has infinite capacity and is spread amongst hundreds, and potentially millions of computers. Access can be granted or denied for any resource, to any channel or any group of channels; anywhere within the matrix. They do not need to have an account on your hub. -

- -

Reclaim your privacy. Red Matrix is built for you, not governments and corporations.

-Your communications may be public or private - and we allow your private communications to be as private as you wish them to be. Private communications comprise not only fully encrypted transport, but also encrypted storage to help protect against accidental snooping and disclosure by rogue system administrators and internet service providers. -

-Want more? You can fully encrypt your messages "end to end" using your choice of encryption ciphers and using a passphrase that only you and the recipient(s) know - in addition to our standard multi-layer encryption. -

-Want more? Our end to end encryption is pluggable. You can define your own chain of multiple encryption steps with multiple keys, and include algorithms known only to you and the recipient. At some point even the US National Security Agency will have to throw up their hands. There won't be enough computational power available in the universe to decode your private message. -

-We also provide optional message expiration as a standard feature. When the expiration date/time passes, your message is removed from the network. -

- - - -

- -
-
-

- - - -- cgit v1.2.3 From efa30f1b03540981a7718daa7c598157a727f30d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 5 Feb 2014 15:01:53 -0800 Subject: This would be about the 75th attempt to try and prevent duplicated email notifications for comments. Eventually we'll find something that works. --- include/items.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 860d714d1..35865086e 100755 --- a/include/items.php +++ b/include/items.php @@ -2107,6 +2107,15 @@ function send_status_notifications($post_id,$item) { } } + $link = get_app()->get_baseurl() . '/display/' . $item['mid']; + + $r = q("select id from notify where link = '%s' and uid = %d limit 1", + dbesc($link), + intval($item['uid']) + ); + if($r) + $notify = false; + if(! $notify) return; require_once('include/enotify.php'); @@ -2115,7 +2124,7 @@ function send_status_notifications($post_id,$item) { 'from_xchan' => $item['author_xchan'], 'to_xchan' => $r[0]['channel_hash'], 'item' => $item, - 'link' => get_app()->get_baseurl() . '/display/' . $item['mid'], + 'link' => $link, 'verb' => ACTIVITY_POST, 'otype' => 'item', 'parent' => $parent, -- cgit v1.2.3 From fdc0a7e95e1c0bd174bf09a4c3833ea29fd7211b Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 5 Feb 2014 15:56:18 -0800 Subject: fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self --- include/items.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index 35865086e..2f2bcb2e4 100755 --- a/include/items.php +++ b/include/items.php @@ -2183,12 +2183,18 @@ function tag_deliver($uid,$item_id) { if($terms && (! $i[0]['item_restrict'])) { logger('tag_deliver: found bookmark'); - if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && ($i[0]['author_xchan'] != $u[0]['channel_hash'])) { + $bookmark_self = intval(get_pconfig($uid,'system','bookmark_self')); + if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && (($i[0]['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) { require_once('include/bookmarks.php'); require_once('include/Contact.php'); - $s = channelx_by_hash($i[0]['author_xchan']); - foreach($terms as $t) { - bookmark_add($u[0],$s[0],$t,$i[0]['item_private']); + + $s = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); + if($s) { + foreach($terms as $t) { + bookmark_add($u[0],$s[0],$t,$i[0]['item_private']); + } } } } -- cgit v1.2.3 From da8a79ebfa948bc5f2f300404f661e71fdde788d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 5 Feb 2014 16:01:02 -0800 Subject: cleanup - nothing more --- include/items.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 2f2bcb2e4..8b9cc8d04 100755 --- a/include/items.php +++ b/include/items.php @@ -2181,10 +2181,10 @@ function tag_deliver($uid,$item_id) { $terms = get_terms_oftype($item['term'],TERM_BOOKMARK); - if($terms && (! $i[0]['item_restrict'])) { + if($terms && (! $item['item_restrict'])) { logger('tag_deliver: found bookmark'); $bookmark_self = intval(get_pconfig($uid,'system','bookmark_self')); - if(perm_is_allowed($u[0]['channel_id'],$i[0]['author_xchan'],'bookmark') && (($i[0]['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) { + if(perm_is_allowed($u[0]['channel_id'],$item['author_xchan'],'bookmark') && (($item['author_xchan'] != $u[0]['channel_hash']) || ($bookmark_self))) { require_once('include/bookmarks.php'); require_once('include/Contact.php'); @@ -2193,7 +2193,7 @@ function tag_deliver($uid,$item_id) { ); if($s) { foreach($terms as $t) { - bookmark_add($u[0],$s[0],$t,$i[0]['item_private']); + bookmark_add($u[0],$s[0],$t,$item['item_private']); } } } -- cgit v1.2.3 From 1b406be544a2e434b56eed26bab14ede63fe2104 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 5 Feb 2014 16:28:51 -0800 Subject: allow bookmarks to use richtext --- include/menu.php | 5 ++++- library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js | 2 +- .../tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/menu.php b/include/menu.php index 105e4216b..813d7bcdb 100644 --- a/include/menu.php +++ b/include/menu.php @@ -1,6 +1,7 @@ $menu['menu'], diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js index 81b69e736..80e10d833 100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js +++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js @@ -1 +1 @@ -(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/

(.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/ /gi,"[hr]");t(/ /gi,"\n");t(//gi,"\n");t(/ /gi,"\n");t(//gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi," ");t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');t(/\[url\](.*?)\[\/url\]/gi,'$1');t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'$1 ');t(/\[list=\](.*?)\[\/list\]/gi,'$1 ');t(/\[list=1\](.*?)\[\/list\]/gi,'$1 ');t(/\[list=i\](.*?)\[\/list\]/gi,'$1 ');t(/\[list=I\](.*?)\[\/list\]/gi,'$1 ');t(/\[list=a\](.*?)\[\/list\]/gi,'$1 ');t(/\[list=A\](.*?)\[\/list\]/gi,'$1 ');t(/\[li\](.*?)\[\/li\]/gi,"
$1

");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(e,t){var n=this,r=e.getParam("bbcode_dialect","dfrn").toLowerCase();e.onBeforeSetContent.add(function(e,t){t.content=n["_"+r+"_bbcode2html"](t.content)});e.onPostProcess.add(function(e,t){if(t.set)t.content=n["_"+r+"_bbcode2html"](t.content);if(t.get)t.content=n["_"+r+"_html2bbcode"](t.content)})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_dfrn_html2bbcode:function(e){function t(t,n){e=e.replace(t,n)}function n(e){var t,n,r=[],i=[];var s=/]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;while(t=s.exec(e)){var o=/]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;if(n=o.exec(t[1])){var u=/href=[\"']([^\"']*)[\"']/ig;var a=u.exec(n[1]);if(a[1]){r.push(t[0]);i.push("[EMBED]"+a[1]+"[/EMBED]")}}}for(var f=0;f=0){e=n(e)}t(/(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");t(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");t(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");t(/(.*?)<\/font>/gi,"$1");t(//gi,"[img=$1x$2]$3[/img]");t(//gi,"[img=$2x$1]$3[/img]");t(//gi,"[img=$3x$2]$1[/img]");t(//gi,"[img=$2x$3]$1[/img]");t(//gi,"[img]$1[/img]");t(/(.*?)<\/ul>/gi,"[list]$1[/list]");t(/(.*?)<\/ul>/gi,"[list=]$1[/list]");t(/(.*?)<\/ul>/gi,"[list=1]$1[/list]");t(/(.*?)<\/ul>/gi,"[list=i]$1[/list]");t(/(.*?)<\/ul>/gi,"[list=I]$1[/list]");t(/(.*?)<\/ul>/gi,"[list=a]$1[/list]");t(/(.*?)<\/ul>/gi,"[list=A]$1[/list]");t(/(.*?)<\/li>/gi,"[li]$1[/li]");t(/(.*?)<\/code>/gi,"[code]$1[/code]");t(/<\/(strong|b)>/gi,"[/b]");t(/<(strong|b)>/gi,"[b]");t(/<\/(em|i)>/gi,"[/i]");t(/<(em|i)>/gi,"[i]");t(/<\/u>/gi,"[/u]");t(/(.*?)<\/span>/gi,"[u]$1[/u]");t(//gi,"[u]");t(/]*>/gi,"[quote]");t(/<\/blockquote>/gi,"[/quote]");t(/
/gi,"[hr]");t(/
/gi,"\n");t(//gi,"\n");t(/
/gi,"\n");t(//gi,"");t(/<\/p>/gi,"\n");t(/ /gi," ");t(/"/gi,'"');t(/</gi,"<");t(/>/gi,">");t(/&/gi,"&");return e},_dfrn_bbcode2html:function(e){function t(t,n){var r=new Array;var i=e.split("[code]");var o=0;var u="";u=i.shift();u=u.replace(t,n);r.push(u);for(o=0;o");t(/\[b\]/gi,"");t(/\[\/b\]/gi,"");t(/\[i\]/gi,"");t(/\[\/i\]/gi,"");t(/\[u\]/gi,"");t(/\[\/u\]/gi,"");t(/\[hr\]/gi,"
");t(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');t(/\[url\](.*?)\[\/url\]/gi,'$1');t(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,'');t(/\[img\](.*?)\[\/img\]/gi,'');t(/\[list\](.*?)\[\/list\]/gi,'$1
');t(/\[list=\](.*?)\[\/list\]/gi,'$1
');t(/\[list=1\](.*?)\[\/list\]/gi,'$1
');t(/\[list=i\](.*?)\[\/list\]/gi,'$1
');t(/\[list=I\](.*?)\[\/list\]/gi,'$1
');t(/\[list=a\](.*?)\[\/list\]/gi,'$1
');t(/\[list=A\](.*?)\[\/list\]/gi,'$1
');t(/\[li\](.*?)\[\/li\]/gi,"
$1
");t(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');t(/\[size=(.*?)\](.*?)\[\/size\]/gi,'$2');t(/\[code\](.*?)\[\/code\]/gi,"$1");t(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1");e=e.replace(/\[embed\](.*?)\[\/embed\]/gi,n);return e}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})()
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 387ccdd59..4606845b4 100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -75,7 +75,7 @@
 			
 			// example:  to [b]
 
-			rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			rep(/(.*?)<\/a>/gi,"#^[url=$1]$2[/url]");
 			rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");
 			rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");
 			rep(/(.*?)<\/font>/gi,"$1");
-- 
cgit v1.2.3


From cb6716a644dad4c7c196330cf945de36a000e5a3 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 18:51:50 -0800
Subject: fix the xchan lookup tool

---
 mod/xchan.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod/xchan.php b/mod/xchan.php
index 984a62f95..9d4cdcc22 100644
--- a/mod/xchan.php
+++ b/mod/xchan.php
@@ -14,9 +14,11 @@ function xchan_content(&$a) {
 
 	if(x($_GET,'addr')) {
 		$addr = trim($_GET['addr']);
+
 		$r = q("select xchan_name from xchan where xchan_hash like '%s%%'",
-			dbesc(addr)
+			dbesc($addr)
 		);
+
 		if($r) {
 			foreach($r as $rr)
 				$o .= $rr['xchan_name'] . EOL;
-- 
cgit v1.2.3


From 05a70a8760d705e80c548d96a9d083ab032dbd8b Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 19:16:12 -0800
Subject: add chatroom links

---
 include/conversation.php | 14 ++++++++++++++
 mod/chat.php             | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/include/conversation.php b/include/conversation.php
index 633435871..77c7bac70 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1488,6 +1488,19 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 			'id'    => 'files-tab',
 		);
 	}
+
+	require_once('include/chat.php');
+	$chats = chatroom_list($a->profile['profile_uid']);
+
+	$tabs[] = array(
+		'label' => t('Chatrooms') . '(' . count($chats) . ')',
+		'url'	=> $a->get_baseurl() . '/chat/' . $nickname,
+		'sel' 	=> ((argv(0) == 'chat') ? 'active' : ''),
+		'title' => t('Chatrooms'),
+		'id'    => 'chat-tab',
+	);
+
+
 	if($is_owner) {
 		$tabs[] = array(
 			'label' => t('Events'),
@@ -1506,6 +1519,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		);
 	}
 
+
 	if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) {
 		$tabs[] = array(
 			'label' => t('Webpages'),
diff --git a/mod/chat.php b/mod/chat.php
index e79973aef..e3725830c 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -155,6 +155,15 @@ function chat_content(&$a) {
 
 	require_once('include/widgets.php');
 
-	return widget_chatroom_list(array());
+	$o = replace_macros(get_markup_template('chatrooms.tpl'), array(
+		'$header' => sprintf( t('%1$s\'s Chatrooms'), $a->profile['name']),
+		'$baseurl' => z_root(),
+		'$nickname' => $channel['channel_address'],
+		'$rooms' => widget_chatroom_list(array()),
+		'$newroom' => t('New Chatroom'),
+		'$is_owner' => ((local_user() && local_user() == $a->profile['profile_uid']) ? 1 : 0)
+	));
+ 
+	return $o;
 
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 61f3ffc635acbc53a825152f9bb1bb2ab262dde5 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 19:16:41 -0800
Subject: add chatrooms template

---
 view/tpl/chatrooms.tpl | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 view/tpl/chatrooms.tpl

diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
new file mode 100644
index 000000000..c3dae6627
--- /dev/null
+++ b/view/tpl/chatrooms.tpl
@@ -0,0 +1,10 @@
+{{$header}}
+
+{{if $is_owner}}
+
+{{$newroom}}
+
+{{/if}}
+
+{{$rooms}}
+
-- 
cgit v1.2.3


From 5c5a14c4df217ce18264fdc78568c72cbe514eb8 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 20:43:43 -0800
Subject: this is basic but perhaps that's what we really need.

---
 assets/home.html | 77 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 15 deletions(-)

diff --git a/assets/home.html b/assets/home.html
index c7f9c852c..30cde3cb4 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -1,25 +1,72 @@
-
-
-
+.tab {
+  float: left;
+  width: 25px;
+}
+.td {
+  float: left;
+  width: 200px;
+  font-size: 1.8em;
+  margin-bottom: 5px;
+  margin-right: 25px;
+	color: #808080;
+
+}
+
 
-
+
 
 
 
 
-

-Dream it. Do it.
+Dream it. Do it.
+
 
+
+Communications
+Message Expiration
+Photo Albums
+Decentralised
+Cloud Storage
+Blogging
+Decent Encryption
+Chatrooms
+Webpage Creation
+Content Management
+Games
+Unincorporated
+Forums
+Share Anything Digital
+Pseudonyms
+Multiple Identities
+Event Calendar
+Bookmarking
+Community Tagging
+Internet-scale Privacy
+Single Sign-On
+Directory Services
+Nomadic Identity
+Social Networking
+Derivative Channels
+Multiple Profiles
+Privacy Groups
+Autonomy
+Affinity Filtering
+Friend Suggestions
+Cross-Site Auth
+Themes
+Plugins
+External API
+3rd Party Apps
+Open Source
 
+
 
+Welcome to the Matrix
“The most fun you ever had without taking your clothes off.”
Public Sites | Project Home | Git | Developers
-- 
cgit v1.2.3


From 2c451d5c288d976b886338df4692249125dc8172 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 5 Feb 2014 20:53:01 -0800
Subject: a couple more

---
 .htaccess        | 1 +
 assets/home.html | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index 52eb5d6c0..7f752018c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,7 @@
 Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
+#SSLCipherSuite ECDHE-RSA-AES128-SHA256:AES128-GCM-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH
 
 # don't allow any web access to logfiles, even after rotation/compression
 
diff --git a/assets/home.html b/assets/home.html
index 30cde3cb4..975896c0c 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -35,6 +35,7 @@ header { z-index: 10000; }
 Photo Albums
 Decentralised
 Cloud Storage
+Own Your Content
 Blogging
 Decent Encryption
 Chatrooms
@@ -46,6 +47,7 @@ header { z-index: 10000; }
 Share Anything Digital
 Pseudonyms
 Multiple Identities
+No Advertising
 Event Calendar
 Bookmarking
 Community Tagging
-- 
cgit v1.2.3