Fork of https://github.com/friendica/friendica for the sake of adding various patches.
Find a file
Simon L'nu dfdf0f1335 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  bug #328
  default the text template var on conversations
  bug #327 - composed private message is lost if no recip specified.
  revup
  fixed login-fields, fixed. notofication.png, changed locations
  German translation

* master:
2012-03-11 01:24:59 -05:00
doc doc/Account-Basics.md 2012-03-06 19:15:40 +00:00
images More improved transparency for smilies 2012-03-09 01:49:12 +00:00
include bug #328 2012-03-10 18:52:50 -08:00
js still getting parent relays on remote systems 2012-03-07 18:23:55 -08:00
library finalise spam storage model, begin driver changes. 2012-03-05 23:20:42 -08:00
mod default the text template var on conversations 2012-03-10 15:53:36 -08:00
spec spec directory 2012-03-09 19:50:31 -08:00
util string update 2012-03-06 15:09:57 -08:00
view bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
.gitignore Enabled automated doc building. Changes: 2012-03-01 11:44:33 +01:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
boot.php revup 2012-03-10 14:44:43 -08:00
build.xml Enabled automated doc building. Changes: 2012-03-01 11:44:33 +01:00
database.sql item table update for file feature 2012-03-02 00:09:10 -08:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php keep tony from talking to himself 2012-03-08 21:14:41 -08:00
index.php add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
INSTALL.txt INSTALL.txt - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
LICENSE Update LICENSE 2012-02-29 21:09:20 +11:00
README Update README 2012-03-08 16:25:14 +11:00
testargs.php add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
update.php item table update for file feature 2012-03-02 00:09:10 -08: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.