Merge branch 'master' into files_encryption_check_private_key
Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
Showing
- 3rdparty 1 addition, 1 deletion3rdparty
- apps/files/css/files.css 16 additions, 5 deletionsapps/files/css/files.css
- apps/files/js/filelist.js 1 addition, 1 deletionapps/files/js/filelist.js
- apps/files/templates/part.list.php 2 additions, 2 deletionsapps/files/templates/part.list.php
- apps/files_encryption/appinfo/app.php 33 additions, 28 deletionsapps/files_encryption/appinfo/app.php
- apps/files_encryption/hooks/hooks.php 7 additions, 4 deletionsapps/files_encryption/hooks/hooks.php
- apps/files_encryption/lib/crypt.php 1 addition, 25 deletionsapps/files_encryption/lib/crypt.php
- apps/files_encryption/lib/proxy.php 2 additions, 0 deletionsapps/files_encryption/lib/proxy.php
- apps/files_encryption/lib/util.php 57 additions, 49 deletionsapps/files_encryption/lib/util.php
- apps/files_encryption/tests/crypt.php 0 additions, 18 deletionsapps/files_encryption/tests/crypt.php
- apps/files_encryption/tests/util.php 27 additions, 4 deletionsapps/files_encryption/tests/util.php
- apps/files_external/ajax/addRootCertificate.php 4 additions, 0 deletionsapps/files_external/ajax/addRootCertificate.php
- apps/files_external/js/settings.js 11 additions, 8 deletionsapps/files_external/js/settings.js
- core/css/multiselect.css 93 additions, 72 deletionscore/css/multiselect.css
- core/css/styles.css 26 additions, 3 deletionscore/css/styles.css
- core/js/multiselect.js 2 additions, 2 deletionscore/js/multiselect.js
- cron.php 63 additions, 57 deletionscron.php
- index.php 11 additions, 2 deletionsindex.php
- l10n/af_ZA/core.po 2 additions, 2 deletionsl10n/af_ZA/core.po
- l10n/af_ZA/lib.po 28 additions, 28 deletionsl10n/af_ZA/lib.po
Loading
Please register or sign in to comment