Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0b5e8fd6a30eefdf21be47b56ed0c4064a2dc2c0 https://github.com/phpmyadmin/phpmyadmin/commit/0b5e8fd6a30eefdf21be47b56ed0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2016-01-04 (Mon, 04 Jan 2016)

Changed paths: M js/navigation.js M libraries/Scripts.class.php

Log Message: ----------- Move onload navigation state update into AJAX.registerOnload to avoid a glitch

Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com

Commit: f1b3beca1421df7afd4a3a6f47c2d156b0a34498 https://github.com/phpmyadmin/phpmyadmin/commit/f1b3beca1421df7afd4a3a6f47c2... Author: Paweł Kubrak peku33@gmail.com Date: 2016-01-04 (Mon, 04 Jan 2016)

Changed paths: M libraries/pmd_common.php

Log Message: ----------- Fix #11727 : SQL duplicate entry error trying to INSERT in designer_settings table

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 63fae992d8bb13cd6288d18919439b877a1aca38 https://github.com/phpmyadmin/phpmyadmin/commit/63fae992d8bb13cd6288d1891943... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-01-04 (Mon, 04 Jan 2016)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry for issue #11727

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 41caf7bafa2fe4f5de2560e6da735e372315b34e https://github.com/phpmyadmin/phpmyadmin/commit/41caf7bafa2fe4f5de2560e6da73... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-01-04 (Mon, 04 Jan 2016)

Changed paths: M ChangeLog M js/navigation.js M libraries/Scripts.php M libraries/pmd_common.php

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/49302ec644f9...41caf7bafa2f