Mirror of the github repository of Friendica
Find a file
Simon L'nu 8d4c77fc43 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update
  database updates
  Debugged implementation of Diaspora relayable_retractions
  cleanup and logging
  first shot at getting like/unlike functions to work consistently
  Fix bugs in the retraction code
  prepare to implement database update
  Implement relaying of relayable_retractions
  Support relayable_retractions that are relayed to us by the top-level post owner
  quattro: admin panel styling and 1st buttons for addon/theme overview
  privacy settings: make submit button translateable
  DE: update to the strings
  prv messages: make submit translateable

* master:
2012-06-03 18:03:20 -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 Debugged implementation of Diaspora relayable_retractions 2012-06-03 14:53:30 -06:00
js missing delimiter 2012-05-30 15:56:11 -07:00
library update tinymce to 3.5.0.1 2012-05-15 17:18:46 -07:00
mod Debugged implementation of Diaspora relayable_retractions 2012-06-03 14:53:30 -06:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
util rev update 2012-06-03 14:47:53 -07:00
view Fix bugs in the retraction code 2012-06-03 14:53:30 -06: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 Merge https://github.com/friendica/friendica into pull 2012-06-03 14:48:28 -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 database updates 2012-06-03 14:53:30 -06: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 rename get_language() to get_browser_language() 2012-05-13 04:52:29 -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 database updates 2012-06-03 14:53:30 -06: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.