Contacts app for Owncloud

Brice Maron 7149ad1e18 Merge branch 'master' into multi_app_dir ... Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php		2012-06-14 21:16:59 +00:00
ajax	Remove debug statements.	2012-06-13 18:57:12 +02:00
appinfo	Change app path logic in templates	2012-06-06 20:24:16 +00: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: Fixes for CSRF.	2012-06-14 18:13:01 +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	Use the right csrf token.	2012-06-14 13:23:12 +02: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