Find a file
Simon L'nu ae9506f21e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  cleanup photo menus
  more backend work on mail2 followers
  make editplain work everywhere
  move all fix_mce to one function so it can easily be undone
  duplicate community posts
  fix_mce_lf contact edit page
  fix_mce_lf on profiles
  set default on get_avatar
  rev update
  Incorrect tranlation (one negation too much)
  fixed install bug
  diabook-themes: smal fix in bbcode-js
  diabook-themes: added url and quote to bbcode toolbar under comment box
  Remove Gravatar from core and add new hook avatar_lookup.
  Rename gravatar_img() more generic to avatar_img().

* master:
2012-04-10 22:51:29 -04:00
doc Remove Gravatar from core and add new hook avatar_lookup. 2012-04-09 21:22:09 +02:00
images Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
include cleanup photo menus 2012-04-10 19:33:32 -07: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 more backend work on mail2 followers 2012-04-10 19:15: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-10 15:25:15 -07:00
view make editplain work everywhere 2012-04-10 18:08:06 -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 2012-04-10 15:25:15 -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 Merge pull request #223 from campino/master 2012-04-10 15:21:37 -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 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.