Merge commit 'v7.10.22' into WebGUI8

2011-10-31 20:13:01 -07:00 · 2011-10-31 20:13:01 -07:00 · 431cd280a4
commit 431cd280a4
parent 4855816a29 288624338c
92 changed files with 3543 additions and 313 deletions
--- a/share/create.sql
+++ b/share/create.sql
--- a/share/upgrades/7.10.22-8.0.0/addAssetEditTemplate.pl
+++ b/share/upgrades/7.10.22-8.0.0/addAssetEditTemplate.pl
--- a/share/upgrades/7.10.22-8.0.0/addI18nMacroAlias.pl
+++ b/share/upgrades/7.10.22-8.0.0/addI18nMacroAlias.pl
--- a/share/upgrades/7.10.22-8.0.0/addMaintenancePageToConfig.pl
+++ b/share/upgrades/7.10.22-8.0.0/addMaintenancePageToConfig.pl
--- a/share/upgrades/7.10.22-8.0.0/addNewAdminConsole.pl
+++ b/share/upgrades/7.10.22-8.0.0/addNewAdminConsole.pl
--- a/share/upgrades/7.10.22-8.0.0/addTemplateToolkit.pl
+++ b/share/upgrades/7.10.22-8.0.0/addTemplateToolkit.pl
--- a/share/upgrades/7.10.22-8.0.0/admin_console.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/admin_console.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/admin_progress_bar.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/admin_progress_bar.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/default_page.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/default_page.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/documentation_free-documentation.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/documentation_free-documentation.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/facebook_auth.sql
+++ b/share/upgrades/7.10.22-8.0.0/facebook_auth.sql
--- a/share/upgrades/7.10.22-8.0.0/migrateToNewCache.pl
+++ b/share/upgrades/7.10.22-8.0.0/migrateToNewCache.pl
--- a/share/upgrades/7.10.22-8.0.0/moveFileLocations.pl
+++ b/share/upgrades/7.10.22-8.0.0/moveFileLocations.pl
--- a/share/upgrades/7.10.22-8.0.0/moveMaintenance.pl
+++ b/share/upgrades/7.10.22-8.0.0/moveMaintenance.pl
--- a/share/upgrades/7.10.22-8.0.0/moveRequiredProfileFields.pl
+++ b/share/upgrades/7.10.22-8.0.0/moveRequiredProfileFields.pl
--- a/share/upgrades/7.10.22-8.0.0/one_over_three.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/one_over_three.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/one_over_two.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/one_over_two.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/pbtmplblankstyle000001.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/pbtmplblankstyle000001.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/plainblacknews.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/plainblacknews.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/removeAdminBar.pl
+++ b/share/upgrades/7.10.22-8.0.0/removeAdminBar.pl
--- a/share/upgrades/7.10.22-8.0.0/removeFilePile.pl
+++ b/share/upgrades/7.10.22-8.0.0/removeFilePile.pl
--- a/share/upgrades/7.10.22-8.0.0/removeMobileUserAgents.pl
+++ b/share/upgrades/7.10.22-8.0.0/removeMobileUserAgents.pl
--- a/share/upgrades/7.10.22-8.0.0/removeURLHandlers.pl
+++ b/share/upgrades/7.10.22-8.0.0/removeURLHandlers.pl
--- a/share/upgrades/7.10.22-8.0.0/right_column.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/right_column.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/root_import_adminconsole_admin-interface.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/root_import_adminconsole_admin-interface.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/root_import_adminconsole_edit-asset.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/root_import_adminconsole_edit-asset.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/root_import_default-asset-subscription.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/root_import_default-asset-subscription.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/root_import_default-facebook-choose-username.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/root_import_default-facebook-choose-username.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/root_import_richedit.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/root_import_richedit.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/side_by_side.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/side_by_side.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/style-underground.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/style-underground.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/three-columns.wgpkg
+++ b/share/upgrades/7.10.22-8.0.0/three-columns.wgpkg
--- a/share/upgrades/7.10.22-8.0.0/zzz_renameAccountMacroTemplateVariables.pl
+++ b/share/upgrades/7.10.22-8.0.0/zzz_renameAccountMacroTemplateVariables.pl
--- a/share/upgrades/7.10.22-8.0.0/zzz_renameAdminToggleMacroTemplateVariables.pl
+++ b/share/upgrades/7.10.22-8.0.0/zzz_renameAdminToggleMacroTemplateVariables.pl
--- a/share/upgrades/7.10.22-8.0.0/zzz_renameFormBuilderTemplateVars.pl
+++ b/share/upgrades/7.10.22-8.0.0/zzz_renameFormBuilderTemplateVars.pl