1. 19 Nov, 2015 1 commit
    • Dominik's avatar
      Added possibility to delete backups · 634132a0
      Dominik authored
      Conflicts:
      	interface/lib/classes/remoting.inc.php
      	interface/web/mail/templates/mail_user_backup_list.htm
      	interface/web/sites/lib/lang/en_web_backup_list.lng
      	interface/web/sites/lib/lang/es_web_backup_list.lng
      	interface/web/sites/lib/lang/tr_web_backup_list.lng
      	server/plugins-available/backup_plugin.inc.php
      634132a0
  2. 17 Nov, 2015 5 commits
  3. 16 Nov, 2015 1 commit
  4. 15 Nov, 2015 12 commits
  5. 14 Nov, 2015 9 commits
  6. 12 Nov, 2015 2 commits
  7. 11 Nov, 2015 2 commits
  8. 10 Nov, 2015 2 commits
  9. 09 Nov, 2015 1 commit
  10. 06 Nov, 2015 2 commits
  11. 29 Oct, 2015 1 commit
  12. 23 Oct, 2015 2 commits
    • Marius Cramer's avatar
      Merge branch 'master' into 'master' · 831dd0a0
      Marius Cramer authored
      Replace fastcgi_pass unix:/var/run/php5-fpm.sock; with fastcgi_pass unix:{fpm_so…
      
      …cket}; in phpmyadmin and squirrelmail blocks, as they are considered apps and should use the same (apps.sock) listener.
      
      See merge request !236
      831dd0a0
    • Marius Cramer's avatar
      Merge branch 'master' into 'master' · 3ff9d214
      Marius Cramer authored
      FS#3251 - Add fcgi parameters to apps vhost
      
      See merge request !237
      3ff9d214