Skip to content
  1. Sep 08, 2021
  2. Sep 07, 2021
    • Marius Burkard's avatar
      Merge branch '5732-email-backup' into 'develop' · ef73cc67
      Marius Burkard authored
      Limit email backup tab through client limits (#5732)
      
      Closes #5732
      
      See merge request ispconfig/ispconfig3!1250
      ef73cc67
    • Marius Burkard's avatar
      Fixed syntax · 456db475
      Marius Burkard authored
      456db475
    • Marius Burkard's avatar
      Merge branch 'develop' into '5732-email-backup' · c7ee6183
      Marius Burkard authored
      # Conflicts:
      #   install/sql/incremental/upd_dev_collection.sql
      #   install/sql/ispconfig3.sql
      #   interface/web/client/form/client.tform.php
      #   interface/web/client/form/client_template.tform.php
      #   interface/web/client/form/reseller.tform.php
      #   interface/web/client/lib/lang/br_client.lng
      #   interface/web/client/lib/lang/br_client_template.lng
      #   interface/web/client/lib/lang/br_reseller.lng
      #   interface/web/client/templates/client_edit_limits.htm
      #   interface/web/client/templates/client_template_edit_limits.htm
      #   interface/web/client/templates/reseller_edit_limits.htm
      c7ee6183
  3. Sep 06, 2021
  4. Sep 03, 2021
  5. Sep 02, 2021
  6. Aug 31, 2021
    • Marius Burkard's avatar
      Merge branch... · ef4dff9c
      Marius Burkard authored
      Merge branch '6221-installer-doesn-t-account-for-dangling-symlinks-of-letsencrypt-hook-files' into 'develop'
      
      Resolve "installer doesn't account for dangling symlinks of letsencrypt hook files"
      
      Closes #6221
      
      See merge request ispconfig/ispconfig3!1516
      ef4dff9c
  7. Aug 26, 2021
  8. Aug 25, 2021
  9. Aug 24, 2021
  10. Aug 23, 2021
  11. Aug 20, 2021
  12. Aug 19, 2021
  13. Aug 18, 2021
  14. Aug 17, 2021