June 2013 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7f80aa: Avoided the use of global variables by directly ac...
by Marc Delisle 13 Jun '13

13 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7f80aa29718d85ad2fdd427d02c77bec979c59a9 https://github.com/phpmyadmin/phpmyadmin/commit/7f80aa29718d85ad2fdd427d02c… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-11 (Tue, 11 Jun 2013) Changed paths: M sql.php Log Message: ----------- Avoided the use of global variables by directly accessing super global variables. Commit: 96bf1782d3464a21bda56cd0646258afa859309a https://github.com/phpmyadmin/phpmyadmin/commit/96bf1782d3464a21bda56cd0646… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-11 (Tue, 11 Jun 2013) Changed paths: M libraries/sql.lib.php M sql.php Log Message: ----------- PMA_getHtmlForConfirmPage method added to sql.lib.php to create html for the confirm page. Commit: 9ef591e69ebbf5ff96fb57601db28dfb47ff29db https://github.com/phpmyadmin/phpmyadmin/commit/9ef591e69ebbf5ff96fb57601db… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M sql.php Log Message: ----------- space added before elseif Commit: e32064bcd23f2bd18914d6610869d8e02b19a4eb https://github.com/phpmyadmin/phpmyadmin/commit/e32064bcd23f2bd18914d661086… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M libraries/sql.lib.php M sql.php Log Message: ----------- code for displaying confirm page removed. Commit: ca8d81b95c8a5523cf20525c414d9efaf2a70841 https://github.com/phpmyadmin/phpmyadmin/commit/ca8d81b95c8a5523cf20525c414… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M libraries/sqlparser.lib.php M sql.php Log Message: ----------- PMA_isDropDatabase($sql_query) method added to sqlparser.lib.php Commit: 3fabd7728f629ea4e44c8fc965d71c4005098443 https://github.com/phpmyadmin/phpmyadmin/commit/3fabd7728f629ea4e44c8fc965d… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M sql.php Log Message: ----------- $_POST['fields'][...] variables renamed such that they better reflect their intended purpose Commit: a9fd9aae5295be357a2868eb8923e577419d9556 https://github.com/phpmyadmin/phpmyadmin/commit/a9fd9aae5295be357a2868eb892… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/bookmark.lib.php Log Message: ----------- bookmark.lib.php corrected to use the new variable names in $_POST['bkm_fields'][..] Commit: 01a12cd253e4f8219392215fbb0363d085a1680d https://github.com/phpmyadmin/phpmyadmin/commit/01a12cd253e4f8219392215fbb0… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/bookmark.lib.php Log Message: ----------- error corrected Commit: 25a3a03e0cdef6f2ab4b0a1968e54fe6e683a550 https://github.com/phpmyadmin/phpmyadmin/commit/25a3a03e0cdef6f2ab4b0a1968e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/bookmark.lib.php M libraries/sqlparser.lib.php M sql.php Log Message: ----------- Merge pull request #415 from scnakandala/gsoc_2013 Refactoring SQL executor Compare: https://github.com/phpmyadmin/phpmyadmin/compare/17536941ec1b...25a3a03e0cde

1 0

[Phpmyadmin-git] [phpmyadmin/localized_docs] 247b1e: Translated using Weblate (Slovak)
by Peter Rosa 13 Jun '13

13 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 247b1e50ae7134652bdf0a98d63ef9e2902ace89 https://github.com/phpmyadmin/localized_docs/commit/247b1e50ae7134652bdf0a9… Author: Peter Rosa <peter.rosa(a)pro.sk> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M po/sk.mo M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 4.1% (57 of 1389)

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 175369: Improve function name
by Marc Delisle 13 Jun '13

13 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 17536941ec1bde89d96251cf8ccfed596cdfb89f https://github.com/phpmyadmin/phpmyadmin/commit/17536941ec1bde89d96251cf8cc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/server_status_monitor.lib.php Log Message: ----------- Improve function name

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9156b6: refactor server_status_monitor.php
by Marc Delisle 13 Jun '13

