Thomas Tanghus 5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails ... Fixed some conflicts. Conflicts: apps/contacts/css/styles.css apps/contacts/templates/index.php		2011-12-28 10:14:59 +01:00
..
ajax	Misc. changes after review by bartv.	2011-12-16 17:42:07 +01:00
appinfo	Contacts: refactor rendering of part.details template	2011-12-07 20:40:58 +01:00
css	Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails	2011-12-28 10:14:59 +01:00
img	Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js	2011-12-17 20:38:52 +01:00
js	Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails	2011-12-28 10:14:59 +01:00
l10n	updated translations	2011-09-24 23:12:18 +02:00
lib	Contacts: small merge cleanups	2011-12-27 22:44:52 +01:00
templates	Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails	2011-12-28 10:14:59 +01:00
carddav.php	Check if the application is actually enabled	2011-09-30 23:17:18 +02:00
export.php	Misc. changes after review by bartv.	2011-12-16 17:42:07 +01:00
index.php	Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud	2011-12-27 22:18:01 +01:00
photo.php	Use a proxy class to interface with Sabre_VObject classes	2011-12-07 20:40:58 +01:00
settings.php	show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration	2011-09-28 16:05:01 +02:00
thumbnail.php	Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js	2011-12-17 20:38:52 +01:00