Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 05fd631ed88f923a00125393a405a40d3cfbda31 https://github.com/phpmyadmin/phpmyadmin/commit/05fd631ed88f923a00125393a405... Author: Nisarg Jhaveri <nisargjhaveri@gmail.com> Date: 2015-05-19 (Tue, 19 May 2015) Changed paths: M js/ajax.js M libraries/Header.class.php M libraries/config/page_settings.class.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Some fixes in page-related settings - Update 'original' theme - Fix lock icon location when settings icon is not available Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com> Commit: aa57d15ca7c84ab3db90bba8c5fe5982608265c6 https://github.com/phpmyadmin/phpmyadmin/commit/aa57d15ca7c84ab3db90bba8c5fe... Author: Marc Delisle <marc@infomarc.info> Date: 2015-05-19 (Tue, 19 May 2015) Changed paths: M js/ajax.js M libraries/Header.class.php M libraries/config/page_settings.class.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge pull request #1684 from nisargjhaveri/page_settings_fix Some fixes in page-related settings Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3ee7b63f6f3a...aa57d15ca7c8