[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 720565: Select local file import option in subsequent subm...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 720565ef22ad0009b5f4b72fc9d2c0ed854effb4 https://github.com/phpmyadmin/phpmyadmin/commit/720565ef22ad0009b5f4b72fc9d… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: M libraries/display_import.lib.php Log Message: ----------- Select local file import option in subsequent submissions Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: d36ac0c4116928ef5d15f3336147ce65b292fbbf https://github.com/phpmyadmin/phpmyadmin/commit/d36ac0c4116928ef5d15f333614… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: M ChangeLog M libraries/common.inc.php Log Message: ----------- Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 Commit: 95a13009379147bfda6078b8d5b7cc9d67d5c712 https://github.com/phpmyadmin/phpmyadmin/commit/95a13009379147bfda6078b8d5b… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2015-03-31 (Tue, 31 Mar 2015) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: c5796e912f3a43c091706b9592649cf79e4b80a5 https://github.com/phpmyadmin/phpmyadmin/commit/c5796e912f3a43c091706b95926… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-01 (Wed, 01 Apr 2015) Changed paths: M ChangeLog M js/tbl_change.js Log Message: ----------- bug #4825 Datepicker missing when changing number of rows on Insert page Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: fe454863edee856038f6417b55ccfd8497d226e1 https://github.com/phpmyadmin/phpmyadmin/commit/fe454863edee856038f6417b55c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-01 (Wed, 01 Apr 2015) Changed paths: M po/nl.po Log Message: ----------- Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 Commit: 6f307e5db14a922996b01a857b8c71dcfa4457f6 https://github.com/phpmyadmin/phpmyadmin/commit/6f307e5db14a922996b01a857b8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-01 (Wed, 01 Apr 2015) Changed paths: M ChangeLog M js/tbl_change.js M libraries/display_import.lib.php Log Message: ----------- Merge branch 'QA_4_4' Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c9100d5bc7ad...6f307e5db14a