friendica

Go to file

Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php

2016-12-13 11:00:44 +01:00

doc

Merge pull request #2932 from Hypolite/issue/missing-private-image-src

2016-12-09 15:54:11 +01:00

images

attend functionality for duepuntozero

2015-10-12 20:09:33 +02:00

include

Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result

2016-12-13 11:00:44 +01:00

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/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result

2016-12-13 11:00:44 +01:00

mods

added configuration reg. curl and lighttpd with error code 417

2016-07-13 09:33:28 +02:00

object

More usage of dbm::is_result($r) instead of count($r):

2016-12-13 10:44:13 +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

Michael may keep the typo

2016-12-09 18:11:27 +01:00

view

Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result

2016-12-13 11:00:44 +01:00

.gitattributes

Required for github/Windows

2012-06-14 18:39:48 +10:00

.gitignore

changing gitignore

2016-09-22 22:08:24 +02:00

.gitmodules

adjust2

2012-03-02 17:18:11 +01:00

.htaccess

recreate fix for #2617 on correct branch

2016-06-18 08:16:09 -04:00

boot.php

Some rewrites:

2016-12-13 10:16:36 +01:00

build.xml

added some tests

2012-03-09 12:16:58 +01:00

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

Added docblox default configuration file.

2012-03-03 16:53:10 -04:00

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

The worker can now run from the frontend as well

2016-11-27 00:55:05 +00: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

move READMEs to .md, added some notes about addon translations

2014-07-07 13:03:05 +02:00

README.translate.md

Fix #2817

2016-09-30 10:46:56 -04:00

testargs.php

Replaced $argv and $argc with the $_SERVER array

2015-01-04 13:24:16 +01:00

update.php

More usage of dbm::is_result($r) instead of count($r):

2016-12-13 10:44:13 +01:00

Vagrantfile

Switched to a vagrant box that works for Ubuntu Xenial

2016-11-20 15:32:57 +01:00

README.md

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.

Languages

PHP 85.4%

Smarty 6.4%

CSS 4.8%

JavaScript 2.7%

Less 0.4%

Other 0.2%

README.md

Friendica Social Communications Server