This is a clone of the Friendica repository. https://github.com/friendica/friendica
Go to file
Michael Vogel bfca7f47ef Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-07-13 23:39:51 +02:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images Update install wizard 2012-05-23 07:38:31 -04:00
include Merge remote branch 'upstream/master' 2012-07-13 23:39:51 +02:00
js allow live updates for unlikes and undislikes 2012-07-13 09:09:01 -06:00
library fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
mod Merge remote branch 'upstream/master' 2012-07-13 23:39:51 +02:00
spec missing $submit 2012-06-19 00:50:24 -07:00
tests rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
util rev update 2012-07-12 16:11:43 -07:00
view move plink sparkles to the right html element in dispy 2012-07-13 04:22:42 -07:00
.gitattributes Required for github/Windows 2012-06-14 18:39:48 +10:00
.gitignore Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
boot.php rev update 2012-07-12 16:11:43 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
convert_innodb.sql sql script to ccnvert all tables to innodb 2012-05-19 00:45:45 -07:00
database.sql term (tag, mention, category, file, etc.) table 2012-07-05 17:59:56 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php MySQL-Fulltext search option is disabled by default 2012-05-29 16:30:12 +02:00
index.php add plugin hooks to every module_function (allows plugins to be triggered off specific pages/urls) 2012-06-18 20:57:43 -07:00
INSTALL.txt updates to dispy family; fix typo in INSTALL.txt 2012-05-21 21:29:18 -04:00
LICENSE Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
README Update README 2012-03-08 16:25:14 +11:00
testargs.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update.php term (tag, mention, category, file, etc.) table 2012-07-05 17:59:56 -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.