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
..
index.php	Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails	2011-12-28 10:14:59 +01:00
part.addcardform.php	Contacts: support multiple phone type parameter	2011-11-23 21:07:32 +01:00
part.chooseaddressbook.php	Misc. changes after review by bartv.	2011-12-16 17:42:07 +01:00
part.chooseaddressbook.rowfields.php	Updating of contact list when activating/adding/deleting address books now works.	2011-12-11 16:26:00 +01:00
part.contacts.php	Updating of contact list when activating/adding/deleting address books now works.	2011-12-11 16:26:00 +01:00
part.details.php	Contacts: make name editable again	2011-12-02 21:24:48 +01:00
part.editaddressbook.php	Misc. changes after review by bartv.	2011-12-16 17:42:07 +01:00
part.property.FN.php	Contacts: make name editable again	2011-12-02 21:24:48 +01:00
part.property.php	Contacts: check if PREF parameter is set before useing it	2011-12-18 23:10:43 +01:00
part.setpropertyform.php	Contacts: make name editable again	2011-12-02 21:24:48 +01:00
settings.php	Some improvements on the contact application	2011-10-22 19:23:22 +02:00