Michael Gapczynski 4bf13adff2 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php		2012-07-11 20:25:59 -04:00
..
index.php	Reduce variables assigned.	2012-07-10 01:24:40 +02:00
part.chooseaddressbook.php	Revert	2012-06-11 13:27:32 +02:00
part.chooseaddressbook.rowfields.php	Add share action to addressbooks!	2012-06-30 21:06:49 -04:00
part.contact.php	Moved action buttons down to the add field menu. Fixes oc-1155.	2012-07-04 13:57:07 +02:00
part.cropphoto.php	Obsolete language="Javascript".	2012-06-17 20:25:32 +02:00
part.edit_address_dialog.php	Fix string encoding probs.	2012-06-16 18:06:47 +02:00
part.edit_categories_dialog.php	Added missing template.	2012-03-09 12:11:52 +01:00
part.edit_name_dialog.php	Fix char encoding.	2012-06-16 18:38:20 +02:00
part.editaddressbook.php	More in-/output sanitation,	2012-02-02 17:54:30 +01:00
part.import.php	Calendar & Contacts: Store import progress in OC_Cache	2012-06-04 22:24:17 +02:00
part.importaddressbook.php	Add missing requesttoken.	2012-07-08 13:28:12 +02:00
part.no_contacts.php	Contacts: Updated first run page.	2012-04-27 10:35:31 +02:00
settings.php	Implemented VCFExportPlugin.	2012-07-08 17:52:57 +02:00