Mirror of the github repository
Go to file
Simon L'nu 8e29669b81 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  support lowercase :-p smilie
  work around doubled linefeeds in tinymce3.5b2
  add icons to aside diabook, fixes in css
  revert permissions relaxation on community
  add comix-plain
  smooth the comix comment box
  make autocomplete work with updated tinymce
  ika to ica
  private file in repository
  facepark is unsupported ATM
  remove stray template variable from old code
  add comix theme
  use password field for DB input
  added Vijay's theme from facepark.in
  added README to mcefixes to explain what is going on.
  update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
  more friend suggestions

* master:
2012-03-22 01:29:55 -04:00
doc doc/Account-Basics.md 2012-03-06 19:15:40 +00:00
images change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
include support lowercase :-p smilie 2012-03-21 21:45:45 -07:00
js make autocomplete work with updated tinymce 2012-03-21 05:27:08 -07:00
library private file in repository 2012-03-21 00:34:12 -07:00
mod work around doubled linefeeds in tinymce3.5b2 2012-03-21 21:42:27 -07:00
spec spec directory 2012-03-09 19:50:31 -08:00
tests splitted tests into several files 2012-03-14 12:54:49 +01:00
util added some tests 2012-03-09 12:16:58 +01:00
view add icons to aside diabook, fixes in css 2012-03-22 04:33:21 +01: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 turn indexes back off (this is from an errant checkin a year or more ago) 2012-03-15 20:07:30 -07:00
boot.php add comix-plain 2012-03-21 13:55:37 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql Merge branch 'pull' 2012-03-15 16:39:21 -07: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 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-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 track whether contact is a community page or not 2012-03-15 16:38:26 -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.