gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-11-20 8938c852f00cbd4aa62772a2bafd528c71180772

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Friday, November 20, 2015 02:23 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Friday, November 20, 2015 02:23 -0500
commit	8938c852f00cbd4aa62772a2bafd528c71180772
tree	fd8198b1ae9f5df1611942324d3c496aa0ded63c tree \| zip \| gz
parent	a5714c39c76695af5b2220e93a4ac3121a9d83a1 view \| diff aa365c418c88ad97ed0e9f0ffa4405fcda717715 view \| diff

Merge branch 'master' into 'master'

Master

Added possibility to delete backups manually

See merge request !246

51 files modified

	interface/lib/classes/plugin_backuplist.inc.php	19 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/plugin_backuplist_mail.inc.php	15 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remote.d/mail.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remote.d/sites.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ja_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_user_backup_list.htm	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_web_backup_list.lng	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_web_backup_list.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_web_backup_list.lng	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_backup_list.htm	1 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	14 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/backup_plugin.inc.php	131 ●●●●● diff \| view \| raw \| blame \| history