Find a file
Simon L'nu 4f488c7e3c Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  Friendicaland - couple of new 'countries'
  insidious little parsing bug
  have no idea why the if/endif macro block was getting printed and not processed.
  highlight js events-reminder on birthday events
  moved api direct message formating to own function. added same formating to direct reply message, when posting a new message.
  fixed direct message reply in api call.
  modified api message reply to set title to conversion title, when replying.
  add reliable way to get server version
  make it selectable
  I want HTML code!
  new param getUserObjects to avoid retransmitting the whole user info objects
  bugfix
  changes on api_direct_messages_box to allow to retrieve conversations and all messages
  modified direct_messages
  added replyto and subject to direct messages.
  modified conversion to use x function for parameter checking.
2012-06-27 13:11:22 -04:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images Update install wizard 2012-05-23 07:38:31 -04:00
include moved api direct message formating to own function. 2012-06-26 08:54:01 +02:00
js Friendicaland - couple of new 'countries' 2012-06-27 16:06:02 +01:00
library iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
mod service class restrict the email connector 2012-06-26 18:30:20 -07:00
spec missing $submit 2012-06-19 00:50:24 -07:00
tests rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
util service class restrict the email connector 2012-06-26 18:30:20 -07:00
view insidious little parsing bug 2012-06-26 22:32:07 -07:00
.gitattributes Required for github/Windows 2012-06-14 18:39:48 +10: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 insidious little parsing bug 2012-06-26 22:32:07 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
convert_innodb.sql sql script to ccnvert all tables to innodb 2012-05-19 00:45:45 -07:00
database.sql event summary/title 2012-06-25 20:55:27 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php MySQL-Fulltext search option is disabled by default 2012-05-29 16:30:12 +02:00
index.php add plugin hooks to every module_function (allows plugins to be triggered off specific pages/urls) 2012-06-18 20:57:43 -07:00
INSTALL.txt updates to dispy family; fix typo in INSTALL.txt 2012-05-21 21:29:18 -04: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 event summary/title 2012-06-25 20:55:27 -07:00

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.