Bart Visscher b483f2aab8 Merge branch 'master' into routing ... Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php		2012-08-30 21:49:28 +02:00
..
ajax	Reimplement links support for sharing and add password protection option	2012-08-27 20:37:38 -04:00
css	Fix toggling of password protection in sharing dropdown	2012-08-29 11:54:49 -04:00
img	Optimized image size	2012-08-18 13:56:04 +02:00
js	Merge branch 'master' into routing	2012-08-30 21:49:28 +02:00
l10n	[tx-robot] updated from transifex	2012-08-29 02:06:48 +02:00
lostpassword	fix for bug #1295, don't escape password reset link	2012-07-27 15:35:36 +02:00
templates	Fix password authentication for links and fix template problems for links by creating a new base layout	2012-08-29 11:54:49 -04:00
minimizer.php	Use TemplateLayout functions for finding js and css files in minimizer	2012-06-18 15:40:48 +02:00
routes.php	Routing: Add some core routes	2012-08-12 16:52:36 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00