Merge branch 'master' into sharing_mail_notification_master
Conflicts: apps/files/index.php
Showing
- apps/files/ajax/list.php 23 additions, 20 deletionsapps/files/ajax/list.php
- apps/files/ajax/rawlist.php 43 additions, 11 deletionsapps/files/ajax/rawlist.php
- apps/files/css/files.css 31 additions, 4 deletionsapps/files/css/files.css
- apps/files/index.php 30 additions, 48 deletionsapps/files/index.php
- apps/files/js/file-upload.js 14 additions, 9 deletionsapps/files/js/file-upload.js
- apps/files/js/fileactions.js 2 additions, 3 deletionsapps/files/js/fileactions.js
- apps/files/js/filelist.js 194 additions, 9 deletionsapps/files/js/filelist.js
- apps/files/js/files.js 103 additions, 81 deletionsapps/files/js/files.js
- apps/files/l10n/es_AR.php 4 additions, 3 deletionsapps/files/l10n/es_AR.php
- apps/files/l10n/fr.php 2 additions, 2 deletionsapps/files/l10n/fr.php
- apps/files/l10n/ku_IQ.php 1 addition, 0 deletionsapps/files/l10n/ku_IQ.php
- apps/files/l10n/lt_LT.php 8 additions, 3 deletionsapps/files/l10n/lt_LT.php
- apps/files/l10n/nl.php 1 addition, 0 deletionsapps/files/l10n/nl.php
- apps/files/l10n/nn_NO.php 8 additions, 3 deletionsapps/files/l10n/nn_NO.php
- apps/files/l10n/pt_BR.php 3 additions, 3 deletionsapps/files/l10n/pt_BR.php
- apps/files/l10n/ro.php 19 additions, 18 deletionsapps/files/l10n/ro.php
- apps/files/l10n/sq.php 10 additions, 3 deletionsapps/files/l10n/sq.php
- apps/files/l10n/uk.php 1 addition, 0 deletionsapps/files/l10n/uk.php
- apps/files/lib/helper.php 116 additions, 0 deletionsapps/files/lib/helper.php
- apps/files/templates/index.php 14 additions, 21 deletionsapps/files/templates/index.php
Loading
Please register or sign in to comment