This is a clone of the Friendica repository. https://github.com/friendica/friendica
Go to file
Simon L'nu 686fe47b88 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  add js to hide nav-menus, when clicked outside
  fixes in css
  recover contacts total count which got lost
  bug #324 - tinymce used for mail even if editplain being used.
  bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
  keep tony from talking to himself

* master:
2012-03-09 19:02:29 -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 in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 2012-03-09 00:31:17 -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 recover contacts total count which got lost 2012-03-09 02:50:57 -08:00
util string update 2012-03-06 15:09:57 -08:00
view Merge pull request #116 from tomtom84/master 2012-03-09 09:17:01 -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-08 14:34:58 -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
zot.txt 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

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.