September 2016 - Git - lists.phpmyadmin.net

[phpmyadmin/sql-parser] 00eb34: Changelog entry for #85
by Michal Čihař 20 Sep '16

20 Sep '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 00eb34849e9e4b445c67368a1cc49d21c2b4bc0d https://github.com/phpmyadmin/sql-parser/commit/00eb34849e9e4b445c67368a1cc… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M CHANGELOG.md Log Message: ----------- Changelog entry for #85 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/sql-parser] 34b130: Fix parsing of user@host without backquotes
by Michal Čihař 20 Sep '16

20 Sep '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 34b1308d30efe6e91e0883fdce1bf4d1fce447b9 https://github.com/phpmyadmin/sql-parser/commit/34b1308d30efe6e91e0883fdce1… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M src/Components/OptionsArray.php M src/Statements/CreateStatement.php M tests/Parser/CreateStatementTest.php M tests/data/bugs/gh16.out M tests/data/bugs/pma11843.out M tests/data/parser/parseCreateTable.out M tests/data/parser/parseCreateTable2.out M tests/data/parser/parseCreateTable3.out M tests/data/parser/parseCreateTable5.out M tests/data/parser/parseCreateTable6.out M tests/data/parser/parseCreateView.out A tests/data/parser/parseCreateViewWithQuotes.in A tests/data/parser/parseCreateViewWithQuotes.out A tests/data/parser/parseCreateViewWithoutQuotes.in A tests/data/parser/parseCreateViewWithoutQuotes.out Log Message: ----------- Fix parsing of user@host without backquotes Introduce an option to parse 'expr=' (like var, var=, expr) Fix tests Fix phpmyadmin/phpmyadmin#12298 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 60e7833e6b77fcb191778c6b381a621de22a16d1 https://github.com/phpmyadmin/sql-parser/commit/60e7833e6b77fcb191778c6b381… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-20 (Tue, 20 Sep 2016) Changed paths: M src/Components/OptionsArray.php M src/Statements/CreateStatement.php M tests/Parser/CreateStatementTest.php M tests/data/bugs/gh16.out M tests/data/bugs/pma11843.out M tests/data/parser/parseCreateTable.out M tests/data/parser/parseCreateTable2.out M tests/data/parser/parseCreateTable3.out M tests/data/parser/parseCreateTable5.out M tests/data/parser/parseCreateTable6.out M tests/data/parser/parseCreateView.out A tests/data/parser/parseCreateViewWithQuotes.in A tests/data/parser/parseCreateViewWithQuotes.out A tests/data/parser/parseCreateViewWithoutQuotes.in A tests/data/parser/parseCreateViewWithoutQuotes.out Log Message: ----------- Merge pull request #85 from devenbansod/fix_spaces_in_definer Fix parsing of user@host without backquotes Compare: https://github.com/phpmyadmin/sql-parser/compare/5988855152a5...60e7833e6b77

1 0

[phpmyadmin/phpmyadmin] 904337: Remove token from links and icon links in Navigati...
by Michal Čihař 19 Sep '16

19 Sep '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 90433788d6f319cd112f0962ba9b3d1c22b5f2c7 https://github.com/phpmyadmin/phpmyadmin/commit/90433788d6f319cd112f0962ba9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/NodeColumn.php M libraries/navigation/nodes/NodeColumnContainer.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeDatabaseContainer.php M libraries/navigation/nodes/NodeEvent.php M libraries/navigation/nodes/NodeEventContainer.php M libraries/navigation/nodes/NodeFunction.php M libraries/navigation/nodes/NodeFunctionContainer.php M libraries/navigation/nodes/NodeIndex.php M libraries/navigation/nodes/NodeIndexContainer.php M libraries/navigation/nodes/NodeProcedure.php M libraries/navigation/nodes/NodeProcedureContainer.php M libraries/navigation/nodes/NodeTable.php M libraries/navigation/nodes/NodeTableContainer.php M libraries/navigation/nodes/NodeTrigger.php M libraries/navigation/nodes/NodeTriggerContainer.php M libraries/navigation/nodes/NodeView.php M libraries/navigation/nodes/NodeViewContainer.php Log Message: ----------- Remove token from links and icon links in Navigation bar After #12415, we have removed the token from GET requests. So it does not make much sense to have it embedded in the links in navigation, too. Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 3a4cad1596601e1b5d1caf46f51e38f8c39e5222 https://github.com/phpmyadmin/phpmyadmin/commit/3a4cad1596601e1b5d1caf46f51… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/navigation/NavigationTree.php M libraries/navigation/nodes/NodeColumn.php M libraries/navigation/nodes/NodeColumnContainer.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeDatabaseContainer.php M libraries/navigation/nodes/NodeEvent.php M libraries/navigation/nodes/NodeEventContainer.php M libraries/navigation/nodes/NodeFunction.php M libraries/navigation/nodes/NodeFunctionContainer.php M libraries/navigation/nodes/NodeIndex.php M libraries/navigation/nodes/NodeIndexContainer.php M libraries/navigation/nodes/NodeProcedure.php M libraries/navigation/nodes/NodeProcedureContainer.php M libraries/navigation/nodes/NodeTable.php M libraries/navigation/nodes/NodeTableContainer.php M libraries/navigation/nodes/NodeTrigger.php M libraries/navigation/nodes/NodeTriggerContainer.php M libraries/navigation/nodes/NodeView.php M libraries/navigation/nodes/NodeViewContainer.php Log Message: ----------- Merge pull request #12568 from devenbansod/fix_12526 Remove token from links and icon links in Navigation bar Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad87644941f3...3a4cad159660

