-
- Downloads
Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command
* owncloud/master: (238 commits) Change visibility of scanner internals [tx-robot] updated from transifex remove legacy OC_Filesystem being used in a hook callback add title property to share dialog forgotten infobox messages translations reverts 188c5435 and translates only mail fix warning text and margin Adjust core apps to use "requiremin" instead of "require" Added requiremin/requiremax fields for apps [tx-robot] updated from transifex unwrapped strings fix allow resharing of files with only share permissions don't lose file size during rename drop superflous statement in phpdoc add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook [tx-robot] updated from transifex fix grammar make user_ldap fully translatable [tx-robot] updated from transifex fix typo ... Conflicts: core/register_command.php
Showing
- .jshintrc 1 addition, 0 deletions.jshintrc
- apps/files/ajax/list.php 4 additions, 1 deletionapps/files/ajax/list.php
- apps/files/ajax/upload.php 3 additions, 1 deletionapps/files/ajax/upload.php
- apps/files/appinfo/app.php 10 additions, 0 deletionsapps/files/appinfo/app.php
- apps/files/appinfo/info.xml 2 additions, 2 deletionsapps/files/appinfo/info.xml
- apps/files/appinfo/update.php 0 additions, 46 deletionsapps/files/appinfo/update.php
- apps/files/css/files.css 76 additions, 17 deletionsapps/files/css/files.css
- apps/files/index.php 51 additions, 42 deletionsapps/files/index.php
- apps/files/js/app.js 147 additions, 0 deletionsapps/files/js/app.js
- apps/files/js/breadcrumb.js 8 additions, 4 deletionsapps/files/js/breadcrumb.js
- apps/files/js/file-upload.js 6 additions, 9 deletionsapps/files/js/file-upload.js
- apps/files/js/fileactions.js 224 additions, 211 deletionsapps/files/js/fileactions.js
- apps/files/js/filelist.js 1622 additions, 1399 deletionsapps/files/js/filelist.js
- apps/files/js/files.js 289 additions, 345 deletionsapps/files/js/files.js
- apps/files/js/filesummary.js 1 addition, 1 deletionapps/files/js/filesummary.js
- apps/files/js/keyboardshortcuts.js 1 addition, 2 deletionsapps/files/js/keyboardshortcuts.js
- apps/files/js/navigation.js 122 additions, 0 deletionsapps/files/js/navigation.js
- apps/files/l10n/ar.php 3 additions, 3 deletionsapps/files/l10n/ar.php
- apps/files/l10n/ast.php 68 additions, 5 deletionsapps/files/l10n/ast.php
- apps/files/l10n/bg_BG.php 1 addition, 0 deletionsapps/files/l10n/bg_BG.php
Loading
Please register or sign in to comment