Florin Peter
3579ba1e41
Merge branch 'master' into files_encryption
Conflicts: apps/user_ldap/l10n/nn_NO.php core/l10n/es.php core/l10n/et_EE.php core/l10n/ja_JP.php core/l10n/nn_NO.php l10n/ca/core.po l10n/ca/files_external.po l10n/ca/settings.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_encryption.po l10n/cy_GB/files_external.po l10n/cy_GB/files_sharing.po l10n/cy_GB/files_trashbin.po l10n/cy_GB/lib.po l10n/cy_GB/settings.po l10n/de_DE/core.po l10n/es/core.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/et_EE/user_ldap.po l10n/gl/core.po l10n/it/core.po l10n/ja_JP/core.po l10n/ja_JP/settings.po l10n/nn_NO/core.po l10n/nn_NO/user_ldap.po l10n/pt_BR/core.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/zh_TW/files_sharing.po settings/l10n/et_EE.php |
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 年前 |