ISPConfig3 devel
parent: c1ff90 | patch | commitdiff
Marius Cramer
2014-01-07 ddb461f596d9f013afe4f215fabc0eabc62b1fb0
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, January 7, 2014 10:28 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, January 7, 2014 10:28 -0500
commitddb461f596d9f013afe4f215fabc0eabc62b1fb0
tree 81fe140149bd7187a3c01c1de7180128601f9f88 tree | zip | gz
parent c1ff9051ff6671895c33972342b0e71c2faee9b9 view | diff
c3d8a84506001e2cb227e5f652717a59fa4ced74 view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/de_system_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/client/lib/lang/en_client.lng
	interface/web/client/lib/lang/en_reseller.lng
	interface/web/login/lib/lang/de.lng
	interface/web/mail/form/mail_user.tform.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mail/lib/lang/en_mail_user.lng
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
	interface/web/sites/web_domain_edit.php
	server/cron_daily.php
	server/plugins-available/backup_plugin.inc.php
56 files modified
24 files renamed
8 files added
2862 ■■■■■ changed files
install/lib/install.lib.php 2 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 12 ●●●●● diff | view | raw | blame | history
install/tpl/apache_apps.vhost.master 7 ●●●●● diff | view | raw | blame | history
install/tpl/server.ini.master 2 ●●●●● diff | view | raw | blame | history
install/tpl/system.ini.master 5 ●●●●● diff | view | raw | blame | history
interface/lib/app.inc.php 27 ●●●●● diff | view | raw | blame | history
interface/lib/classes/aps_guicontroller.inc.php 1 ●●●●● diff | view | raw | blame | history
interface/lib/classes/ispcmail.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/lib/classes/session.inc.php 48 ●●●●● diff | view | raw | blame | history
interface/lib/config.inc.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 42 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_system_config.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/system_config_edit.php 7 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_server_edit.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_misc_edit.htm 24 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 40 ●●●●● diff | view | raw | blame | history
interface/web/client/domain_edit.php 3 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 22 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 50 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/client/reseller_edit.php 21 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_address.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/clients_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_address.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/resellers_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/login/index.php 57 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/ar_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/bg_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/br_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/cz_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/de.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/de_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/el_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/en.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/en_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/es_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/fi_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/fr_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/hr_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/hu_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/id_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/it_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/ja_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/nl_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/pl_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/pt_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/ro_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/ru_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/se_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/sk_login_as.lng diff | view | raw | blame | history
interface/web/login/lib/lang/tr_login_as.lng diff | view | raw | blame | history
interface/web/login/login_as.php 25 ●●●●● diff | view | raw | blame | history
interface/web/login/logout.php 7 ●●●●● diff | view | raw | blame | history
interface/web/login/templates/index.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/form/mail_user.tform.php 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_user.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_domain.tform.php 34 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_subdomain.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_domain.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_subdomain.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 5 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_subdomain.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_advanced.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_backup.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_subdomain_advanced.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_subdomain_backup.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 11 ●●●●● diff | view | raw | blame | history
interface/web/themes/blue/css/styles.css 1868 ●●●●● diff | view | raw | blame | history
interface/web/themes/blue/icons/x32_sprite.png diff | view | raw | blame | history
interface/web/themes/blue/images/ajax-loader.gif diff | view | raw | blame | history
interface/web/themes/blue/images/header_bg.png diff | view | raw | blame | history
interface/web/themes/blue/images/lists_tfoot_bg.png diff | view | raw | blame | history
interface/web/themes/blue/images/lists_thead_bg.png diff | view | raw | blame | history
interface/web/themes/blue/ispconfig_version 1 ●●●●● diff | view | raw | blame | history
interface/web/themes/blue/templates/main.tpl.htm 187 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/import_ispconfig.php 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/menu.d/import.menu.php 3 ●●●●● diff | view | raw | blame | history
server/conf/apache_apps.vhost.master 28 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 8 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 153 ●●●●● diff | view | raw | blame | history