Find a file
Simon L'nu f2e2632810 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  some reported warnings cleaned up
  network permission ids
  wrong var for notify total
  fix notification total
  improved rw notifications
  bug #349 - email notls setting
  add a searchbox to "find friends" for global search
  bugfix in diabook
  title not updated when editing post
  New parameter in html2plain for plain text exports. More compatibility in API
  API: added max_id
  API: Now threading seems to work
  API: Seesmic is now working. Optimizing text export.
  Quotes with author are now having an "open/close" link
  New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements

* master:
2012-03-29 00:04:00 -04:00
doc doc/Account-Basics.md 2012-03-06 19:15:40 +00:00
images theme screenshots 2012-03-25 17:55:43 -07:00
include some reported warnings cleaned up 2012-03-28 20:50:09 -07:00
js theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
library translate br with extra elements 2012-03-26 16:56:44 -07:00
mod wrong var for notify total 2012-03-28 17:51:43 -07:00
spec spec directory 2012-03-09 19:50:31 -08:00
tests tests for the template engine 2012-03-22 12:43:03 +01:00
util removed unneccessary stuff 2012-03-22 12:52:24 +01:00
view Merge pull request #184 from annando/master 2012-03-28 15:08:15 -07:00
.gitignore excludes reports from git 2012-03-08 17:44:57 +01:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess Merge branch 'master' of git://github.com/friendica/friendica 2012-03-22 12:50:02 +01:00
boot.php network permission ids 2012-03-28 19:56:14 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql new lines removed 2012-03-22 13:05:34 +01:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php Added config options for the item cache and the ostatus priority 2012-03-11 19:50:51 +01:00
index.php use theme directory for page templates, not language directory 2012-03-27 18:39:52 -07:00
INSTALL.txt
LICENSE
README Update README 2012-03-08 16:25:14 +11:00
testargs.php
update.php removed some new lines to cut down number of changed files 2012-03-22 13:03:28 +01: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.