Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php		2012-08-09 11:38:22 -04:00
..
ajax	Add additional error handling for emailing private links	2012-07-29 18:02:09 -04:00
appinfo	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
css	Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible	2012-08-06 15:09:01 -04:00
js	Add additional error handling for emailing private links	2012-07-29 18:02:09 -04:00
lib/share	Remove extra line, caused 'headers already sent' issues	2012-08-06 13:33:53 -04:00
templates	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
get.php	Remove unused RUNTIME_NOSETUPFS var	2012-08-08 22:42:50 +02:00
lib_share.php	Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'	2012-07-28 11:06:36 -04:00
list.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00
sharedstorage.php	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00