Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2569fee671ea626164ce12c70161632d56800d87 https://github.com/phpmyadmin/phpmyadmin/commit/2569fee671ea626164ce12c70161... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-09-27 (Fri, 27 Sep 2013)
Changed paths: A libraries/Font.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php A test/classes/Font_test.php R test/classes/schema/Svg_test.php
Log Message: ----------- move duplicate getStringWidth method to seperate class
Commit: b4f38f1ba3ef5dbccbd143746f24623e501f2130 https://github.com/phpmyadmin/phpmyadmin/commit/b4f38f1ba3ef5dbccbd143746f24... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths: M libraries/Font.class.php
Log Message: ----------- move charLists generation to seperate method
Commit: 84aacaffbcfd7375ee9281b9c75322b1749ec16e https://github.com/phpmyadmin/phpmyadmin/commit/84aacaffbcfd7375ee9281b9c753... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths: M test/classes/Font_test.php
Log Message: ----------- add test for custom charlist
Commit: 0aa7bba99f0dea96c8ef3f44e4ba3a678b748014 https://github.com/phpmyadmin/phpmyadmin/commit/0aa7bba99f0dea96c8ef3f44e4ba... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths: R test/classes/Font_test.php A test/classes/PMA_Font_test.php
Log Message: ----------- rename file with PMA_Font class tests
Commit: 0fe2acc424fb3a2deef0e72ad10930609a0e27fe https://github.com/phpmyadmin/phpmyadmin/commit/0fe2acc424fb3a2deef0e72ad109... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths: M .gitignore A CONTRIBUTING.md M ChangeLog M PMAStandard/Sniffs/Commenting/FileCommentSniff.php M README M browse_foreigners.php M config.sample.inc.php M db_operations.php M db_sql.php M doc/conf.py M doc/config.rst M doc/credits.rst M doc/require.rst M doc/setup.rst A error_report.php M examples/openid.php M export.php M gis_data_editor.php M import.php M import_status.php M index.php M js/ajax.js M js/common.js M js/config.js M js/db_operations.js A js/error_report.js M js/functions.js M js/get_scripts.js.php M js/gis_data_editor.js M js/jquery/src/README M js/makegrid.js M js/messages.php M js/navigation.js M js/pmd/history.js M js/rte.js M js/server_databases.js M js/server_status_advisor.js M js/server_status_monitor.js M js/server_status_variables.js M js/server_user_groups.js M js/sql.js M js/tbl_change.js M js/tbl_chart.js M js/tbl_relation.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js A js/tracekit/tracekit.js M libraries/Advisor.class.php M libraries/Config.class.php M libraries/DBQbe.class.php M libraries/DatabaseInterface.class.php M libraries/DbSearch.class.php M libraries/DisplayResults.class.php M libraries/Error.class.php M libraries/Error_Handler.class.php M libraries/File.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Index.class.php M libraries/List.class.php M libraries/List_Database.class.php M libraries/Menu.class.php M libraries/OutputBuffering.class.php M libraries/PDF.class.php M libraries/RecentTable.class.php M libraries/Response.class.php M libraries/Scripts.class.php M libraries/ServerStatusData.class.php M libraries/StorageEngine.class.php M libraries/StringMB.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/Theme.class.php M libraries/Theme_Manager.class.php M libraries/Types.class.php M libraries/Util.class.php M libraries/bfShapeFiles/ShapeFile.lib.php M libraries/bookmark.lib.php M libraries/browse_foreigners.lib.php M libraries/build_html_for_db.lib.php M libraries/charset_conversion.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/ConfigFile.class.php M libraries/config/Form.class.php M libraries/config/FormDisplay.class.php M libraries/config/FormDisplay.tpl.php M libraries/config/Validator.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/core.lib.php M libraries/create_addfield.lib.php M libraries/db_info.inc.php M libraries/dbi/DBIDrizzle.class.php M libraries/dbi/DBIDummy.class.php M libraries/dbi/DBIExtension.int.php M libraries/dbi/DBIMysql.class.php M libraries/dbi/DBIMysqli.class.php M libraries/dbi/drizzle-wrappers.lib.php M libraries/display_create_table.lib.php M libraries/display_export.inc.php M libraries/display_export.lib.php M libraries/display_import.inc.php M libraries/display_select_lang.lib.php M libraries/engines/pbxt.lib.php A libraries/error_report.lib.php M libraries/file_listing.lib.php M libraries/gis/pma_gis_factory.php M libraries/gis/pma_gis_geometry.php M libraries/gis/pma_gis_geometrycollection.php M libraries/gis/pma_gis_linestring.php M libraries/gis/pma_gis_multilinestring.php M libraries/gis/pma_gis_multipoint.php M libraries/gis/pma_gis_multipolygon.php M libraries/gis/pma_gis_point.php M libraries/gis/pma_gis_polygon.php M libraries/gis/pma_gis_visualization.php M libraries/import.lib.php M libraries/index.lib.php M libraries/insert_edit.lib.php M libraries/kanji-encoding.lib.php M libraries/mult_submits.lib.php M libraries/mysql_charsets.lib.php M libraries/navigation/Navigation.class.php M libraries/navigation/NavigationHeader.class.php M libraries/navigation/NavigationTree.class.php M libraries/navigation/NodeFactory.class.php M libraries/navigation/Nodes/Node.class.php M libraries/navigation/Nodes/Node_Column.class.php M libraries/navigation/Nodes/Node_Column_Container.class.php M libraries/navigation/Nodes/Node_Database.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php M libraries/navigation/Nodes/Node_Function.class.php M libraries/navigation/Nodes/Node_Function_Container.class.php M libraries/navigation/Nodes/Node_Index.class.php M libraries/navigation/Nodes/Node_Index_Container.class.php M libraries/navigation/Nodes/Node_Procedure.class.php M libraries/navigation/Nodes/Node_Procedure_Container.class.php M libraries/navigation/Nodes/Node_Table.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_View.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M libraries/parse_analyze.inc.php M libraries/plugin_interface.lib.php M libraries/plugins/PluginManager.class.php M libraries/plugins/PluginObserver.class.php M libraries/plugins/auth/AuthenticationConfig.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M libraries/plugins/auth/AuthenticationSignon.class.php M libraries/plugins/auth/swekey/swekey.auth.lib.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/plugins/export/TableProperty.class.php M libraries/plugins/import/AbstractImportCsv.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportSql.class.php M libraries/plugins/import/README M libraries/plugins/import/ShapeFile.class.php M libraries/plugins/import/ShapeRecord.class.php M libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php M libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php M libraries/pmd_common.php M libraries/properties/PropertyItem.class.php M libraries/relation.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_main.inc.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.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/Pdf_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/select_lang.lib.php M libraries/server_bin_log.lib.php M libraries/server_collations.lib.php M libraries/server_common.lib.php M libraries/server_databases.lib.php M libraries/server_plugins.lib.php M libraries/server_privileges.lib.php M libraries/server_status.lib.php M libraries/server_status_advisor.lib.php M libraries/server_status_variables.lib.php M libraries/server_user_groups.lib.php M libraries/server_variables.lib.php M libraries/sql.lib.php M libraries/sql_query_form.lib.php M libraries/sqlparser.lib.php M libraries/sqlvalidator.lib.php M libraries/structure.lib.php M libraries/sysinfo.lib.php M libraries/tbl_chart.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_columns_definition_form.lib.php M libraries/tbl_gis_visualization.lib.php M libraries/tbl_indexes.lib.php M libraries/tbl_relation.lib.php M libraries/tbl_tracking.lib.php M libraries/tcpdf/README.TXT M libraries/tcpdf/include/tcpdf_colors.php M libraries/tcpdf/include/tcpdf_fonts.php M libraries/tcpdf/include/tcpdf_static.php M libraries/tcpdf/tcpdf.php M libraries/transformations.lib.php M libraries/url_generating.lib.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M pmd_relation_new.php 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 A po/ky.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/vls.po M po/zh_CN.po M po/zh_TW.po M prefs_forms.php M prefs_manage.php M schema_edit.php M scripts/create-release.sh A scripts/line-counts.sh M server_databases.php M server_engines.php M server_plugins.php M setup/config.php M setup/frames/config.inc.php M setup/frames/form.inc.php M setup/frames/index.inc.php M setup/frames/servers.inc.php M setup/lib/ConfigGenerator.class.php M setup/lib/common.inc.php M setup/lib/form_processing.lib.php M setup/lib/index.lib.php M setup/styles.css M setup/validate.php M sql.php M tbl_addfield.php M tbl_change.php M tbl_replace.php M tbl_sql.php M tbl_tracking.php M test/AllSeleniumTests.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_DisplayResults_test.php M test/classes/PMA_Error_Handler_test.php M test/classes/PMA_Error_test.php M test/classes/PMA_File_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_List_Database_test.php M test/classes/PMA_Menu_test.php M test/classes/PMA_Message_test.php M test/classes/PMA_PDF_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_TableReplaceSearch_test.php M test/classes/PMA_TableSearch_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_Drizzle_test.php M test/classes/config/PMA_FormDisplay_test.php M test/classes/config/PMA_Form_test.php M test/classes/dbi/DBIDrizzle_test.php M test/classes/dbi/DBIMysql_test.php M test/classes/navigation/PMA_NodeFactory_test.php M test/classes/navigation/PMA_Node_Column_Container_test.php M test/classes/navigation/PMA_Node_Column_test.php M test/classes/navigation/PMA_Node_Event_Container_test.php M test/classes/navigation/PMA_Node_Event_test.php M test/classes/navigation/PMA_Node_Function_Container_test.php M test/classes/navigation/PMA_Node_Function_test.php M test/classes/navigation/PMA_Node_Index_Container_test.php M test/classes/navigation/PMA_Node_Index_test.php M test/classes/navigation/PMA_Node_Procedure_Container_test.php M test/classes/navigation/PMA_Node_Procedure_test.php M test/classes/navigation/PMA_Node_Table_Container_test.php M test/classes/navigation/PMA_Node_Trigger_Container_test.php M test/classes/navigation/PMA_Node_Trigger_test.php M test/classes/navigation/PMA_Node_View_Container_test.php M test/classes/navigation/PMA_Node_test.php M test/classes/plugin/PMA_PluginManager_test.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php M test/classes/plugin/auth/PMA_AuthenticationSignon_test.php M test/classes/plugin/export/PMA_ExportCsv_test.php M test/classes/plugin/export/PMA_ExportExcel_test.php M test/classes/plugin/export/PMA_ExportHtmlword_test.php M test/classes/plugin/export/PMA_ExportOdt_test.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/classes/plugin/export/PMA_ExportTexytext_test.php M test/classes/plugin/export/PMA_ExportXml_test.php M test/classes/plugin/export/PMA_ExportYaml_test.php M test/classes/plugin/export/PMA_TableProperty_test.php M test/classes/plugin/import/ImportCsv_test.php M test/classes/plugin/import/ImportLdi_test.php M test/classes/plugin/import/ImportMediawiki_test.php M test/classes/plugin/import/ImportOds_test.php M test/classes/plugin/import/ImportShp_test.php M test/classes/plugin/import/ImportSql_test.php M test/classes/plugin/import/ImportXml_test.php M test/classes/plugin/transformations/Image_JPEG_Inline_test.php M test/classes/plugin/transformations/Image_Link_test.php M test/classes/plugin/transformations/Image_PNG_Inline_test.php M test/classes/plugin/transformations/Text_Plain_Append_test.php M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php M test/classes/plugin/transformations/Text_Plain_External_test.php M test/classes/plugin/transformations/Text_Plain_Formatted_test.php M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php M test/classes/plugin/transformations/Text_Plain_Link_test.php M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php M test/classes/plugin/transformations/Text_Plain_Sql_test.php M test/classes/plugin/transformations/Text_Plain_Substring_test.php M test/classes/properties/PMA_PorpertyItem_test.php M test/classes/properties/options/PMA_OptionsPropertyGroup_test.php M test/classes/properties/options/PMA_OptionsPropertyItem_test.php M test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php M test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php M test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php M test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php M test/classes/properties/options/items/PMA_PropertyItems_test.php M test/classes/properties/plugins/PMA_ExportPluginProperties_test.php M test/classes/properties/plugins/PMA_ImportPluginProperties_test.php M test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php M test/classes/schema/Dia_Relation_Schema_test.php M test/classes/schema/Eps_Relation_Schema_test.php M test/classes/schema/Pdf_Relation_Schema_test.php M test/classes/schema/Svg_Relation_Schema_test.php M test/classes/schema/User_Schema_test.php M test/engines/PMA_StorageEngine_pbxt_test.php M test/libraries/PMA_ConfigFile_test.php M test/libraries/PMA_ConfigGenerator_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_Form_Processing_test.php R test/libraries/PMA_Index_test.php M test/libraries/PMA_SQL_parse_analyze_test.php M test/libraries/PMA_SQL_parser_test.php M test/libraries/PMA_SQL_validator_test.php A test/libraries/PMA_SetupIndex_test.php M test/libraries/PMA_Tracker_test.php M test/libraries/PMA_config_functions_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_ip_allow_deny_test.php M test/libraries/PMA_kanji-encoding_test.php M test/libraries/PMA_mult_submits_test.php M test/libraries/PMA_mysql_charsets_test.php A test/libraries/PMA_prettyPrint_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_select_server_test.php M test/libraries/PMA_server_common_test.php M test/libraries/PMA_server_databases_test.php M test/libraries/PMA_tbl_chart_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php M test/libraries/PMA_tbl_gis_visualization_test.php M test/libraries/PMA_tbl_relation_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/common/PMA_browseUploadFile_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/common/PMA_formatSql_test.php M test/libraries/common/PMA_getDivForSliderEffect_test.php M test/libraries/common/PMA_printableBitValue_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M test/libraries/core/PMA_array_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/database_interface_test.php M themes/original/css/common.css.php A themes/original/img/lightbulb.png A themes/original/img/lightbulb_off.png A themes/original/img/s_info.png M themes/original/img/sprites.png M themes/original/sprites.lib.php M themes/pmahomme/css/common.css.php M themes/pmahomme/css/jqplot.css.php A themes/pmahomme/img/lightbulb.png A themes/pmahomme/img/lightbulb_off.png M themes/pmahomme/img/sprites.png M themes/pmahomme/sprites.lib.php M user_password.php M view_operations.php
Log Message: ----------- Merge branch 'master' into string_width
Conflicts: test/classes/schema/Svg_test.php
Commit: 8f9652e903b4560676a707e21461c61c3088b9db https://github.com/phpmyadmin/phpmyadmin/commit/8f9652e903b4560676a707e21461... Author: Marc Delisle marc@infomarc.info Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths: A libraries/Font.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php A test/classes/PMA_Font_test.php R test/classes/schema/Svg_test.php
Log Message: ----------- Merge pull request #719 from ruleant/string_width
move duplicate getStringWidth method to seperate class
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ecbcfa3e36ef...8f9652e903b4