friendica

Go to file

Simon L'nu 29d7f260d7 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master:

2012-04-22 22:22:52 -04:00

doc

more ' = ' spacing fixes

2012-04-10 23:45:47 -04:00

images

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

include

bug #388 - notify_comment received after post deleted

2012-04-22 19:19:02 -07:00

tinymce: add inlinepopups plugin

2012-04-18 14:55:21 +02:00

library

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

mod

Merge https://github.com/friendica/friendica into pull

2012-04-22 16:25:02 -07:00

spec

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

tests

had arg order backwards

2012-04-07 02:23:11 -07:00

util

don't allow non-existent themes as choices

2012-04-22 16:24:29 -07:00

view

diabook-themes: bugfix

2012-04-22 23:58:34 +02: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

don't allow non-existent themes as choices

2012-04-22 16:24:29 -07:00

build.xml

added some tests

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

database.sql

reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem

2012-04-12 06:50:11 -07:00

docblox.dist.xml

Added docblox default configuration file.

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

htconfig.php

Merge commit 'upstream/master'

2012-04-07 18:35:29 +02:00

index.php

zrl hook

2012-04-14 04:54:26 -07:00

INSTALL.txt

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02: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

extensible item_id table for managing all the different message-ids generated by multiple services

2012-04-11 16:13:57 -07:00

README

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.

Languages

PHP 85.4%

Smarty 6.4%

CSS 4.8%

JavaScript 2.7%

Less 0.4%

Other 0.2%