Commit graph

25 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 5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica e6fd6bfd89 more error handling 2012-03-31 17:44:34 -07:00
friendica 67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
friendica bdb14d5aad relative link redirects 2012-02-26 14:34:01 -08:00
friendica 2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
friendica 330a876d81 bug #281 2012-02-12 14:18:32 -08: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
friendica 5b3155579a fix diaspora's illegal webfinger xml before sending to parser 2011-12-09 16:46:18 -08:00
friendica 6893df991e update user-agent string for remote http requests 2011-11-18 22:03:49 -08:00
Fabio Comuni 02281be0c3 oembed: don't try to fetch media files and add Accept request header to fetch_url 2011-11-17 13:40:11 +01:00
Friendika 6d6136cdb5 fix diaspora cache 2011-10-25 20:30:01 -07:00
Friendika 01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Friendika 9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika 0f1bc6e957 log every possible diaspora return for posts and comments 2011-08-29 22:50:41 -07:00
Friendika 1b33ba6587 third attempt to get rid of this stupid warning 2011-08-25 06:01:40 -07:00
Friendika eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
Friendika c97652a044 php error when no aliases 2011-08-21 00:13:44 -07:00
Friendika 2df7251b34 notifier issue 2011-08-18 17:30:06 -07:00
Friendika c534dd2969 fill and expire fcontact cache 2011-08-18 04:20:30 -07:00
Friendika fafcab70e1 fill in framework for d* outgoing 2011-08-16 20:43:34 -07:00
Friendika b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika 1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika 8b31ff15f5 breaking up boot file (part of zot refactor) 2011-08-01 16:51:01 -07:00