1 0

[phpmyadmin/phpmyadmin] f7f031: Store create options in serapate array instead of ...
by Michal Čihař 19 Sep '16

19 Sep '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f7f03127f7486281ccd4335f8137bec19ebb7254 https://github.com/phpmyadmin/phpmyadmin/commit/f7f03127f7486281ccd4335f813… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/tbl_info.inc.php M tbl_operations.php Log Message: ----------- Store create options in serapate array instead of polluting global namespace This is just a minor cleanup to avoid possible problems when MySQL create table options would collide with our variable names. See also issue #12567 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ad87644941f3967dce3d0e052611fb0aaf3442e4 https://github.com/phpmyadmin/phpmyadmin/commit/ad87644941f3967dce3d0e05261… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/tbl_info.inc.php M tbl_operations.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7fc28626fdbc...ad87644941f3

1 0

[phpmyadmin/phpmyadmin] f7f031: Store create options in serapate array instead of ...
by Michal Čihař 19 Sep '16

19 Sep '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f7f03127f7486281ccd4335f8137bec19ebb7254 https://github.com/phpmyadmin/phpmyadmin/commit/f7f03127f7486281ccd4335f813… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M libraries/tbl_info.inc.php M tbl_operations.php Log Message: ----------- Store create options in serapate array instead of polluting global namespace This is just a minor cleanup to avoid possible problems when MySQL create table options would collide with our variable names. See also issue #12567 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] f8ea67: Fix #12530: Show enabled links for Edit and Execut...
by Michal Čihař 19 Sep '16

19 Sep '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8ea67f2bc59d46290b85b2e578c649655f000e7 https://github.com/phpmyadmin/phpmyadmin/commit/f8ea67f2bc59d46290b85b2e578… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Fix #12530: Show enabled links for Edit and Execute after proper priv checks Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 815bf44584f104d1616ca1d05a2aaba34580a418 https://github.com/phpmyadmin/phpmyadmin/commit/815bf44584f104d1616ca1d05a2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M libraries/rte/rte_export.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Fix error messages to suit better localization Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b054aa70ef443929484f087f459d4d856fcabaa5 https://github.com/phpmyadmin/phpmyadmin/commit/b054aa70ef443929484f087f459… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/export.js Log Message: ----------- Uncheck the Add CREATE PROCEDURE / FUNCTION etc. checkbox for a selective export User can always check it if he/she wants to export the procs,funcs etc. too Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 4f1432eb2fe6a25efbf740c9f712d4454e109969 https://github.com/phpmyadmin/phpmyadmin/commit/4f1432eb2fe6a25efbf740c9f71… 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 #12300 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: e8d07e3783f0a1b7140ba3ee6a3b2e472e210b65 https://github.com/phpmyadmin/phpmyadmin/commit/e8d07e3783f0a1b7140ba3ee6a3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Allow vertical scrolling to read longer text values in grid editing Fix #12554 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b6952bbe55a9fa727482a47533cc066c5e36f189 https://github.com/phpmyadmin/phpmyadmin/commit/b6952bbe55a9fa727482a47533c… 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 #12554 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: 337e5755c039962a32883d96329e8157ba6e0d59 https://github.com/phpmyadmin/phpmyadmin/commit/337e5755c039962a32883d96329… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12555' into QA_4_6 Commit: bccd690673ffaf36b19a28fc8449531a23ef2ad2 https://github.com/phpmyadmin/phpmyadmin/commit/bccd690673ffaf36b19a28fc844… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 Commit: 5c0af8facf0ba94ca5484dd8601104e36f3c8024 https://github.com/phpmyadmin/phpmyadmin/commit/5c0af8facf0ba94ca5484dd8601… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge remote-tracking branch 'origin/pull/12556' into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e2ac325a7a0c...5c0af8facf0b

1 0

[phpmyadmin/phpmyadmin] f8ea67: Fix #12530: Show enabled links for Edit and Execut...
by Michal Čihař 19 Sep '16

