Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a790c2cf33097a8a3666f394c6217487b083dbb6 https://github.com/phpmyadmin/phpmyadmin/commit/a790c2cf33097a8a3666f394c621... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php M libraries/transformations.lib.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- rfe #347 allow table with transformed column anywhere in FROM clause

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

Commit: 9e26714239d33a4c66c2475ebb875c65780bdd2a https://github.com/phpmyadmin/phpmyadmin/commit/9e26714239d33a4c66c2475ebb87... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths: M test/classes/plugin/export/PMA_ExportSql_test.php

Log Message: ----------- Fix failing test

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

Commit: 22e6f3ab782133407b1b1f773a652e55b0b7c11d https://github.com/phpmyadmin/phpmyadmin/commit/22e6f3ab782133407b1b1f773a65... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php M libraries/transformations.lib.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Merge branch 'transform'

Commit: c8190ce72fdf0ea6cb519626c372e599f033338b https://github.com/phpmyadmin/phpmyadmin/commit/c8190ce72fdf0ea6cb519626c372... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-09 (Fri, 09 Jan 2015)

Changed paths: M po/es.po M po/fr.po

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/631f3e4c38aa...c8190ce72fdf