Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/ajax/upload.php apps/files/js/files.js		2013-01-18 23:22:34 +01:00
..
ajax	Spaces to tabs	2013-01-16 18:09:16 +01:00
css	Merge branch 'master' into ocs_api	2012-12-31 15:47:15 +00:00
img	fix the broken image path on the apps page	2012-11-08 13:34:00 +01:00
js	Merge branch 'master' into fixing-998-master	2013-01-18 23:22:34 +01:00
l10n	[tx-robot] updated from transifex	2013-01-18 00:04:36 +01:00
templates	Merge branch 'master' into fixing-998-master	2013-01-18 23:22:34 +01:00
admin.php	Add security section to admin menu	2013-01-11 14:18:51 +01:00
apps.php	Fixed new checkstyle issues in apps.php from build #1341.	2012-11-10 01:03:54 +01:00
help.php	Check if user is admin - bool	2013-01-14 19:45:17 +01:00
languageCodes.php	Style: Remove all the dangling white spaces	2012-11-04 22:16:04 +01:00
oauth.php	API: Add callback_fail, add OC_OAuth::init and bespoke request token method	2012-09-04 11:10:42 +00:00
personal.php	moving storage calculation code to OC_Helper::getStorageInfo()	2013-01-02 14:35:45 +01:00
routes.php	Merge pull request #1157 owncloud/move-OpenID	2013-01-11 22:57:40 +01:00
settings.php	Enhanced auth is totally unmaintained and broken	2013-01-14 21:39:49 +01:00
users.php	Spaces to tabs	2013-01-16 18:09:16 +01:00