Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 334edb4cc2985d76802585bf37e9d9ff49d1417a https://github.com/phpmyadmin/phpmyadmin/commit/334edb4cc2985d76802585bf37e9... Author: Kristjan Räts <kristjanrats@gmail.com> Date: 2013-09-18 (Wed, 18 Sep 2013) Changed paths: M po/et.po Log Message: ----------- Translated using Weblate (Estonian) Currently translated at 100.0% (2611 of 2611) Commit: e69bcce04333fffff721b6b8372a4e7b54fe2e68 https://github.com/phpmyadmin/phpmyadmin/commit/e69bcce04333fffff721b6b8372a... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2013-09-19 (Thu, 19 Sep 2013) Changed paths: M ChangeLog M js/ajax.js M js/makegrid.js Log Message: ----------- bug #4041 Interaction between linkified fields and grid editing Commit: 8840495828136c655a118b7715c5f5f13c167c8b https://github.com/phpmyadmin/phpmyadmin/commit/8840495828136c655a118b7715c5... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2013-09-19 (Thu, 19 Sep 2013) Changed paths: M ChangeLog M js/makegrid.js Log Message: ----------- Merge branch 'QA_4_0' Conflicts: js/makegrid.js po/et.po Commit: f897c32e73e8e6b030dc6d940ae17ba2204fdbf0 https://github.com/phpmyadmin/phpmyadmin/commit/f897c32e73e8e6b030dc6d940ae1... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2013-09-19 (Thu, 19 Sep 2013) Changed paths: M js/ajax.js Log Message: ----------- Coding style fix Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bd968121aac3...f897c32e73e8