Friendica Communications Platform
Find a file
Simon L'nu 61c28e8c2e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update
  source beautifarming to make review easier
  fixed some typos
  made exceptions from the db optional set address for updae mails correctly
  added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates

* master:
2012-04-10 02:49:34 -04:00
doc Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
images Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
include Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00
js new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... 2012-04-06 11:19:12 +02:00
library Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mod use local_user for tag completion if available. See bug #368 2012-04-09 04:55:52 -07:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests had arg order backwards 2012-04-07 02:23:11 -07:00
util rev update 2012-04-09 16:54:39 -07:00
view Merge pull request #218 from campino/master 2012-04-09 16:53:23 -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 Merge branch 'pull' 2012-04-09 16:55:06 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02: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 made exceptions from the db optional 2012-04-09 14:04:49 +02: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 fix messed up config tables w/ duplicate entries 2012-04-06 05:11:09 -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.