Mirror of the github repository of Friendica
Find a file
Simon L'nu 2871e28df7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  display settings hooks
  re-opened bug #363
  this is better
  include contact_widgets for categories_widget when doing updates
  remove loozah themes which fell too far behind to recover
  smal fix
  german translation for right_aside
  make right_aside translatable and provide german translation... and some css-fixes
  suppress duplicates in search
  make contact ssl_policy change a function since it is used in a few places
  more ssl policy fixes and prevent delivery to soapbox when using  local delivery
  don't change ssl settings on local photos for remote contact

* master:
2012-04-04 02:14:26 -04:00
doc Modified peopleyouknow to handle sites without Facebook better 2012-04-02 01:26:45 +01:00
images theme screenshots 2012-03-25 17:55:43 -07:00
include make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
js some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus 2012-03-31 05:51:56 -07:00
library document tinymce fixes/workarounds 2012-04-01 04:13:27 -07:00
mod display settings hooks 2012-04-03 22:01:52 -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 string update 2012-03-30 04:53:00 -07:00
view Merge branch 'pull' 2012-04-03 19:16:59 -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 remove loozah themes which fell too far behind to recover 2012-04-03 16:40:25 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql settings for unknown private mail acceptance 2012-03-31 00:57:59 -07: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 remove zrl from query string 2012-04-02 00:45:45 -07:00
INSTALL.txt INSTALL.txt - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
LICENSE Update LICENSE 2012-02-29 21:09:20 +11:00
README Update README 2012-03-08 16:25:14 +11:00
testargs.php add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
update.php settings for unknown private mail acceptance 2012-03-31 00:57:59 -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.