Branch: refs/heads/QA_4_6
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 023ced3552c1e9d114539a7569623448c5878d96
https://github.com/phpmyadmin/phpmyadmin/commit/023ced3552c1e9d114539a75696…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M js/common.js
M libraries/insert_edit.lib.php
Log Message:
-----------
Don't use PMA_DROP_IMPORT on Table insert if it has Blob field
If we force PMA_DROP_IMPORT on all pages, users can't use Chrome's drag-drop-files
feature
on Table Insert page with blob field
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 734b69b41873286931e96089de1d01b2f396cb98
https://github.com/phpmyadmin/phpmyadmin/commit/734b69b41873286931e96089de1…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for #12487
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Conflicts:
ChangeLog
Commit: a52597f048fae7a0c89cd55fae6ad5bb0fe34d0e
https://github.com/phpmyadmin/phpmyadmin/commit/a52597f048fae7a0c89cd55fae6…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M js/common.js
M libraries/insert_edit.lib.php
Log Message:
-----------
Include explaning statements near related code
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 14616cbcdf8bc3acd1912733d507491789ceb521
https://github.com/phpmyadmin/phpmyadmin/commit/14616cbcdf8bc3acd1912733d50…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-09-16 (Fri, 16 Sep 2016)
Changed paths:
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Fixed tests
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: e2ac325a7a0c9327647bc8ab28a4970d5a052144
https://github.com/phpmyadmin/phpmyadmin/commit/e2ac325a7a0c9327647bc8ab28a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-09-19 (Mon, 19 Sep 2016)
Changed paths:
M ChangeLog
M js/common.js
M libraries/insert_edit.lib.php
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12557' into QA_4_6
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/3992bd65be6d...e2ac325a7a0c