friendica

Go to file

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

* remotes/upstream/master:
  search should be ok, but a little extra security won't hurt
  messages-menu translation, add scroll-to-top and theme-bug-report in theme
  Fixed...merged with mainline THEN added beards.
  added beard smileys
  doc/Account-Basics.md
  doc/Account-Basics.md
  a
  doc/Remove-Account.md
  doc/Making-Friends.md
  doc/Bugs-and-Issues.md
  doc/Account-Basics.md

* master:

2012-03-06 18:26:22 -05:00

doc

doc/Account-Basics.md

2012-03-06 19:15:40 +00:00

images

added beard smileys

2012-03-06 20:44:53 +00:00

include

Merge pull request #94 from beardy-unixer/master

2012-03-06 15:24:15 -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

search should be ok, but a little extra security won't hurt

2012-03-06 15:15:59 -08:00

util

string update

2012-03-06 15:09:57 -08:00

view

Merge pull request #99 from tomtom84/master

2012-03-06 15:22:55 -08: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-06 13:57:38 -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%