Michael Gapczynski 4c7fd8cd01 Merge branch 'master' into share_api ... Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php		2012-08-14 10:22:13 -04:00
..
ajax	small fixes in merge request 104, use OCP\Files::getStorage	2012-07-11 02:33:11 +02:00
appinfo	Lots of refactoring to share API	2012-08-06 11:27:13 -04:00
css	shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height	2012-07-10 16:58:37 +02:00
img	add supersized slideshow	2012-07-09 15:13:23 +02:00
js	Change hardcoded urls to use linkTo function	2012-08-06 18:51:41 +02:00
l10n	[tx-robot] updated from transifex	2012-07-31 22:57:24 +02:00
lib	Lots of refactoring to share API	2012-08-06 11:27:13 -04:00
templates	Remove unused gallery template	2012-08-12 22:30:13 +02:00
index.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
sharing.php	Sanitzing user input	2012-08-09 22:14:09 +02:00