You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Florin Peter 3579ba1e41 Merge branch 'master' into files_encryption 11 年之前
..
ajax fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 11 年之前
css convert js call to css rule 11 年之前
img new settings menu for new design 11 年之前
js revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 年之前
l10n Merge branch 'master' into files_encryption 11 年之前
templates revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 年之前
admin.php Merge branch 'master' into fixing-1354-master 11 年之前
apps.php [core] From echo to p 11 年之前
help.php Check if user is admin - bool 11 年之前
languageCodes.php some more new languages recently introduced to ownCloud 11 年之前
personal.php revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now 11 年之前
routes.php Whitespace fixes 11 年之前
settings.php Enhanced auth is totally unmaintained and broken 11 年之前
users.php Style cleanup settings 11 年之前