Mirror of the github repository
Go to file
Simon L'nu f0fdd1a163 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  item table update for file feature
  probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
  diabook commit
  conversation: remove templating items in code and move it to template.
  Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
  template proc: avoid a notice and allow template name to include to be passed with a variable value
  show relation in contact_template
  admin: fix small string
  fix visualization in groupeditor
  less html in mod/group.php, template for group members editor, quattro theme for group edit.

* master:
2012-03-02 04:07:23 -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 friendica.svg - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
include Merge pull request #55 from fabrixxm/master 2012-03-02 00:00:03 -08:00
js one more attempt 2012-02-25 17:07:38 -08:00
library Merge remote-tracking branch 'upstream/master' 2012-03-01 11:49:22 +01:00
mod Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
util Enabled automated doc building. Changes: 2012-03-01 11:44:33 +01:00
view Merge pull request #55 from fabrixxm/master 2012-03-02 00:00:03 -08:00
.gitignore Enabled automated doc building. Changes: 2012-03-01 11:44:33 +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
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
boot.php item table update for file feature 2012-03-02 00:09:10 -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
htconfig.php theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -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
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.