Skip to content
Snippets Groups Projects
  1. May 13, 2013
  2. May 10, 2013
  3. May 09, 2013
  4. May 08, 2013
    • Sam Tuke's avatar
      Added pre_share hook · 28866de4
      Sam Tuke authored
      Switched it for post_share hook in encryption hooks
      Stop a file from being shared if the encryption procedure fails for any users
      28866de4
  5. May 07, 2013
  6. May 06, 2013
  7. May 05, 2013
  8. May 04, 2013
  9. May 03, 2013
  10. May 01, 2013
    • Sam Tuke's avatar
      Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax) · ba29147e
      Sam Tuke authored
      Renamed recovery methods in Util{} for clarity
      Added note about bug causing slow page load and redundant keypair generation
      recoveryAdmin functionality not yet complete
      ba29147e
    • Florin Peter's avatar
      fixed re-share problems · d3db4ee1
      Florin Peter authored
      d3db4ee1
    • Florin Peter's avatar
      Merge branch 'master' into files_encryption · 3579ba1e
      Florin Peter authored
      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
      3579ba1e
Loading