19 Sep '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8ea67f2bc59d46290b85b2e578c649655f000e7 https://github.com/phpmyadmin/phpmyadmin/commit/f8ea67f2bc59d46290b85b2e578… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M ChangeLog M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Fix #12530: Show enabled links for Edit and Execute after proper priv checks Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 815bf44584f104d1616ca1d05a2aaba34580a418 https://github.com/phpmyadmin/phpmyadmin/commit/815bf44584f104d1616ca1d05a2… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M libraries/rte/rte_export.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Fix error messages to suit better localization Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b054aa70ef443929484f087f459d4d856fcabaa5 https://github.com/phpmyadmin/phpmyadmin/commit/b054aa70ef443929484f087f459… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M js/export.js Log Message: ----------- Uncheck the Add CREATE PROCEDURE / FUNCTION etc. checkbox for a selective export User can always check it if he/she wants to export the procs,funcs etc. too Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 4f1432eb2fe6a25efbf740c9f712d4454e109969 https://github.com/phpmyadmin/phpmyadmin/commit/4f1432eb2fe6a25efbf740c9f71… 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 #12300 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: e8d07e3783f0a1b7140ba3ee6a3b2e472e210b65 https://github.com/phpmyadmin/phpmyadmin/commit/e8d07e3783f0a1b7140ba3ee6a3… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-16 (Fri, 16 Sep 2016) Changed paths: M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Allow vertical scrolling to read longer text values in grid editing Fix #12554 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: b6952bbe55a9fa727482a47533cc066c5e36f189 https://github.com/phpmyadmin/phpmyadmin/commit/b6952bbe55a9fa727482a47533c… 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 #12554 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: ChangeLog Commit: 337e5755c039962a32883d96329e8157ba6e0d59 https://github.com/phpmyadmin/phpmyadmin/commit/337e5755c039962a32883d96329… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12555' into QA_4_6 Commit: bccd690673ffaf36b19a28fc8449531a23ef2ad2 https://github.com/phpmyadmin/phpmyadmin/commit/bccd690673ffaf36b19a28fc844… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 Commit: 5c0af8facf0ba94ca5484dd8601104e36f3c8024 https://github.com/phpmyadmin/phpmyadmin/commit/5c0af8facf0ba94ca5484dd8601… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge remote-tracking branch 'origin/pull/12556' into QA_4_6 Commit: 7fc28626fdbceccbb60827ce7ee04cfcc4094fce https://github.com/phpmyadmin/phpmyadmin/commit/7fc28626fdbceccbb60827ce7ee… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M ChangeLog M js/export.js M js/messages.php M js/rte.js M libraries/DatabaseInterface.php M libraries/rte/rte_export.lib.php M libraries/rte/rte_list.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_words.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/61d8dc479125...7fc28626fdbc

1 0

[phpmyadmin/phpmyadmin] 023ced: Don't use PMA_DROP_IMPORT on Table insert if it ha...
by Michal Čihař 19 Sep '16

19 Sep '16

Branch: refs/heads/master 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: d800fc16791ad389629935634a7fe587864e0f46 https://github.com/phpmyadmin/phpmyadmin/commit/d800fc16791ad389629935634a7… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3206 of 3206 strings) [CI skip] Commit: 3992bd65be6db0afc768052c54b70156eec1d711 https://github.com/phpmyadmin/phpmyadmin/commit/3992bd65be6db0afc768052c54b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.8% (3201 of 3206 strings) [CI skip] 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 Commit: 9d1a7aa49d1e7399cbce4af13e1627ae13eac790 https://github.com/phpmyadmin/phpmyadmin/commit/9d1a7aa49d1e7399cbce4af13e1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' Commit: 61d8dc4791254605778524358010b70f410dca9c https://github.com/phpmyadmin/phpmyadmin/commit/61d8dc479125460577852435801… 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 branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dc43daf34e47...61d8dc479125

1 0

[phpmyadmin/phpmyadmin] 023ced: Don't use PMA_DROP_IMPORT on Table insert if it ha...
by Michal Čihař 19 Sep '16

19 Sep '16

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

1 0

[phpmyadmin/phpmyadmin] 523b2f: Translated using Weblate (Dutch)
by Deven Bansod 19 Sep '16

19 Sep '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 523b2f3ba9d6790319935f9257e330456ea7e9f6 https://github.com/phpmyadmin/phpmyadmin/commit/523b2f3ba9d6790319935f9257e… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 99.9% (3216 of 3219 strings) [CI skip] Commit: dc43daf34e47e0005a911df385b0d47e8da67825 https://github.com/phpmyadmin/phpmyadmin/commit/dc43daf34e47e0005a911df385b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-09-19 (Mon, 19 Sep 2016) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.2% (3196 of 3219 strings) [CI skip] Compare: https://github.com/phpmyadmin/phpmyadmin/compare/774e8d505b5a...dc43daf34e47

1 0