Mirror of the github repository
Go to file
Simon L'nu 0446766f04 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-theme: small fix
  diabook-theme: made boxes at right_aside sortable
  use cid rather than uid in perms
  Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
  use mysql replace on cache items
  fixing common friends
  rev update
  Moved Meta Viewport from global head.tpl to diabook's header

* master:
2012-05-03 00:25:56 -04:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images modified: images/smiley-thumbsup.gif 2012-05-01 21:05:55 +01:00
include use mysql replace on cache items 2012-05-02 16:27:19 -07:00
js close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) 2012-04-30 02:00:41 +02:00
library Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mod use cid rather than uid in perms 2012-05-02 21:00:39 -07: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-05-02 15:26:57 -07:00
view diabook-theme: small fix 2012-05-03 06:25:23 +02: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-05-02 15:26:57 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. 2012-05-02 01:45:57 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
index.php hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -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 provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. 2012-05-02 01:45: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.