1. 08 Sep, 2021 2 commits
  2. 07 Sep, 2021 3 commits
    • 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 !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. 03 Sep, 2021 3 commits
  4. 02 Sep, 2021 1 commit
  5. 31 Aug, 2021 1 commit
    • 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 !1516
      ef4dff9c
  6. 26 Aug, 2021 2 commits
  7. 25 Aug, 2021 1 commit
  8. 24 Aug, 2021 1 commit
  9. 23 Aug, 2021 2 commits
  10. 20 Aug, 2021 10 commits
  11. 19 Aug, 2021 5 commits
  12. 18 Aug, 2021 1 commit
  13. 17 Aug, 2021 5 commits
  14. 16 Aug, 2021 3 commits