- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bef5f3: Refactor code duplication
by Marc Delisle 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bef5f3cb5b24be842e2420a59242c6a34eaa7ad7 https://github.com/phpmyadmin/phpmyadmin/commit/bef5f3cb5b24be842e2420a5924… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M libraries/tracking.lib.php Log Message: ----------- Refactor code duplication Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: b417fd62e1a3be38b8460ba01bf9ae2e2d7c466c https://github.com/phpmyadmin/phpmyadmin/commit/b417fd62e1a3be38b8460ba01bf… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M db_structure.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cb94250d0854...b417fd62e1a3

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cb9425: Minor coding style modifications.
by Hugues Peccatte 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cb94250d0854e56aa70c03c99581690a5f6cc384 https://github.com/phpmyadmin/phpmyadmin/commit/cb94250d0854e56aa70c03c9958… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M db_structure.php Log Message: ----------- Minor coding style modifications. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fe3941: Fix #4495 Comment lines in multiquery
by Marc Delisle 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fe3941b9bda2ea60a1966bf2bc0c8867f6c25aa7 https://github.com/phpmyadmin/phpmyadmin/commit/fe3941b9bda2ea60a1966bf2bc0… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-08 (Sat, 08 Nov 2014) Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Fix #4495 Comment lines in multiquery Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 58c629f6fd6f9b58aba384ba4f9f970e1dba7b88 https://github.com/phpmyadmin/phpmyadmin/commit/58c629f6fd6f9b58aba384ba4f9… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M ChangeLog M db_create.php M db_structure.php M js/ajax.js M js/navigation.js M libraries/Footer.class.php M libraries/Menu.class.php M libraries/Response.class.php M libraries/ServerStatusData.class.php M libraries/StorageEngine.class.php M libraries/Util.class.php M libraries/import.lib.php M libraries/navigation/Nodes/Node.class.php M libraries/plugins/import/ImportSql.class.php M libraries/replication.inc.php M libraries/server_databases.lib.php M libraries/server_status.lib.php M libraries/structure.lib.php M libraries/tracking.lib.php M server_databases.php M server_replication.php M server_status.php M server_status_advisor.php M server_status_monitor.php M server_status_processes.php M server_status_queries.php M server_status_variables.php M test/classes/PMA_Footer_test.php M test/classes/PMA_List_Database_test.php M test/classes/PMA_ServerStatusData_test.php M test/libraries/PMA_server_databases_test.php M test/libraries/PMA_server_engines_test.php M test/libraries/PMA_server_status_advisor_test.php M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_processes_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php M test/libraries/PMA_server_status_variables_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' into b4495_master Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Conflicts: ChangeLog Commit: f74ed544f68bc56866503f46ea2b777076b096aa https://github.com/phpmyadmin/phpmyadmin/commit/f74ed544f68bc56866503f46ea2… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M libraries/tracking.lib.php Log Message: ----------- Remove trailing whitespace. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: c80ab105390875592e4f26c789b313258ac6ee3b https://github.com/phpmyadmin/phpmyadmin/commit/c80ab105390875592e4f26c789b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php M libraries/tracking.lib.php Log Message: ----------- Merge pull request #1388 from Tithugues/b4495_master Fix #4495 Comment lines in multiquery Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8e6d16cf7e11...c80ab1053908

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 49836e: Use $replication_info everywhere, instead of $serv...
by Hugues Peccatte 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 49836e6e6f041be6388bdd827cfde28b8d53b27d https://github.com/phpmyadmin/phpmyadmin/commit/49836e6e6f041be6388bdd827cf… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-09 (Sun, 09 Nov 2014) Changed paths: M db_structure.php M libraries/ServerStatusData.class.php M libraries/replication.inc.php M libraries/server_databases.lib.php M libraries/server_status.lib.php M libraries/structure.lib.php M server_replication.php M server_status.php M server_status_advisor.php M server_status_monitor.php M server_status_processes.php M server_status_queries.php M server_status_variables.php M test/classes/PMA_ServerStatusData_test.php M test/libraries/PMA_server_databases_test.php M test/libraries/PMA_server_status_advisor_test.php M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_processes_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php M test/libraries/PMA_server_status_variables_test.php Log Message: ----------- Use $replication_info everywhere, instead of $server_* variables. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 7a6085344369d2c716831e80135ef60bc894c5fa https://github.com/phpmyadmin/phpmyadmin/commit/7a6085344369d2c716831e80135… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-09 (Sun, 09 Nov 2014) Changed paths: M db_create.php M db_structure.php M libraries/replication.inc.php M server_databases.php M server_replication.php M server_status.php M server_status_advisor.php M server_status_monitor.php M server_status_processes.php M server_status_queries.php M server_status_variables.php Log Message: ----------- Replace $replication_info by a global variable. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: b6f390ef09d39c0f1710a396c4deab3b5d29bfe8 https://github.com/phpmyadmin/phpmyadmin/commit/b6f390ef09d39c0f1710a396c4d… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-09 (Sun, 09 Nov 2014) Changed paths: M libraries/structure.lib.php Log Message: ----------- Fix PHPCS issues. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 8e6d16cf7e11ffd2fc20e22b6708c36d3b66d14d https://github.com/phpmyadmin/phpmyadmin/commit/8e6d16cf7e11ffd2fc20e22b670… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M db_create.php M db_structure.php M libraries/ServerStatusData.class.php M libraries/replication.inc.php M libraries/server_databases.lib.php M libraries/server_status.lib.php M libraries/structure.lib.php M server_databases.php M server_replication.php M server_status.php M server_status_advisor.php M server_status_monitor.php M server_status_processes.php M server_status_queries.php M server_status_variables.php M test/classes/PMA_ServerStatusData_test.php M test/libraries/PMA_server_databases_test.php M test/libraries/PMA_server_status_advisor_test.php M test/libraries/PMA_server_status_monitor_test.php M test/libraries/PMA_server_status_processes_test.php M test/libraries/PMA_server_status_queries_test.php M test/libraries/PMA_server_status_test.php M test/libraries/PMA_server_status_variables_test.php Log Message: ----------- Merge pull request #1389 from Tithugues/replicationInfo_master Use $replication_info everywhere, instead of $server_* variables. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/89ae63ddf96b...8e6d16cf7e11

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ed51a2: Allow import SQL without delimiter till EOF.
by Hugues Peccatte 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ed51a25c8f9f9db4bc2310de8b737007b2bacae6 https://github.com/phpmyadmin/phpmyadmin/commit/ed51a25c8f9f9db4bc2310de8b7… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-09 (Sun, 09 Nov 2014) Changed paths: M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Allow import SQL without delimiter till EOF. Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: 89ae63ddf96b829edc3e434fd32e0178e1266ebd https://github.com/phpmyadmin/phpmyadmin/commit/89ae63ddf96b829edc3e434fd32… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M libraries/plugins/import/ImportSql.class.php Log Message: ----------- Merge pull request #1392 from Tithugues/SQLWithoutDelimiter_master Allow import SQL without delimiter till EOF. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ab3a82fb25c0...89ae63ddf96b

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 19e146: Correctly match with separator
by Madhura Jayaratne 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 19e146ee4bf045ee6dd40740bf452a2152d696fd https://github.com/phpmyadmin/phpmyadmin/commit/19e146ee4bf045ee6dd40740bf4… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M libraries/navigation/Nodes/Node.class.php Log Message: ----------- Correctly match with separator Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: ab3a82fb25c0131bf7a5eeb0b761b2c641f4d9a7 https://github.com/phpmyadmin/phpmyadmin/commit/ab3a82fb25c0131bf7a5eeb0b76… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M libraries/navigation/Nodes/Node.class.php Log Message: ----------- Eliminate duplicates Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d8fa546e1f8...ab3a82fb25c0

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2d8fa5: ChangeLog entry for bug #3869
by Madhura Jayaratne 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2d8fa546e1f8e74d8056d9c1e02d9cbb72f82df2 https://github.com/phpmyadmin/phpmyadmin/commit/2d8fa546e1f8e74d8056d9c1e02… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for bug #3869 Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a1c159: Cache binary_logs variable
by Madhura Jayaratne 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a1c15902546e65037c7dc5a24c4ac3d56148aaf4 https://github.com/phpmyadmin/phpmyadmin/commit/a1c15902546e65037c7dc5a24c4… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M libraries/Menu.class.php Log Message: ----------- Cache binary_logs variable Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 686924: Update doc comment
by Madhura Jayaratne 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 686924d628c8a0ef635a47fe3b5b450da7c6d6e6 https://github.com/phpmyadmin/phpmyadmin/commit/686924d628c8a0ef635a47fe3b5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M test/classes/PMA_Footer_test.php Log Message: ----------- Update doc comment Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dfea0a: Fix footer test
by Madhura Jayaratne 10 Nov '14

10 Nov '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dfea0a4fa0a477f8d9c537670bd1a15d22a17898 https://github.com/phpmyadmin/phpmyadmin/commit/dfea0a4fa0a477f8d9c537670bd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-11-10 (Mon, 10 Nov 2014) Changed paths: M test/classes/PMA_Footer_test.php Log Message: ----------- Fix footer test Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0