Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		2012-08-19 22:29:01 -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
l10n	[tx-robot] updated from transifex	2012-08-20 02:01:32 +02:00
lib/share	File sharing cleanup, works perfectly I think :)	2012-08-16 12:20:14 -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	File sharing cleanup, works perfectly I think :)	2012-08-16 12:20:14 -04:00