- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] a81040: Replace require_once by include_once.
by Hugues Peccatte 30 Jul '15

30 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a8104091356859d5abd1fde8d3354b5c2239761e https://github.com/phpmyadmin/phpmyadmin/commit/a8104091356859d5abd1fde8d33… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/config/FormDisplay.tpl.php Log Message: ----------- Replace require_once by include_once. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 96ce83: Fix #11334 Table creation time, last update and la...
by Madhura Jayaratne 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 96ce8358bf21aeda7c05e4621bdfc28b70e20932 https://github.com/phpmyadmin/phpmyadmin/commit/96ce8358bf21aeda7c05e4621bd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M templates/structure/structure_table_row.phtml Log Message: ----------- Fix #11334 Table creation time, last update and last check column are empty Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: cd7711205f71aed919b6f7f6994be9482a4af3a4 https://github.com/phpmyadmin/phpmyadmin/commit/cd7711205f71aed919b6f7f6994… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/config/FormDisplay.tpl.php M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/UtfString.php M po/fr.po M templates/javascript/display.phtml M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/PMA_FormDisplay_tpl_test.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/afadbc662b91...cd7711205f71

1 0

[phpmyadmin/phpmyadmin] afadbc: Intermediate variable not needed
by Marc Delisle 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: afadbc662b91ff4aaf01174459706046a78fdd5d https://github.com/phpmyadmin/phpmyadmin/commit/afadbc662b91ff4aaf011744597… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/config/FormDisplay.tpl.php Log Message: ----------- Intermediate variable not needed Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[phpmyadmin/phpmyadmin] caf369: Templating PMA_displayJavascript function.
by Marc Delisle 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: caf3695b535820b1ab24701e6610927429fd29d7 https://github.com/phpmyadmin/phpmyadmin/commit/caf3695b535820b1ab24701e661… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2015-07-28 (Tue, 28 Jul 2015) Changed paths: M libraries/config/FormDisplay.tpl.php M templates/javascript/display.phtml M test/libraries/PMA_FormDisplay_tpl_test.php Log Message: ----------- Templating PMA_displayJavascript function. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 7e44dc321a579a86bfdb7698548aa5795d4fa000 https://github.com/phpmyadmin/phpmyadmin/commit/7e44dc321a579a86bfdb7698548… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/config/FormDisplay.tpl.php M templates/javascript/display.phtml M test/libraries/PMA_FormDisplay_tpl_test.php Log Message: ----------- Merge pull request #11331 from Tithugues/templatingDisplayJavascript_master Templating PMA_displayJavascript function. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4751ca3a2117...7e44dc321a57

1 0

[phpmyadmin/phpmyadmin] 8722d7: Fixes #11325 and #11327.
by Marc Delisle 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8722d7c5c67a6a9f05af55ccbaa44dc561e5e02e https://github.com/phpmyadmin/phpmyadmin/commit/8722d7c5c67a6a9f05af55ccbaa… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-07-28 (Tue, 28 Jul 2015) Changed paths: M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/UtfString.php Log Message: ----------- Fixes #11325 and #11327. Updated sql-parser library to udan11/sql-parser@e603c283cd2f275d660919372812070d80b0ee6d. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: f539a7398beb40483c395598c8f9bb08e78b712b https://github.com/phpmyadmin/phpmyadmin/commit/f539a7398beb40483c395598c8f… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-07-28 (Tue, 28 Jul 2015) Changed paths: M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Fix failing test. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 4751ca3a21174281123acb206ba5325da2eec6c4 https://github.com/phpmyadmin/phpmyadmin/commit/4751ca3a21174281123acb206ba… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/sql-parser/src/Components/DataType.php M libraries/sql-parser/src/Lexer.php M libraries/sql-parser/src/Token.php M libraries/sql-parser/src/UtfString.php M test/classes/plugin/export/PMA_ExportSql_test.php Log Message: ----------- Merge pull request #11329 from udan11/update Fixes #11325 and #11327. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bfbfa539da38...4751ca3a2117

1 0

[phpmyadmin/phpmyadmin] bfbfa5: Translated using Weblate (French)
by Marc Delisle 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfbfa539da386011b31f11a185fb551f30e97c1b https://github.com/phpmyadmin/phpmyadmin/commit/bfbfa539da386011b31f11a185f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.7% (3185 of 3194 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 097b83: This is not an ajaxified form
by Madhura Jayaratne 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 097b83cd98f2e24ca171afa47206fd92febec933 https://github.com/phpmyadmin/phpmyadmin/commit/097b83cd98f2e24ca171afa4720… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M templates/table/replace_preview.phtml Log Message: ----------- This is not an ajaxified form Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 8d0a9f: Fix another instance of issue #10307
by Madhura Jayaratne 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8d0a9ff74e8c4851ce5371f9f256152807e3044c https://github.com/phpmyadmin/phpmyadmin/commit/8d0a9ff74e8c4851ce5371f9f25… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/controllers/TableSearchController.class.php Log Message: ----------- Fix another instance of issue #10307 Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] c21377: Fix #10307 Replication broken when using cross-dat...
by Madhura Jayaratne 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c21377d2da7f535614698deae17ae26b66f7a445 https://github.com/phpmyadmin/phpmyadmin/commit/c21377d2da7f535614698deae17… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php M libraries/mult_submits.lib.php M tbl_replace.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_mult_submits_test.php Log Message: ----------- Fix #10307 Replication broken when using cross-database master/slave config and phpmyadmin Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: cba50c1e5a8c6476c7473a59d9ba506aea3614ee https://github.com/phpmyadmin/phpmyadmin/commit/cba50c1e5a8c6476c7473a59d9b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M libraries/DisplayResults.class.php M libraries/insert_edit.lib.php M libraries/mult_submits.lib.php M tbl_replace.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_mult_submits_test.php Log Message: ----------- Merge branch 'issue10307' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e8c6983b8af...cba50c1e5a8c

1 0

[phpmyadmin/phpmyadmin] 0e8c69: Make scrutinizer happy
by Marc Delisle 29 Jul '15

29 Jul '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0e8c6983b8af49911c79fee1981ac836b6ac7b2c https://github.com/phpmyadmin/phpmyadmin/commit/0e8c6983b8af49911c79fee1981… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-07-28 (Tue, 28 Jul 2015) Changed paths: M export.php M libraries/export.lib.php Log Message: ----------- Make scrutinizer happy Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0