gitlabFork/ISPConfig3.git - Solinfo Gitblit

Marius Cramer

2015-03-31 cab4ba3af9dfd02c303d3b4714700269133f35bf

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, March 31, 2015 05:35 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Tuesday, March 31, 2015 05:35 -0400
commit	cab4ba3af9dfd02c303d3b4714700269133f35bf
tree	b55aa714c3af971949d5f9534b5d9610130775c9 tree \| zip \| gz
parent	f898793063332615f9e49383ee39a88284d281f6 view \| diff d4e30e0b66ab86e16856bd3e5cf5fca299002918 view \| diff

Merge branch 'Quest/ispconfig3-master'

Conflicts:
	install/sql/incremental/upd_dev_collection.sql

28 files modified

50 files added

	install/apps/metronome-init	75 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_auth_external/authenticate_isp.sh	38 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_auth_external/db_auth.php	58 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_auth_external/db_conf.inc.php	6 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_auth_external/db_isuser.php	37 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_auth_external/mod_auth_external.lua	118 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_discoitems.lua	24 ●●●●● diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/icons/status_away.png	diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/icons/status_chat.png	diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/icons/status_dnd.png	diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/icons/status_offline.png	diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/icons/status_online.png	diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/icons/status_xa.png	diff \| view \| raw \| blame \| history
	install/apps/metronome_libs/mod_webpresence/mod_webpresence.lua	118 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/conf/debian60.conf.php	4 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/debian60.lib.php	4 ●●●●● diff \| view \| raw \| blame \| history
	install/install.php	19 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	123 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_dev_collection.sql	94 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	96 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/metronome_conf_global.master	65 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/metronome_conf_main.master	3 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/metronome_conf_ssl.master	48 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/server.ini.master	9 ●●●●● diff \| view \| raw \| blame \| history
	install/update.php	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/validate_client.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server.tform.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_config.tform.php	80 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_config.lng	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/lang/en_server_list.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/list/server.list.php	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_config_xmpp_edit.htm	73 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_edit_services.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/server_list.htm	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client.tform.php	99 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/client_template.tform.php	99 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/form/reseller.tform.php	99 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client.lng	19 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client_template.lng	17 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_reseller.lng	18 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_edit_limits.htm	64 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_template_edit_limits.htm	65 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/reseller_edit_limits.htm	64 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/xmpp_domain_muc.js	26 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/xmpp_domain_registration.js	29 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/xmpp_domain.tform.php	432 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/xmpp_user.tform.php	127 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_xmpp_domain.lng	62 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_xmpp_domain_admin_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_xmpp_domain_list.lng	7 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_xmpp_user.lng	15 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_xmpp_user_list.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/module.conf.php	24 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/xmpp_domain.list.php	109 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/xmpp_user.list.php	62 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_domain_admin_list.htm	60 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_domain_edit.htm	130 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_domain_edit_modules.htm	59 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_domain_edit_muc.htm	91 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_domain_edit_ssl.htm	100 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_domain_list.htm	74 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_user_edit.htm	47 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/xmpp_user_list.htm	74 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/xmpp_domain_del.php	93 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/xmpp_domain_edit.php	543 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/xmpp_domain_list.php	28 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/xmpp_user_del.php	72 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/xmpp_user_edit.php	172 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/xmpp_user_list.php	39 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/metronome_conf_global.master	48 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/metronome_conf_host.master	135 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/metronome_conf_main.master	3 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/metronome_conf_ssl.master	72 ●●●●● diff \| view \| raw \| blame \| history
	server/conf/metronome_conf_status.master	12 ●●●●● diff \| view \| raw \| blame \| history
	server/mods-available/xmpp_module.inc.php	130 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/xmpp_plugin.inc.php	397 ●●●●● diff \| view \| raw \| blame \| history
	server/server.sh	1 ●●●●● diff \| view \| raw \| blame \| history