13 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9156b61c4000f7b56b986e36bcc64278dacfb5b3 https://github.com/phpmyadmin/phpmyadmin/commit/9156b61c4000f7b56b986e36bcc… Author: xmujay <xmujay(a)gmail.com> Date: 2013-06-10 (Mon, 10 Jun 2013) Changed paths: A libraries/server_status_monitor.lib.php M server_status_monitor.php Log Message: ----------- refactor server_status_monitor.php 1. split long functions 2. add server_status_monitor.lib.php Commit: 438c84178f5dbb7c0e55fba22084dab54f5ab509 https://github.com/phpmyadmin/phpmyadmin/commit/438c84178f5dbb7c0e55fba2208… Author: xmujay <xmujay(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M .travis.yml M ChangeLog M build.xml M db_create.php M db_operations.php M db_routines.php M db_structure.php M db_tracking.php M doc/config.rst M doc/faq.rst M doc/setup.rst M index.php M js/server_privileges.js M js/tbl_structure.js M libraries/DatabaseInterface.class.php M libraries/Header.class.php M libraries/Util.class.php M libraries/check_user_privileges.lib.php M libraries/config.default.php M libraries/config/FormDisplay.tpl.php M libraries/config/config_functions.lib.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/core.lib.php M libraries/database_interface.inc.php M libraries/dbi/DBIDummy.class.php M libraries/display_create_database.lib.php M libraries/display_import_ajax.lib.php M libraries/display_structure.lib.php M libraries/error.inc.php M libraries/insert_edit.lib.php M libraries/ip_allow_deny.lib.php A libraries/mysql_charsets.inc.php M libraries/mysql_charsets.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/recaptchalib.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/upload/UploadApc.class.php M libraries/plugins/import/upload/UploadProgress.class.php M libraries/plugins/import/upload/UploadSession.class.php M libraries/relation.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/User_Schema.class.php R libraries/schema/Visio_Relation_Schema.class.php A libraries/server_collations.lib.php M libraries/server_common.lib.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/sqlparser.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_views.lib.php M phpunit.xml.dist M phpunit.xml.nocoverage M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/zh_CN.po M po/zh_TW.po M server_collations.php M server_engines.php M server_privileges.php M sql.php M tbl_addfield.php M tbl_operations.php M tbl_row_action.php M tbl_select.php M tbl_structure.php M tbl_zoom_select.php M test/Environment_test.php M test/bootstrap-dist.php M test/classes/PMA_Advisor_test.php M test/classes/PMA_Config_test.php M test/classes/PMA_DBQbe_test.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Header_test.php M test/classes/PMA_Index_test.php M test/classes/PMA_Menu_test.php M test/classes/PMA_Message_test.php M test/classes/PMA_Table_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Theme_test.php M test/classes/PMA_Types_MySQL_test.php M test/classes/config/PMA_Form_test.php M test/classes/navigation/PMA_Node_Column_test.php M test/classes/navigation/PMA_Node_test.php A test/classes/plugin/transformations/Text_Plain_Append_test.php A test/classes/schema/Export_Relation_Schema_test.php M test/libraries/PMA_SQL_parser_test.php M test/libraries/PMA_build_html_for_db_test.php A test/libraries/PMA_charset_conversion_test.php M test/libraries/PMA_generateCommonUrl_test.php A test/libraries/PMA_iconv_wrapper_test.php A test/libraries/PMA_kanji-encoding_test.php A test/libraries/PMA_mysql_charsets_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_sanitize_test.php M test/libraries/PMA_transformation_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/common/PMA_getDbLink_test.php M test/libraries/common/PMA_showDocu_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M test/libraries/common/PMA_showPHPDocu_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/core/PMA_securePath_test.php M test/libraries/core/PMA_warnMissingExtension_test.php M test/libraries/database_interface_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php M themes.php M transformation_overview.php M view_operations.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0609_monitor Commit: 6acdec1aefde7f9377e84a288d8dbc33f93f545d https://github.com/phpmyadmin/phpmyadmin/commit/6acdec1aefde7f9377e84a288d8… Author: xmujay <xmujay(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M libraries/server_status_monitor.lib.php M server_status_monitor.php Log Message: ----------- rename the function to a meaningful name Commit: abaca785168fa4be8008b7a286b5cbfae69be1a4 https://github.com/phpmyadmin/phpmyadmin/commit/abaca785168fa4be8008b7a286b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: A libraries/server_status_monitor.lib.php M server_status_monitor.php Log Message: ----------- Merge pull request #421 from xmujay/0609_monitor refactor server_status_monitor.php 1. split long functions 2. add server_status_monitor.lib.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b1e8e9c233ac...abaca785168f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8fbf5e: Translated using Weblate (Urdu)
by Weblate 13 Jun '13

