Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 ... Conflicts: apps/files_external/templates/settings.php lib/template.php		2012-06-13 15:17:46 -04:00
..
ajax	Remove debug statements.	2012-06-13 18:57:12 +02:00
appinfo	Remove OC_App::register function	2012-05-31 13:01:30 +02:00
css	A bit of pixel-pushing.	2012-06-07 10:55:40 +02:00
img	Contacts: Resized Add button. Now how do I add a gradient? ;-)	2012-05-06 13:51:16 +02:00
js	Contacts: implemented CSRF prevention.	2012-06-13 17:35:42 +02:00
l10n	update translations	2012-06-06 00:29:28 +02:00
lib	Contacts: Final (for now) fix to encoding probs on import.	2012-06-12 12:32:37 +02:00
templates	Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127	2012-06-13 15:17:46 -04:00
carddav.php	add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav	2012-05-16 21:05:15 +02:00
export.php	Correct mime type.	2012-06-06 15:29:33 +02:00
import.php	Quick fix for index errors when not importing from files.	2012-06-11 22:14:21 +02:00
index.php	Revert	2012-06-11 13:27:32 +02:00
photo.php	Contacts: Cache standard photo less aggressively	2012-06-05 10:32:26 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
thumbnail.php	Less aggressive caching on thumbnails too.	2012-06-06 01:06:13 +02:00
tmpphoto.php	Contacts: Use OC_Cache for contact photo handling instead of temp dir.	2012-06-05 20:34:12 +02:00