Index: branches/1.2.x/install/install_schema.sql =================================================================== diff -u -N -r14250 -r14579 --- branches/1.2.x/install/install_schema.sql (.../install_schema.sql) (revision 14250) +++ branches/1.2.x/install/install_schema.sql (.../install_schema.sql) (revision 14579) @@ -1,5 +1,3 @@ -# place here only sql queries, that were executed on live AND dev sites !!! - CREATE TABLE Widgets ( WidgetId int(11) NOT NULL AUTO_INCREMENT, Title varchar(255) NOT NULL DEFAULT '', @@ -17,11 +15,3 @@ PRIMARY KEY (WidgetId) ); -# ===== SQLs above this line already on LIVE ================================================================================================ - -# place here only sql queries, that were executed on dev site !!! - - -# ===== SQLs above this line already on DEV ======================================================================================================== - -# place here only sql queries, that were executed on prod server !!! Index: branches/1.2.x/install/upgrades.sql =================================================================== diff -u -N -r14562 -r14579 --- branches/1.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14562) +++ branches/1.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14579) @@ -42,4 +42,10 @@ # ===== v 1.1.2-RC1 ===== -# ===== v 1.1.2 ===== \ No newline at end of file +# ===== v 1.1.2 ===== + +# ===== v 1.1.3-B1 ===== + +# ===== v 1.1.3-B2 ===== + +# ===== v 1.1.3 ===== \ No newline at end of file Index: branches/1.2.x/units/widgets/widgets_config.php =================================================================== diff -u -N -r14562 -r14579 --- branches/1.2.x/units/widgets/widgets_config.php (.../widgets_config.php) (revision 14562) +++ branches/1.2.x/units/widgets/widgets_config.php (.../widgets_config.php) (revision 14579) @@ -194,24 +194,24 @@ 'Default' => Array ( // 'Icons' => Array ('default' => 'icon16_custom.gif'), 'Fields' => Array ( - 'WidgetId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Title' => Array ('title' => 'la_col_Name', 'data_block' => 'grid_custom_td'), - 'Image' => Array ('title' => 'la_col_Image', 'data_block' => 'grid_image_td'), - 'Type' => Array ('title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'), - 'Good' => Array ('title' => 'la_col_Good'), - 'Qty' => Array ('title' => 'la_col_Qty', 'header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'), - 'Email' => Array ('title' => 'la_col_Email'), - 'Phone' => Array ('title' => 'la_col_Phone'), - 'CreatedOn' => Array ('title' => 'la_col_CreatedOn', 'filter_block' => 'grid_date_range_filter'), - 'Description' => Array ('title' => 'la_col_Description'), - 'VirtualActionField' => Array ('title' => 'la_col_Action', 'data_block' => 'grid_delete_td'), + 'WidgetId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Title' => Array ('title' => 'column:la_fld_Name', 'data_block' => 'grid_custom_td'), + 'Image' => Array ('data_block' => 'grid_image_td'), + 'Type' => Array ('filter_block' => 'grid_options_filter'), + 'Status' => Array ('filter_block' => 'grid_options_filter'), + 'Good' => Array ('filter_block' => 'grid_like_filter'), + 'Qty' => Array ('header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'), + 'Email' => Array ('filter_block' => 'grid_like_filter'), + 'Phone' => Array ('filter_block' => 'grid_like_filter'), + 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'), + 'Description' => Array ('filter_block' => 'grid_like_filter'), + 'VirtualActionField' => Array ('title' => 'column:la_fld_Action', 'data_block' => 'grid_delete_td'), ), ), ), - 'ConfigMapping' => Array ( - 'PerPage' => 'Comm_Perpage_Widgets', - 'ShortListPerPage' => 'Comm_Perpage_Widgets_Short', - ), + /*'ConfigMapping' => Array ( + 'PerPage' => 'Perpage_Widgets', + 'ShortListPerPage' => 'Perpage_Widgets_Short', + ),*/ ); Index: branches/1.2.x/install/english.lang =================================================================== diff -u -N -r14250 -r14579 --- branches/1.2.x/install/english.lang (.../english.lang) (revision 14250) +++ branches/1.2.x/install/english.lang (.../english.lang) (revision 14579) @@ -1,10 +1,8 @@ - - m/d/Yg:i Am/d/Yg:i:s A.,utf-82 + + - R29vZA== - UGhvbmU= RGF0YSBmaWxl - R29vZA== + R29vZA== Q3VzdG9t RGVmYXVsdA== V2lkZ2V0cw== Index: branches/1.2.x/admin_templates/widgets/widget_edit.tpl =================================================================== diff -u -N -r14562 -r14579 --- branches/1.2.x/admin_templates/widgets/widget_edit.tpl (.../widget_edit.tpl) (revision 14562) +++ branches/1.2.x/admin_templates/widgets/widget_edit.tpl (.../widget_edit.tpl) (revision 14579) @@ -67,23 +67,23 @@ - - - - - + + + + + - - - + + + - - + +
Index: branches/1.2.x/install/install_data.sql =================================================================== diff -u -N -r14250 -r14579 --- branches/1.2.x/install/install_data.sql (.../install_data.sql) (revision 14250) +++ branches/1.2.x/install/install_data.sql (.../install_data.sql) (revision 14579) @@ -1,19 +1,7 @@ -# place here only sql queries, that were executed on live AND dev sites !!! - INSERT INTO Permissions VALUES(DEFAULT, 'custom.view', 11, 1, 1, 0); INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.delete', 11, 1, 1, 0); INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.edit', 11, 1, 1, 0); INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.add', 11, 1, 1, 0); INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.view', 11, 1, 1, 0); -INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL); - - -# ===== SQLs above this line already on LIVE ================================================================================================ - -# place here only sql queries, that were executed on dev site !!! - - -# ===== SQLs above this line already on DEV ======================================================================================================== - -# place here only sql queries, that were executed on prod server !!! +INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL, NULL); Index: branches/1.2.x/install/upgrades.php =================================================================== diff -u -N -r14562 -r14579 --- branches/1.2.x/install/upgrades.php (.../upgrades.php) (revision 14562) +++ branches/1.2.x/install/upgrades.php (.../upgrades.php) (revision 14579) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.2-B1'), '1.1.2-RC1' => Array ('Core' => '5.1.2-RC1'), '1.1.2' => Array ('Core' => '5.1.2'), + '1.1.3-B1' => Array ('Core' => '5.1.3-B1'), + '1.1.3-B2' => Array ('Core' => '5.1.3-B2'), + '1.1.3' => Array ('Core' => '5.1.3'), ); } }