Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f4d77f905df82746052a9e749e4aa040bb202d4f https://github.com/phpmyadmin/phpmyadmin/commit/f4d77f905df82746052a9e749e4a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M js/makegrid.js

Log Message: ----------- Fix #13177 Grid editing repeats action after error

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

Commit: 047de9cdf4990ad6ac5833938ea8acf438c6b385 https://github.com/phpmyadmin/phpmyadmin/commit/047de9cdf4990ad6ac5833938ea8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M .travis.yml M ChangeLog M README M composer.json M doc/conf.py M doc/credits.rst M doc/faq.rst M doc/glossary.rst M doc/other.rst M export.php M import.php M js/ajax.js M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js M js/functions.js M js/makegrid.js M js/sql.js M libraries/Advisor.php M libraries/Charsets.php M libraries/Config.php M libraries/DatabaseInterface.php M libraries/DisplayResults.php M libraries/Error.php M libraries/File.php M libraries/Footer.php M libraries/Header.php M libraries/Linter.php M libraries/ListDatabase.php M libraries/SysInfo.php M libraries/Template.php M libraries/Theme.php M libraries/ThemeManager.php M libraries/Util.php M libraries/VersionInformation.php M libraries/common.inc.php M libraries/config/ConfigFile.php M libraries/controllers/table/TableRelationController.php M libraries/controllers/table/TableStructureController.php M libraries/dbi/DBIMysqli.php M libraries/export.lib.php M libraries/import.lib.php M libraries/insert_edit.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/auth/AuthenticationSignon.php M libraries/plugins/export/ExportSql.php M libraries/plugins/import/ImportShp.php M libraries/properties/options/OptionsPropertyGroup.php M libraries/server_status_monitor.lib.php M libraries/server_user_groups.lib.php M libraries/transformations.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_manage.php M scripts/create-release.sh M setup/index.php M templates/table/relation/foreign_key_row.phtml M templates/table/structure/display_table_stats.phtml M test/classes/AdvisorTest.php M test/classes/DisplayResultsTest.php M test/classes/TableTest.php M test/classes/TrackerTest.php M test/classes/plugin/export/ExportSqlTest.php M test/classes/properties/options/groups/OptionsPropertyRootGroupTest.php M test/install-runkit M test/libraries/PMA_PMD_common_test.php M test/libraries/PMA_display_export_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_transformation_test.php M themes/original/css/common.css.php M themes/original/img/logo_left.png M themes/original/img/logo_right.png M themes/pmahomme/css/codemirror.css.php M themes/pmahomme/css/common.css.php M themes/pmahomme/img/logo_left.png M themes/pmahomme/img/logo_right.png

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d84ed9528561...047de9cdf499