friendica

Go to file

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

* remotes/upstream/master:
  small fix
  don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
  position the theme-preview on settings page
  more wordsmithing of the Friendica invitation email
  screenshot gallery
  theme preview for end users

* master:

2012-03-26 02:51:40 -04:00

doc

doc/Account-Basics.md

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

images

theme screenshots

2012-03-25 17:55:43 -07:00

include

don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.

2012-03-25 21:43:17 -07:00

theme preview for end users

2012-03-25 19:05:14 -07:00

library

private file in repository

2012-03-21 00:34:12 -07:00

mod

more wordsmithing of the Friendica invitation email

2012-03-25 20:52:34 -07:00

spec

spec directory

2012-03-09 19:50:31 -08:00

tests

tests for the template engine

2012-03-22 12:43:03 +01:00

util

removed unneccessary stuff

2012-03-22 12:52:24 +01:00

view

small fix

2012-03-26 07:02:27 +02:00

.gitignore

excludes reports from git

2012-03-08 17:44:57 +01:00

.gitmodules

adjust2

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

.htaccess

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

2012-03-22 12:50:02 +01:00

boot.php

theme screenshots

2012-03-25 17:55:43 -07:00

build.xml

added some tests

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

database.sql

new lines removed

2012-03-22 13:05:34 +01:00

docblox.dist.xml

Added docblox default configuration file.

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

htconfig.php

Added config options for the item cache and the ostatus priority

2012-03-11 19:50:51 +01:00

index.php

new lines removed

2012-03-22 13:05:34 +01: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-03-08 16:25:14 +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

removed some new lines to cut down number of changed files

2012-03-22 13:03:28 +01: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%