Simon L'nu ed8c5954a9 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  more error handling
  ensure all new users get a timezone. We'll use UTC until they choose otherwise.
  handle escaped file chars in display and search
  escape % in file_tag_query as it is ultimately embedded in a sprintf
  diabook-themes: move "common tabs" to left side on settings page
  move the common tabs to right_aside in diabook-derivates
  register hooks for a COPA plugin
  some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
  bug fix in diabook-aerith and -red
  bug-fixes in diabook-derivates
  settings for unknown private mail acceptance

* master:
2012-03-31 22:46:13 -04:00
2012-03-06 19:15:40 +00:00
2012-03-25 17:55:43 -07:00
2012-03-31 17:44:34 -07:00
2012-03-26 16:56:44 -07:00
2012-03-09 19:50:31 -08:00
2012-03-22 12:43:03 +01:00
2012-03-30 04:53:00 -07:00
2012-03-08 17:44:57 +01:00
2012-03-02 17:18:11 +01:00
2012-03-09 12:16:58 +01:00
2012-03-29 21:44:30 -07: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%