Thomas Tanghus 3e9a69b9b7 Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts ... Conflicts: apps/contacts/ajax/contactdetails.php apps/contacts/js/contacts.js		2012-02-08 08:33:51 +01:00
..
ajax	Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts	2012-02-08 08:33:51 +01:00
appinfo	add import function for contacts	2012-02-05 12:13:53 +01:00
css	Fixed broken "Add new" contact.	2012-02-08 07:59:39 +01:00
img	Added files for new contact editor/viewer.	2012-02-08 07:59:39 +01:00
import_tmp	add import function for contacts	2012-02-05 12:13:53 +01:00
js	Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts	2012-02-08 08:33:51 +01:00
l10n	update translations	2012-01-27 00:59:24 +01:00
lib	Don't import cards that can't be parsed by Sabre, but log it instead.	2012-02-08 07:59:39 +01:00
templates	Fixed broken "Add new" contact.	2012-02-08 07:59:39 +01:00
carddav.php	Check if the application is actually enabled	2011-09-30 23:17:18 +02:00
contacts.php	Added files for new contact editor/viewer.	2012-02-08 07:59:39 +01:00
dynphoto.php	Updated copyrights.	2012-02-08 07:59:39 +01:00
export.php	use backslash n instead of a real new line	2012-01-15 00:56:11 +01:00
import.php	change comments in import.php	2012-02-05 12:13:53 +01:00
index.php	Oops. Missing ')' :-P	2012-01-12 22:55:43 +01:00
photo.php	Resize profile picture if bigger than 200px on either x or y.	2012-01-31 19:32:24 +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 fix for empty 'FN' field on import via CardDAV clients.	2012-01-19 19:47:09 +01:00