13 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fbf5eac291d499b942d400b5ff56c38f202f22d https://github.com/phpmyadmin/phpmyadmin/commit/8fbf5eac291d499b942d400b5ff… Author: Muhammad Kamran <kamran.usman(a)gmail.com> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M po/ur.po Log Message: ----------- Translated using Weblate (Urdu) Currently translated at 24.2% (646 of 2673) Commit: b1e8e9c233aca7f369ee8ea822793296685f3b45 https://github.com/phpmyadmin/phpmyadmin/commit/b1e8e9c233aca7f369ee8ea8227… Author: Weblate <noreply(a)weblate.org> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/navigation/NavigationTree.class.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e34445c69b40...b1e8e9c233ac

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e6e587: Added accesskey="q" to searchClause input field to...
by Michal Čihař 13 Jun '13

13 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e6e587353473928868f3abed3e70b8e739a1cc85 https://github.com/phpmyadmin/phpmyadmin/commit/e6e587353473928868f3abed3e7… Author: Christoph Wiechert <wio(a)psitrax.de> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/navigation/NavigationTree.class.php Log Message: ----------- Added accesskey="q" to searchClause input field to quickly focus it per hotkey Commit: e34445c69b4047e0fb258924eadd2ab2537da98b https://github.com/phpmyadmin/phpmyadmin/commit/e34445c69b4047e0fb258924ead… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-06-13 (Thu, 13 Jun 2013) Changed paths: M libraries/navigation/NavigationTree.class.php Log Message: ----------- Merge pull request #422 from psi-4ward/searchClause_hotkey Added accesskey="q" to searchClause input field to quickly get focus Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ca3c8a0383f4...e34445c69b40

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ca3c8a: Optional @test annotation for tests
by Madhura Jayaratne 12 Jun '13

12 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ca3c8a0383f4dd094bcd5cd368b4ec1786d030f0 https://github.com/phpmyadmin/phpmyadmin/commit/ca3c8a0383f4dd094bcd5cd368b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M test/libraries/PMA_charset_conversion_test.php M test/libraries/PMA_iconv_wrapper_test.php M test/libraries/PMA_kanji-encoding_test.php M test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Optional @test annotation for tests

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] df657a: Coding style fixes for new tests
by Madhura Jayaratne 12 Jun '13

12 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: df657a2a2ed54ae56b880353a871c6016f7a0bd9 https://github.com/phpmyadmin/phpmyadmin/commit/df657a2a2ed54ae56b880353a87… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M test/libraries/PMA_charset_conversion_test.php M test/libraries/PMA_iconv_wrapper_test.php M test/libraries/PMA_kanji-encoding_test.php M test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Coding style fixes for new tests

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 65f7f3: Translated using Weblate (Slovenian)
by Weblate 12 Jun '13

12 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 65f7f3eff5e8b30a6789962ee49cf52af6b5b37b https://github.com/phpmyadmin/phpmyadmin/commit/65f7f3eff5e8b30a6789962ee49… Author: Domen <dbc334(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 99.9% (2671 of 2673) Commit: efc0b1fd3b407a6dec6c1d74307122cad57fd766 https://github.com/phpmyadmin/phpmyadmin/commit/efc0b1fd3b407a6dec6c1d74307… Author: Weblate <noreply(a)weblate.org> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M libraries/dbi/DBIDummy.class.php A test/libraries/PMA_charset_conversion_test.php A test/libraries/PMA_iconv_wrapper_test.php A test/libraries/PMA_kanji-encoding_test.php A test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/53a4f78d63b8...efc0b1fd3b40

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] febc05: Unit tests for charset conversions
by Madhura Jayaratne 12 Jun '13

