Michael Gapczynski 93556984f2 Merge branch 'master' into share_api ...

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

2012-07-25 17:08:18 -04:00

..

index.php

Added help for keyboard shortcuts.

2012-07-22 00:15:28 +02:00

part.chooseaddressbook.php

Refactored contacts import.

2012-07-15 04:17:30 +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

Code style.

2012-07-20 17:11:13 +02:00

part.edit_address_dialog.php

Fix string encoding probs.

2012-06-16 18:06:47 +02: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.no_contacts.php

Contacts: Updated first run page.

2012-04-27 10:35:31 +02:00

part.selectaddressbook.php

Refactored contacts import.

2012-07-15 04:17:30 +02:00

settings.php

Implemented VCFExportPlugin.

2012-07-08 17:52:57 +02:00