Commit Graph

7 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 d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -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
Friendika 18157769f0 parent eval order issue 2011-09-08 20:00:06 -07:00
Friendika ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika 2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika 73b4faca5c basic file upload/attach 2011-05-24 22:40:52 -07:00