Commit Graph

11 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 bedb4eb715 just hostname not url in hm:host - host xrd document 2011-09-28 15:07:01 -07:00
Friendika 360a46178b create zot batch keys 2011-09-28 03:45:48 -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 2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika b5ccb8e205 ensure host xrd is correct, even if installed in subpath 2011-04-14 19:43:00 -07:00
Friendika 4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika 7be66b1d91 ff account manager 2010-11-11 02:49:28 -08:00
Mike Macgirvin 89c15cc092 added webfinger support 2010-07-23 16:33:34 -07:00