Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: febc05dae0613d097522ffff88aab4467f03d410 https://github.com/phpmyadmin/phpmyadmin/commit/febc05dae0613d097522ffff88aa... Author: ayushchd ayushchd@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/dd56dd2401332778319e2f7ba307... Author: ayushchd ayushchd@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/817dd4e357e68135e78d92abd6b0... Author: ayushchd ayushchd@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/5ab5cb0f94d4406eb8c33f064614... Author: ayushchd ayushchd@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@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@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@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/53a4f78d63b80ab684577b2241c7... Author: Madhura Jayaratne madhura.cj@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