Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b44e9cb312d43a7fc2a67d0d58aec8909544c689 https://github.com/phpmyadmin/phpmyadmin/commit/b44e9cb312d43a7fc2a67d0d58ae... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-12 (Mon, 12 Jan 2015)

Changed paths: M ChangeLog M libraries/navigation/NavigationTree.class.php

Log Message: ----------- bug #4699 Navigation panel should not hide icons based on 'TableNavigationLinksMode'

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 00c7e891e11c5eb70c331779ef29e87dcc763a3e https://github.com/phpmyadmin/phpmyadmin/commit/00c7e891e11c5eb70c331779ef29... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-12 (Mon, 12 Jan 2015)

Changed paths: M libraries/DisplayResults.class.php M libraries/Util.class.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Properly implement 'TableNavigationLinksMode' configuration

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: bc0910cc9b7a04f518d74b5da0839d576e09f0d1 https://github.com/phpmyadmin/phpmyadmin/commit/bc0910cc9b7a04f518d74b5da083... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-12 (Mon, 12 Jan 2015)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/navigation/NavigationTree.class.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Merge branch 'QA_4_3'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/086d91b0151d...bc0910cc9b7a