Friendica Communications Platform
Find a file
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
doc added_new_files 2013-01-25 22:45:48 +01:00
images get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
include Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
js elastic transitions 2013-02-04 18:20:47 -07:00
library Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
mod Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
mods Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
object Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01: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 add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. 2013-02-07 23:43:55 -08:00
view Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
.gitattributes Required for github/Windows 2012-06-14 18:39:48 +10:00
.gitignore Vier: Some templates were missing 2012-12-30 22:58:05 +01:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess small twitter improvements 2012-09-06 17:31:05 -06:00
boot.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01: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 Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php New option to enable and disable the "share" element 2012-12-21 00:08:58 +01:00
index.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
INSTALL.txt Typo 2012-10-09 23:25:51 +01:00
LICENSE 2012 is long gone 2013-02-15 17:40:58 -08:00
README Add link to issue tracker to README 2012-10-05 16:48:45 +02:00
README.translate a README for the translation process 2013-01-20 08:58:51 +01:00
testargs.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update.php Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01: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.

Report issues at http://bugs.friendica.com/