Thomas Mueller 7ebfcab49b Merge branch 'master' into fixing-998-master ... Conflicts: lib/helper.php		2013-01-06 12:18:21 +01:00
..
ajax	Fix "There must be a single space between the closing parenthesis and the opening brace"	2012-12-15 00:43:46 +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	javascript syntax error fixed on the way	2013-01-04 23:38:07 +01:00
l10n	[tx-robot] updated from transifex	2013-01-04 13:23:31 +01:00
templates	Merge pull request #1053 from owncloud/ocs_api	2013-01-04 17:18:58 -08:00
admin.php	add a check and a warning if setlocale is working	2012-12-19 15:10:33 +01:00
apps.php	Fixed new checkstyle issues in apps.php from build #1341.	2012-11-10 01:03:54 +01:00
help.php	fixing links docu/ ->doc/	2012-12-14 15:25:52 +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 #136 from scambra/users-fixes	2012-10-29 15:31:37 -07:00
settings.php	Merge branch 'master' into routing	2012-10-17 16:38:11 +02:00
users.php	Change old variable name $default_quota to $defaultQuota	2012-12-28 19:14:33 -05:00