Commit Graph

14 Commits

Author SHA1 Message Date
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica 8aa2552372 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
Friendika 056fe0a3aa poco discovery 2011-10-27 14:52:35 -07:00
Friendika 75af366122 zot/salmon new key format for batch keys 2011-09-27 06:50:18 -07:00
Friendika 0a30a91b14 basic zot discovery framework 2011-09-19 02:13:59 -07:00
Friendika 7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika c0b8e63a3f basic diaspora discovery 2011-07-18 18:13:46 -07:00
Mike Macgirvin 0f47ac282c celebrity/group/community pages about 75% implemented 2010-10-17 20:04:17 -07:00
Mike Macgirvin dba866c689 more comprehensive XRD linkages 2010-10-12 04:39:32 -07:00
Mike Macgirvin 013d2604f8 inline salmon magic keys 2010-10-12 04:07:03 -07:00
Mike Macgirvin 9c10ada906 salmon-magic-public-freaking-nasty-keys 2010-10-06 21:13:15 -07:00
Mike Macgirvin a0ecdd025e infrastructure for salmon 2010-10-06 19:46:44 -07:00
Mike Macgirvin cb0d45385c updated with dfrn profile 2010-07-23 17:33:15 -07:00
Mike Macgirvin 89c15cc092 added webfinger support 2010-07-23 16:33:34 -07:00