Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d7f303fea39b4fd080ef7efbe0c60494cea6bb31 https://github.com/phpmyadmin/phpmyadmin/commit/d7f303fea39b4fd080ef7efbe0c6... Author: Jo Michael <me@mynetx.net> Date: 2012-04-07 (Sat, 07 Apr 2012) Changed paths: M js/db_operations.js M js/db_structure.js M js/export.js M js/functions.js M js/gis_data_editor.js M js/import.js M js/indexes.js M js/makegrid.js M js/navigation.js M js/querywindow.js M js/replication.js M js/server_privileges.js M js/server_status.js M js/server_status_monitor.js M js/server_synchronize.js M js/server_variables.js M js/sql.js M js/tbl_change.js M js/tbl_chart.js M js/tbl_gis_visualization.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot.js Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: 263d0137fd68e56aa7f7ea6222935f2b7360a47a https://github.com/phpmyadmin/phpmyadmin/commit/263d0137fd68e56aa7f7ea622293... Author: Jo Michael <me@mynetx.net> Date: 2012-04-07 (Sat, 07 Apr 2012) Changed paths: M js/functions.js M libraries/display_import.lib.php M themes/original/css/theme_right.css.php M themes/pmahomme/css/theme_right.css.php Log Message: ----------- Show progress bar with timing for import uploads Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8747608...263d013