friendica

Go to file

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

* remotes/upstream/master:
  remove "smilie" expansion for Diaspora logo
  prevent duplicate likes
  quattro: theme settings (a bit hackish)
  add img
  fixes in diabook
  finalise spam storage model, begin driver changes.
  fixes
  template proc: add variable filters

* master:

2012-03-06 14:51:14 -05:00

doc

attribution issue - don't take author name from contact if available from item.

2012-02-24 20:03:13 -08:00

images

add img

2012-03-06 08:31:54 +01:00

include

remove "smilie" expansion for Diaspora logo

2012-03-06 04:28:45 -08:00

fix @mention autocomplete in comments

2012-03-03 00:12:45 +01:00

library

finalise spam storage model, begin driver changes.

2012-03-05 23:20:42 -08:00

mod

some admin page fixes and cleanup

2012-03-05 18:51:21 -08:00

util

string update

2012-03-05 16:43:44 -08:00

view

quattro: theme settings (a bit hackish)

2012-03-06 09:50:18 +01:00

.gitignore

Enabled automated doc building. Changes:

2012-03-01 11:44:33 +01:00

.gitmodules

adjust2

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

.htaccess

add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)

2012-01-18 16:21:30 -08:00

boot.php

revup

2012-03-05 13:37:32 -08:00

build.xml

Enabled automated doc building. Changes:

2012-03-01 11:44:33 +01:00

database.sql

item table update for file feature

2012-03-02 00:09:10 -08:00

docblox.dist.xml

Added docblox default configuration file.

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

htconfig.php

add diabook to default themes

2012-03-02 16:24:26 -08:00

index.php

add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)

2012-01-18 16:21:30 -08:00

INSTALL.txt

INSTALL.txt - Friendika -> Friendica

2012-02-20 19:38:42 -03:00

LICENSE

Update LICENSE

2012-02-29 21:09:20 +11:00

README

Update README

2012-02-29 21:07:33 +11:00

testargs.php

add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)

2012-01-18 16:21:30 -08:00

update.php

item table update for file feature

2012-03-02 00:09:10 -08:00

zot.txt

add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)

2012-01-18 16:21:30 -08:00

README

Friendica Social Communications Server
======================================

Welcome to the free social web.

Languages

PHP 85.4%

Smarty 6.4%

CSS 4.8%

JavaScript 2.7%

Less 0.4%

Other 0.2%