Find a file
Roland Häder 20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
2016-12-22 11:37:23 +01:00
doc added much more curly braces + space between "if" and brace 2016-12-20 11:59:13 +01:00
images attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
include Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +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 branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
mods added configuration reg. curl and lighttpd with error code 417 2016-07-13 09:33:28 +02:00
object Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 11:33:00 +01:00
spec update contact request $ confirmation graphics 2016-11-29 16:00:07 +01:00
tests Continued rewriting: 2016-05-01 14:24:44 +02:00
util No more needed ... util/typo.php is there. 2016-12-19 14:23:09 +01:00
view Merge branch 'rewrites/app_get_baseurl_static' into develop 2016-12-22 11:37:23 +01:00
.gitattributes
.gitignore changing gitignore 2016-09-22 22:08:24 +02:00
.gitmodules
.htaccess recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
boot.php added more curly braces + space between "if" and brace 2016-12-20 17:58:34 +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 Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
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:58:34 +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:17:19 +01:00
Vagrantfile Switched to a vagrant box that works for Ubuntu Xenial 2016-11-20 15:32:57 +01:00

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.