Simon L'nu 8e29669b81 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  support lowercase :-p smilie
  work around doubled linefeeds in tinymce3.5b2
  add icons to aside diabook, fixes in css
  revert permissions relaxation on community
  add comix-plain
  smooth the comix comment box
  make autocomplete work with updated tinymce
  ika to ica
  private file in repository
  facepark is unsupported ATM
  remove stray template variable from old code
  add comix theme
  use password field for DB input
  added Vijay's theme from facepark.in
  added README to mcefixes to explain what is going on.
  update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
  more friend suggestions

* master:
2012-03-22 01:29:55 -04:00
2012-03-06 19:15:40 +00:00
2012-03-21 21:45:45 -07:00
2012-03-21 00:34:12 -07:00
2012-03-09 19:50:31 -08:00
2012-03-14 12:54:49 +01:00
2012-03-09 12:16:58 +01:00
2012-03-08 17:44:57 +01:00
2012-03-02 17:18:11 +01:00
2012-03-21 13:55:37 -07:00
2012-03-09 12:16:58 +01:00
2012-03-15 16:39:21 -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%