ISPConfig3 devel
parent: e97f84 | patch | commitdiff
Marius Cramer
2015-06-05 8cb6f8ffd31ec33479c9696c5263b7a8e27fe273
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, June 5, 2015 04:40 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Friday, June 5, 2015 04:40 -0400
commit8cb6f8ffd31ec33479c9696c5263b7a8e27fe273
tree 113052ec9af018f73b19ec89e0ad533878ba0315 tree | zip | gz
parent e97f841c7c987e3b4ef26ce87665f8857612ff4d view | diff
4863035ea5677eb73a7d75d95157d990387798ab view | diff 
Merge branch 'stable-3.0.5'

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/classes/tform.inc.php
	interface/lib/config.inc.php
	interface/web/admin/server_config_edit.php
	interface/web/themes/blue/ispconfig_version
	interface/web/tools/import_plesk.php
	interface/web/tools/resync.php
	interface/web/vm/openvz_action.php
21 files modified
202 ■■■■■ changed files
interface/lib/classes/auth.inc.php 50 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 14 ●●●●● diff | view | raw | blame | history
interface/lib/lang/de.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_add.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_complete.php 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_edit.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/language_import.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/remote_action_ispcupdate.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/remote_action_osupdate.php 9 ●●●●● diff | view | raw | blame | history
interface/web/admin/server_config_edit.php 10 ●●●●● diff | view | raw | blame | history
interface/web/client/client_message.php 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 10 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/ar_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_shell_user.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/form.tpl.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/tools/dns_import_tupa.php 7 ●●●●● diff | view | raw | blame | history
interface/web/tools/import_ispconfig.php 9 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync.php 11 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_action.php 9 ●●●●● diff | view | raw | blame | history
server/plugins-available/shelluser_base_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history