Bart Visscher 6b061c236d Merge branch 'master' into type-hinting ... Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php		2014-03-31 21:38:54 +02:00
..
admin	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00
ajax	use \OC_Mail::validateAddress() to validate the email address - fixes #7862	2014-03-24 15:35:07 +01:00
changepassword	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
css	remove additional radio button width declaration	2014-03-27 17:13:12 +01:00
img	remove unused log icon	2014-01-15 15:48:42 +01:00
js	Use $.hide() instead of .hidden for now	2014-03-12 15:42:29 +01:00
l10n	[tx-robot] updated from transifex	2014-03-30 01:55:42 -04:00
templates	Merge branch 'master' of https://github.com/owncloud/core into last_cron_log	2014-03-21 20:23:31 +01:00
admin.php	Merge pull request #7107 from owncloud/load-apps-proper-master	2014-03-28 10:33:55 +01:00
apps.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
help.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
languageCodes.php	remove ru_RU - fixes #3135	2013-08-17 11:43:37 +02:00
personal.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
routes.php	update type hint in PHPDoc	2014-03-25 22:59:42 +01:00
settings.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00
users.php	killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()	2014-03-25 17:42:41 +01:00