This is a clone of the Friendica repository. https://github.com/friendica/friendica
Go to file
Simon L'nu 7b5bab445d Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master:
2012-04-26 20:07:54 -04:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
include separate tag search from body search 2012-04-23 22:41:32 -07:00
js tinymce: add inlinepopups plugin 2012-04-18 14:55:21 +02:00
library Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mod add link "remove account" to /mod/settings.php 2012-04-26 17:21:27 +02:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
util rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
view Merge pull request #267 from tomtom84/master 2012-04-26 15:33:34 -07:00
.gitignore Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
boot.php rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem 2012-04-12 06:50:11 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
index.php zrl hook 2012-04-14 04:54:26 -07:00
INSTALL.txt Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
LICENSE Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
README Update README 2012-03-08 16:25:14 +11:00
testargs.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update.php extensible item_id table for managing all the different message-ids generated by multiple services 2012-04-11 16:13:57 -07:00

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.