This is a clone of the Friendica repository. https://github.com/friendica/friendica
Go to file
Simon L'nu a3d95f79f2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  well that was a silly mistake...
  setting wasn't being applied
  rev update
  diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
  diabook: theme-settings: users can set font-size and line-height for posts and comments
  diabook-themes: small fixes
  quattro: language icon in navbar
  move html out of lang_selector() and new template lang_selector.tpl
  display settings: show theme screenshot on page load
  quattro: add admin theme settigs. darker items background with a bottom border.
  admin: change global theme settings
  quattro: work on     "like" activitiy items less visible     fixes to widths     popup notification out of navbar     category input in jot
  validate_url allow naked subdomain if is "localhost"

* master:
2012-04-13 19:26:18 -04:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
include Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
js main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all 2012-04-12 09:15:08 +02:00
library Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mod well that was a silly mistake... 2012-04-13 16:12:06 -07:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests had arg order backwards 2012-04-07 02:23:11 -07:00
util rev update 2012-04-13 14:44:37 -07:00
view well that was a silly mistake... 2012-04-13 16:12:06 -07: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 rev update 2012-04-13 14:44:37 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem 2012-04-12 06:50:11 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
index.php Merge pull request #223 from campino/master 2012-04-10 15:21:37 -07:00
INSTALL.txt Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02: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 extensible item_id table for managing all the different message-ids generated by multiple services 2012-04-11 16:13:57 -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.