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
2012-03-06 19:15:40 +00:00
2012-03-25 17:55:43 -07:00
2012-03-28 20:50:09 -07:00
2012-03-26 16:56:44 -07:00
2012-03-28 17:51:43 -07:00
2012-03-09 19:50:31 -08:00
2012-03-22 12:43:03 +01:00
2012-03-22 12:52:24 +01:00
2012-03-08 17:44:57 +01:00
2012-03-02 17:18:11 +01:00
2012-03-28 19:56:14 -07:00
2012-03-09 12:16:58 +01:00
2012-03-22 13:05:34 +01:00
2012-02-29 21:09:20 +11:00
2012-03-08 16:25:14 +11: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.  
Description
This is a clone of the Friendica repository.
https://github.com/friendica/friendica
Readme 183 MiB
Languages
PHP 85.4%
Smarty 6.4%
CSS 4.8%
JavaScript 2.7%
Less 0.4%
Other 0.2%