Thomas Müller f950ce82ae Merge branch 'master' into mobile-style ... Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php		2014-01-23 00:39:11 +01:00
..
filetemplates	adding file templates for ods, odt and odp	2013-08-18 21:11:11 +02:00
403.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
404.php	Allow apps to have own 404 content, closes #3225	2013-07-29 16:54:19 +03:00
altmail.php	unify translation string - less work for the translators	2013-11-21 09:58:35 +01:00
error.php	tixing width and position of wider error messages	2013-08-16 00:56:09 +02:00
filepicker.html	Don't set image path in template.	2013-05-20 09:44:31 +02:00
installation.php	Indicate password strength using strengthify	2014-01-15 11:10:12 +01:00
layout.base.php	restrict zooming on mobile devices for the publicly accessible, optimized pages	2014-01-17 14:41:05 +01:00
layout.guest.php	restrict zooming on mobile devices for the publicly accessible, optimized pages	2014-01-17 14:41:05 +01:00
layout.user.php	Merge pull request #6262 from nickvergessen/issue/4375	2013-12-20 02:27:52 -08:00
login.php	Fix resize issue for trash button in chrome and overflowing spinner in .update class	2013-11-28 21:36:43 +01:00
mail.php	fix email template l10n, emphasize filename	2014-01-09 10:54:23 +01:00
message.html	fix message dialog titles in IE8	2013-10-23 10:58:25 +02:00
singleuser.user.php	Add template for single user mode message	2013-11-25 15:59:37 +01:00
tags.html	JS version of the OCP\ITags interface	2013-10-04 17:21:52 +02:00
update.admin.php	Changed update message to be more instructive, changed update style to be less aggresive	2013-10-24 19:21:40 +02:00
update.user.php	Changed update message to be more instructive, changed update style to be less aggresive	2013-10-24 19:21:40 +02:00