Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c3d15bcfbe764b1f0b144e9b799794943604cd81 https://github.com/phpmyadmin/phpmyadmin/commit/c3d15bcfbe764b1f0b144e9b7997... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M libraries/Theme.php M themes/sprites.css.php Log Message: ----------- Do not rely on session variable, use passed one Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b805b1d0c22ec9bd27795785c404947678c2318b https://github.com/phpmyadmin/phpmyadmin/commit/b805b1d0c22ec9bd27795785c404... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M scripts/generate-sprites M test/classes/ThemeTest.php M themes/original/img/sprites.png M themes/original/sprites.lib.php M themes/pmahomme/img/sprites.png M themes/pmahomme/sprites.lib.php M themes/sprites.css.php Log Message: ----------- Let the sprites.lib.php define array instead of function This allows us to test this code path without having duplicate function names. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 971e40d839621619ddbf18c6dd018d74a8e087f9 https://github.com/phpmyadmin/phpmyadmin/commit/971e40d839621619ddbf18c6dd01... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M js/openlayers/img/cloud-popup-relative.png M js/openlayers/img/measuring-stick-off.png M js/openlayers/img/measuring-stick-on.png M js/openlayers/img/panning-hand-off.png M js/openlayers/img/panning-hand-on.png M js/openlayers/img/zoom-plus-mini.png M js/openlayers/img/zoom-world-mini.png M js/openlayers/img/zoombar.png M js/openlayers/theme/default/img/add_point_off.png M js/openlayers/theme/default/img/add_point_on.png M js/openlayers/theme/default/img/draw_line_off.png M js/openlayers/theme/default/img/draw_line_on.png M js/openlayers/theme/default/img/draw_point_off.png M js/openlayers/theme/default/img/draw_point_on.png M js/openlayers/theme/default/img/draw_polygon_off.png M js/openlayers/theme/default/img/draw_polygon_on.png M js/openlayers/theme/default/img/editing_tool_bar.png M js/openlayers/theme/default/img/move_feature_off.png M js/openlayers/theme/default/img/move_feature_on.png M js/openlayers/theme/default/img/navigation_history.png M js/openlayers/theme/default/img/pan-panel.png M js/openlayers/theme/default/img/pan_off.png M js/openlayers/theme/default/img/pan_on.png M js/openlayers/theme/default/img/panning-hand-off.png M js/openlayers/theme/default/img/panning-hand-on.png M js/openlayers/theme/default/img/remove_point_off.png M js/openlayers/theme/default/img/remove_point_on.png M js/openlayers/theme/default/img/ruler.png M js/openlayers/theme/default/img/view_next_off.png M js/openlayers/theme/default/img/view_previous_off.png M js/openlayers/theme/default/img/zoom-panel-NOALPHA.png M js/openlayers/theme/default/img/zoom-panel.png M themes/original/img/b_column_add.png M themes/original/img/b_edit.png M themes/original/img/b_favorite.png M themes/original/img/b_find_replace.png M themes/original/img/b_index_add.png M themes/original/img/b_inline_edit.png M themes/original/img/b_no_favorite.png M themes/original/img/b_save.png M themes/original/img/b_table_add.png M themes/original/img/b_undo.png M themes/original/img/b_usrdrop.png M themes/original/img/b_usredit.png M themes/original/img/b_view_add.png M themes/original/img/b_views.png M themes/original/img/bd_deltbl.png M themes/original/img/console.png M themes/original/img/logo_left.png M themes/original/img/new_struct.png M themes/original/img/new_struct_hovered.png M themes/original/img/normalize.png M themes/original/img/s_lang.png M themes/original/img/s_rights.png M themes/original/img/s_top.png M themes/original/img/sprites.png M themes/original/img/vertical_line.png M themes/original/img/zoom-world-mini.png M themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png M themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png M themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M themes/original/jquery/images/ui-icons_222222_256x240.png M themes/original/jquery/images/ui-icons_2e83ff_256x240.png M themes/original/jquery/images/ui-icons_454545_256x240.png M themes/original/jquery/images/ui-icons_888888_256x240.png M themes/original/jquery/images/ui-icons_cd0a0a_256x240.png M themes/original/screen.png M themes/pmahomme/img/b_column_add.png M themes/pmahomme/img/b_favorite.png M themes/pmahomme/img/b_find_replace.png M themes/pmahomme/img/b_move.png M themes/pmahomme/img/b_no_favorite.png M themes/pmahomme/img/b_plus.png M themes/pmahomme/img/b_sqldoc.png M themes/pmahomme/img/b_undo.png M themes/pmahomme/img/bd_deltbl.png M themes/pmahomme/img/bd_drop.png M themes/pmahomme/img/bd_empty.png M themes/pmahomme/img/bd_export.png M themes/pmahomme/img/bd_firstpage.png M themes/pmahomme/img/bd_ftext.png M themes/pmahomme/img/bd_index.png M themes/pmahomme/img/bd_lastpage.png M themes/pmahomme/img/bd_primary.png M themes/pmahomme/img/bd_select.png M themes/pmahomme/img/bd_spatial.png M themes/pmahomme/img/bd_unique.png M themes/pmahomme/img/console.png M themes/pmahomme/img/left_nav_bg.png M themes/pmahomme/img/logo_left.png M themes/pmahomme/img/new_struct.png M themes/pmahomme/img/new_struct_hovered.png M themes/pmahomme/img/normalize.png M themes/pmahomme/img/pmd/2leftarrow.png M themes/pmahomme/img/pmd/2rightarrow.png M themes/pmahomme/img/pmd/Header.png M themes/pmahomme/img/pmd/Header_Linked.png M themes/pmahomme/img/pmd/ang_direct.png M themes/pmahomme/img/pmd/exitFullscreen.png M themes/pmahomme/img/pmd/help.png M themes/pmahomme/img/pmd/help_relation.png M themes/pmahomme/img/pmd/left_panel_butt.png M themes/pmahomme/img/pmd/relation.png M themes/pmahomme/img/pmd/save_as.png M themes/pmahomme/img/pmd/small_tab.png M themes/pmahomme/img/pmd/toggle_lines.png M themes/pmahomme/img/pmd/top_panel.png M themes/pmahomme/img/s_top.png M themes/pmahomme/img/select_bg.png M themes/pmahomme/img/sprites.png M themes/pmahomme/img/toggle-ltr.png M themes/pmahomme/img/toggle-rtl.png M themes/pmahomme/img/vertical_line.png M themes/pmahomme/img/zoom-world-mini.png M themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M themes/pmahomme/jquery/images/ui-icons_222222_256x240.png M themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png M themes/pmahomme/jquery/images/ui-icons_454545_256x240.png M themes/pmahomme/jquery/images/ui-icons_888888_256x240.png M themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png M themes/pmahomme/screen.png Log Message: ----------- Optimize PNG images Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e304c23d821b82984606125c0b83775046e1a2c4 https://github.com/phpmyadmin/phpmyadmin/commit/e304c23d821b82984606125c0b83... Author: Michal Čihař <michal@cihar.com> Date: 2016-02-12 (Fri, 12 Feb 2016) Changed paths: M js/openlayers/img/cloud-popup-relative.png M js/openlayers/img/measuring-stick-off.png M js/openlayers/img/measuring-stick-on.png M js/openlayers/img/panning-hand-off.png M js/openlayers/img/panning-hand-on.png M js/openlayers/img/zoom-plus-mini.png M js/openlayers/img/zoom-world-mini.png M js/openlayers/img/zoombar.png M js/openlayers/theme/default/img/add_point_off.png M js/openlayers/theme/default/img/add_point_on.png M js/openlayers/theme/default/img/draw_line_off.png M js/openlayers/theme/default/img/draw_line_on.png M js/openlayers/theme/default/img/draw_point_off.png M js/openlayers/theme/default/img/draw_point_on.png M js/openlayers/theme/default/img/draw_polygon_off.png M js/openlayers/theme/default/img/draw_polygon_on.png M js/openlayers/theme/default/img/editing_tool_bar.png M js/openlayers/theme/default/img/move_feature_off.png M js/openlayers/theme/default/img/move_feature_on.png M js/openlayers/theme/default/img/navigation_history.png M js/openlayers/theme/default/img/pan-panel.png M js/openlayers/theme/default/img/pan_off.png M js/openlayers/theme/default/img/pan_on.png M js/openlayers/theme/default/img/panning-hand-off.png M js/openlayers/theme/default/img/panning-hand-on.png M js/openlayers/theme/default/img/remove_point_off.png M js/openlayers/theme/default/img/remove_point_on.png M js/openlayers/theme/default/img/ruler.png M js/openlayers/theme/default/img/view_next_off.png M js/openlayers/theme/default/img/view_previous_off.png M js/openlayers/theme/default/img/zoom-panel-NOALPHA.png M js/openlayers/theme/default/img/zoom-panel.png M themes/original/img/b_column_add.png M themes/original/img/b_edit.png M themes/original/img/b_favorite.png M themes/original/img/b_find_replace.png M themes/original/img/b_index_add.png M themes/original/img/b_inline_edit.png M themes/original/img/b_no_favorite.png M themes/original/img/b_save.png M themes/original/img/b_table_add.png M themes/original/img/b_undo.png M themes/original/img/b_usrdrop.png M themes/original/img/b_usredit.png M themes/original/img/b_view_add.png M themes/original/img/b_views.png M themes/original/img/bd_deltbl.png M themes/original/img/console.png M themes/original/img/logo_left.png M themes/original/img/new_struct.png M themes/original/img/new_struct_hovered.png M themes/original/img/normalize.png M themes/original/img/s_lang.png M themes/original/img/s_rights.png M themes/original/img/s_top.png M themes/original/img/sprites.png M themes/original/img/vertical_line.png M themes/original/img/zoom-world-mini.png M themes/original/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M themes/original/jquery/images/ui-bg_glass_65_ffffff_1x400.png M themes/original/jquery/images/ui-bg_glass_75_dadada_1x400.png M themes/original/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M themes/original/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M themes/original/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M themes/original/jquery/images/ui-icons_222222_256x240.png M themes/original/jquery/images/ui-icons_2e83ff_256x240.png M themes/original/jquery/images/ui-icons_454545_256x240.png M themes/original/jquery/images/ui-icons_888888_256x240.png M themes/original/jquery/images/ui-icons_cd0a0a_256x240.png M themes/original/screen.png M themes/pmahomme/img/b_column_add.png M themes/pmahomme/img/b_favorite.png M themes/pmahomme/img/b_find_replace.png M themes/pmahomme/img/b_move.png M themes/pmahomme/img/b_no_favorite.png M themes/pmahomme/img/b_plus.png M themes/pmahomme/img/b_sqldoc.png M themes/pmahomme/img/b_undo.png M themes/pmahomme/img/bd_deltbl.png M themes/pmahomme/img/bd_drop.png M themes/pmahomme/img/bd_empty.png M themes/pmahomme/img/bd_export.png M themes/pmahomme/img/bd_firstpage.png M themes/pmahomme/img/bd_ftext.png M themes/pmahomme/img/bd_index.png M themes/pmahomme/img/bd_lastpage.png M themes/pmahomme/img/bd_primary.png M themes/pmahomme/img/bd_select.png M themes/pmahomme/img/bd_spatial.png M themes/pmahomme/img/bd_unique.png M themes/pmahomme/img/console.png M themes/pmahomme/img/left_nav_bg.png M themes/pmahomme/img/logo_left.png M themes/pmahomme/img/new_struct.png M themes/pmahomme/img/new_struct_hovered.png M themes/pmahomme/img/normalize.png M themes/pmahomme/img/pmd/2leftarrow.png M themes/pmahomme/img/pmd/2rightarrow.png M themes/pmahomme/img/pmd/Header.png M themes/pmahomme/img/pmd/Header_Linked.png M themes/pmahomme/img/pmd/ang_direct.png M themes/pmahomme/img/pmd/exitFullscreen.png M themes/pmahomme/img/pmd/help.png M themes/pmahomme/img/pmd/help_relation.png M themes/pmahomme/img/pmd/left_panel_butt.png M themes/pmahomme/img/pmd/relation.png M themes/pmahomme/img/pmd/save_as.png M themes/pmahomme/img/pmd/small_tab.png M themes/pmahomme/img/pmd/toggle_lines.png M themes/pmahomme/img/pmd/top_panel.png M themes/pmahomme/img/s_top.png M themes/pmahomme/img/select_bg.png M themes/pmahomme/img/sprites.png M themes/pmahomme/img/toggle-ltr.png M themes/pmahomme/img/toggle-rtl.png M themes/pmahomme/img/vertical_line.png M themes/pmahomme/img/zoom-world-mini.png M themes/pmahomme/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_65_ffffff_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_75_dadada_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M themes/pmahomme/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M themes/pmahomme/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M themes/pmahomme/jquery/images/ui-icons_222222_256x240.png M themes/pmahomme/jquery/images/ui-icons_2e83ff_256x240.png M themes/pmahomme/jquery/images/ui-icons_454545_256x240.png M themes/pmahomme/jquery/images/ui-icons_888888_256x240.png M themes/pmahomme/jquery/images/ui-icons_cd0a0a_256x240.png M themes/pmahomme/screen.png Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a38e451cc808...e304c23d821b