jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Mirror von https://github.com/friendica/friendica
13778 commits 10 branches 58 tags 216 MiB
PHP 85.3%
Smarty 5.5%
JavaScript 4.3%
CSS 4.2%
Less 0.4%
Other 0.2%
Find a file
Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:29:56 +01:00
doc added much more curly braces + space between "if" and brace 2016-12-20 11:56:34 +01:00
images
include Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
js autocomplete: add [embed] tag to tag autocomplete and to docu docs 2016-12-02 19:39:35 +01:00
library Merge remote-tracking branch 'upstream/develop' into develop 2016-12-13 09:59:43 +01:00
mod Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
mods
object Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 11:29:56 +01:00
spec update contact request $ confirmation graphics 2016-11-29 16:00:07 +01:00
tests
util No more needed ... util/typo.php is there. 2016-12-19 14:23:09 +01:00
view Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 09:03:44 +01:00
.gitattributes
.gitignore changing gitignore 2016-09-22 22:08:24 +02:00
.gitmodules
.htaccess
boot.php added more curly braces + space between "if" and brace 2016-12-20 17:57:40 +01:00
build.xml
CHANGELOG missing bracket 2016-09-11 08:03:12 +02:00
database.sql Additional info in registration request 2016-11-19 18:22:49 +01:00
docblox.dist.xml
friendica_test_data.sql
htconfig.php make vier also the default from the emergency htconfig file 2016-12-10 07:04:39 +01:00
index.php added more curly braces + space between "if" and brace 2016-12-20 17:57:40 +01:00
INSTALL.txt reflect requirements from install.md also in install.txt 2016-09-13 14:49:21 +02:00
LICENSE it is 2016 by now 2016-09-20 16:57:18 +02:00
README.md
README.translate.md Fix #2817 2016-09-30 10:46:56 -04:00
testargs.php
update.php Continued with coding convention: 2016-12-20 21:16:01 +01:00
Vagrantfile Switched to a vagrant box that works for Ubuntu Xenial 2016-11-20 15:32:57 +01:00

README.md

Friendica Social Communications Server

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.