Diffusion In-Portal rINP16389

Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.
rINP16389
Actions

Tags

None

Subscribers

Description

Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.x@15659".

restored changes, that were lost during inaccurate merge conflict resolution
other changes were already restored in: 15680, 15902, 16323

Details

Committed

alex	Nov 6 2016, 3:03 PM

Parents

rINP16388: Fixes INP-1579 - Remove "ItemSQLs" from unit configs

Branches

Unknown

Tags

Unknown

Build Status

Buildable 480
Build 480: Notify Jenkins

Event Timeline

alex committed rINP16389: Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3..Nov 6 2016, 3:03 PM

Harbormaster completed building B480: rINP16389: Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3..Nov 6 2016, 3:03 PM

Build #35 finished with UNSTABLE status: http://ci.in-portal.org/job/in-portal-53x/35/

Checkstyle Warnings: 203

Changes (9)

				Path	Packages
	M			in-portal/branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php
	M			in-portal/branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl
	M			in-portal/branches/5.3.x/core/kernel/utility/logger.php
	M			in-portal/branches/5.3.x/core/units/categories/categories_config.php
	M			in-portal/branches/5.3.x/core/units/email_templates/email_templates_config.php
	M			in-portal/branches/5.3.x/core/units/logs/system_logs/system_logs_config.php
	M			in-portal/branches/5.3.x/core/units/skins/skins_config.php
	M			in-portal/branches/5.3.x/core/units/structure/structure_config.php
	M			in-portal/branches/5.3.x/core/units/visits/visits_config.php

rINP16389

in-portal/branches/5.3.x/admin/system_presets/simple/email_templates_email-template.php

Loading...

in-portal/branches/5.3.x/core/admin_templates/regional/phrases_edit.tpl

Loading...

in-portal/branches/5.3.x/core/kernel/utility/logger.php

Loading...

in-portal/branches/5.3.x/core/units/categories/categories_config.php

Loading...

in-portal/branches/5.3.x/core/units/email_templates/email_templates_config.php

Loading...

in-portal/branches/5.3.x/core/units/logs/system_logs/system_logs_config.php

Loading...

in-portal/branches/5.3.x/core/units/skins/skins_config.php

Loading...

in-portal/branches/5.3.x/core/units/structure/structure_config.php

Loading...

in-portal/branches/5.3.x/core/units/visits/visits_config.php

Loading...