Georg Ehrke 0aaf6d16a5 Merge branch 'master' into movable_apps_2		2012-04-27 14:22:12 +02:00
..
ajax	fix merge conflicts	2012-04-26 18:08:49 +02:00
appinfo	Remove useless, unmaintained dav.php	2012-04-15 16:50:44 +02:00
css	fix merge conflicts	2012-04-26 18:08:49 +02:00
img	Contacts: Changed layout as discussed with JanC. Still WiP.	2012-04-22 00:44:53 +02:00
import_tmp	add import function for contacts	2012-02-05 12:13:53 +01:00
js	Merge branch 'master' into movable_apps_2	2012-04-27 14:22:12 +02:00
l10n	Cleanup in Contacts.	2012-03-13 00:55:15 +01:00
lib	Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-)	2012-04-24 11:35:56 +02:00
templates	Merge branch 'master' into movable_apps_2	2012-04-27 14:22:12 +02:00
carddav.php	make *DAV work with movable apps	2012-04-26 21:56:29 +02:00
dynphoto.php	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
export.php	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
import.php	fix merge conflicts	2012-04-26 18:08:49 +02:00
index.php	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
photo.php	Merge branch 'master' into movable_apps	2012-04-23 13:03:50 +02: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	Merge branch 'master' into movable_apps	2012-04-23 13:03:50 +02:00