gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-01-21 82cf1e84254fc9023b4871ba40967cc4966c9452

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 21, 2015 04:13 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 21, 2015 04:13 -0500
commit	82cf1e84254fc9023b4871ba40967cc4966c9452
tree	22f0ca4a7e6c682ecf3e80afcd60889b4a5c8b44 tree \| zip \| gz
parent	f3f4aa5c5498c5af4b9248807d9720b13891b2ab view \| diff f42d9169cd94b234c13403b3bc635fffe04fb252 view \| diff

Merge branch 'renky/ispconfig3-master'

Conflicts:
	interface/web/mail/templates/mail_user_backup_list.htm

36 files modified

2 files added

	install/sql/incremental/upd_dev_collection.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	4 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/system.ini.master	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/plugin_backuplist_mail.inc.php	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/remote.d/mail.inc.php	65 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/system_config.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ar_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/bg_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/br_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/cz_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/de_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/el_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/es_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fi_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/fr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/hu_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/id_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/it_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ja_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/nl_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pl_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/pt_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ro_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/ru_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/se_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/sk_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/tr_system_config.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/system_config_sites_edit.htm	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/remote.conf.php	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_user_backup_list.htm	8 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/mail_user_backup.html	26 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/mail_user_backup_list.html	26 ●●●●● diff \| view \| raw \| blame \| history
	remoting_client/API-docs/navigation.html	2 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup.inc.php	23 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	39 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/backup_plugin.inc.php	41 ●●●●● diff \| view \| raw \| blame \| history