Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 113f8f490e3aaed204f5e112e9cb0b8bf1222b37 https://github.com/phpmyadmin/phpmyadmin/commit/113f8f490e3aaed204f5e112e9cb... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2013-12-04 (Wed, 04 Dec 2013)

Changed paths: M ChangeLog M config.sample.inc.php M doc/config.rst M libraries/DisplayResults.class.php

Log Message: ----------- Feature 1455 - Display image,text or both in table row actions area

Signed-off-by: Chanaka Indrajith pe.chanaka.ck@gmail.com

Commit: 30522c8d5f8bebf547eb90c46fe5af033075fd2b https://github.com/phpmyadmin/phpmyadmin/commit/30522c8d5f8bebf547eb90c46fe5... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2013-12-05 (Thu, 05 Dec 2013)

Changed paths: M config.sample.inc.php M doc/config.rst M libraries/DisplayResults.class.php M libraries/config.default.php

Log Message: ----------- Rename the global variable from row_action_type to RowActionType

Signed-off-by: Chanaka Indrajith pe.chanaka.ck@gmail.com

Commit: ac84ccf35f7ae8ed8aceb63a113ccfee4604b387 https://github.com/phpmyadmin/phpmyadmin/commit/ac84ccf35f7ae8ed8aceb63a113c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2013-12-05 (Thu, 05 Dec 2013)

Changed paths: M js/navigation.js M pmd_relation_new.php M po/ko.po M po/nl.po

Log Message: ----------- Merge remote branch 'upstream/master' into feature-1455

Commit: d838766b968be6c2621568fa1d148e24cc4890a5 https://github.com/phpmyadmin/phpmyadmin/commit/d838766b968be6c2621568fa1d14... Author: Marc Delisle marc@infomarc.info Date: 2013-12-05 (Thu, 05 Dec 2013)

Changed paths: M ChangeLog M config.sample.inc.php M doc/config.rst M libraries/DisplayResults.class.php M libraries/config.default.php

Log Message: ----------- Merge pull request #777 from Chanaka/feature-1455

Feature 1455 - Display image,text or both in table row actions area

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a490a231416...d838766b968b