12 Jun '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: febc05dae0613d097522ffff88aab4467f03d410 https://github.com/phpmyadmin/phpmyadmin/commit/febc05dae0613d097522ffff88a… Author: ayushchd <ayushchd(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M libraries/dbi/DBIDummy.class.php A test/libraries/PMA_charset_conversion_test.php A test/libraries/PMA_iconv_wrapper_test.php A test/libraries/PMA_kanji-encoding_test.php A test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Unit tests for charset conversions Added test cases for: 1. libraries/char* 2. libraries/iconv* 3. libraries/kanji* Commit: dd56dd2401332778319e2f7ba3070969c6f80278 https://github.com/phpmyadmin/phpmyadmin/commit/dd56dd2401332778319e2f7ba30… Author: ayushchd <ayushchd(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M test/libraries/PMA_kanji-encoding_test.php M test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Mark test incomplete if runkit is missing Commit: 817dd4e357e68135e78d92abd6b0632f73ae3dc5 https://github.com/phpmyadmin/phpmyadmin/commit/817dd4e357e68135e78d92abd6b… Author: ayushchd <ayushchd(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M test/libraries/PMA_charset_conversion_test.php Log Message: ----------- Comment added for test case Commit: 5ab5cb0f94d4406eb8c33f064614fb09c1060b83 https://github.com/phpmyadmin/phpmyadmin/commit/5ab5cb0f94d4406eb8c33f06461… Author: ayushchd <ayushchd(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M .travis.yml M ChangeLog M build.xml M db_create.php M db_operations.php M db_routines.php M db_structure.php M db_tracking.php M doc/config.rst M doc/faq.rst M doc/setup.rst M export.php M import_status.php M index.php M js/ajax.js M libraries/DatabaseInterface.class.php M libraries/Error.class.php M libraries/Header.class.php M libraries/Menu.class.php M libraries/Util.class.php M libraries/check_user_privileges.lib.php M libraries/config.default.php M libraries/config/FormDisplay.tpl.php M libraries/config/config_functions.lib.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/core.lib.php M libraries/database_interface.inc.php M libraries/dbi/DBIDummy.class.php M libraries/display_create_database.lib.php M libraries/display_import_ajax.lib.php M libraries/display_structure.lib.php M libraries/error.inc.php M libraries/insert_edit.lib.php M libraries/ip_allow_deny.lib.php A libraries/mysql_charsets.inc.php M libraries/mysql_charsets.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/recaptchalib.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/upload/UploadApc.class.php M libraries/plugins/import/upload/UploadProgress.class.php M libraries/plugins/import/upload/UploadSession.class.php M libraries/relation.lib.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/User_Schema.class.php R libraries/schema/Visio_Relation_Schema.class.php A libraries/server_bin_log.lib.php A libraries/server_collations.lib.php M libraries/server_common.inc.php A libraries/server_common.lib.php A libraries/server_plugins.lib.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/sqlparser.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_views.lib.php M phpunit.xml.dist M phpunit.xml.nocoverage M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/zh_CN.po M po/zh_TW.po M scripts/advisor2po M server_binlog.php M server_collations.php M server_engines.php M server_plugins.php M server_privileges.php M sql.php M tbl_addfield.php M tbl_operations.php M tbl_row_action.php M tbl_select.php M tbl_structure.php M tbl_zoom_select.php M test/Environment_test.php M test/bootstrap-dist.php M test/classes/PMA_Advisor_test.php M test/classes/PMA_Config_test.php M test/classes/PMA_DBQbe_test.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Header_test.php M test/classes/PMA_Index_test.php M test/classes/PMA_Menu_test.php M test/classes/PMA_Message_test.php M test/classes/PMA_Table_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Theme_test.php M test/classes/PMA_Types_MySQL_test.php M test/classes/config/PMA_Form_test.php M test/classes/navigation/PMA_Node_Column_test.php M test/classes/navigation/PMA_Node_test.php A test/classes/plugin/transformations/Text_Plain_Append_test.php A test/classes/schema/Export_Relation_Schema_test.php M test/libraries/PMA_SQL_parser_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/PMA_generateCommonUrl_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_sanitize_test.php M test/libraries/PMA_transformation_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/common/PMA_getDbLink_test.php M test/libraries/common/PMA_showDocu_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M test/libraries/common/PMA_showPHPDocu_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_headerLocation_test.php M test/libraries/core/PMA_securePath_test.php M test/libraries/core/PMA_warnMissingExtension_test.php M test/libraries/database_interface_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php M themes.php M transformation_overview.php M view_operations.php Log Message: ----------- Conflict resolve with DBIDummy Class Commit: 53a4f78d63b80ab684577b2241c7b8ed59f33f17 https://github.com/phpmyadmin/phpmyadmin/commit/53a4f78d63b80ab684577b2241c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2013-06-12 (Wed, 12 Jun 2013) Changed paths: M libraries/dbi/DBIDummy.class.php A test/libraries/PMA_charset_conversion_test.php A test/libraries/PMA_iconv_wrapper_test.php A test/libraries/PMA_kanji-encoding_test.php A test/libraries/PMA_mysql_charsets_test.php Log Message: ----------- Merge pull request #418 from ayushchd/unit_testing Unit tests for charset conversions Compare: https://github.com/phpmyadmin/phpmyadmin/compare/377693596511...53a4f78d63b8

1 0