Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 21b026a44d1417a29080a515c9c2f1ad17341e2a https://github.com/phpmyadmin/phpmyadmin/commit/21b026a44d1417a29080a515c9c2... Author: Mohamed Ashraf mohamed.ashraf.213@gmail.com Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths: M libraries/error_report.lib.php
Log Message: ----------- Added another prettifying function and changed the way the report is represented in the dialog
Commit: 6816436eac71440911d501325b9f2e2af62778b7 https://github.com/phpmyadmin/phpmyadmin/commit/6816436eac71440911d501325b9f... Author: Mohamed Ashraf mohamed.ashraf.213@gmail.com Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths: A CONTRIBUTING.md M ChangeLog M PMAStandard/Sniffs/Commenting/FileCommentSniff.php M README M doc/conf.py M doc/config.rst M doc/credits.rst M doc/require.rst M export.php M gis_data_editor.php M js/ajax.js M js/config.js M js/error_report.js M js/functions.js M js/messages.php M js/navigation.js M js/sql.js M js/tbl_change.js M libraries/Advisor.class.php M libraries/Config.class.php M libraries/DBQbe.class.php M libraries/DatabaseInterface.class.php M libraries/DisplayResults.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/ServerStatusData.class.php M libraries/StorageEngine.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/Util.class.php M libraries/bookmark.lib.php M libraries/charset_conversion.lib.php M libraries/common.inc.php M libraries/config.default.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/core.lib.php M libraries/dbi/DBIDummy.class.php M libraries/dbi/DBIExtension.int.php M libraries/dbi/DBIMysql.class.php M libraries/dbi/drizzle-wrappers.lib.php M libraries/display_export.lib.php M libraries/display_select_lang.lib.php M libraries/engines/pbxt.lib.php M 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/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/plugin_interface.lib.php M libraries/plugins/PluginManager.class.php M libraries/plugins/PluginObserver.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/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/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/relation.lib.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/rte/rte_routines.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_databases.lib.php M libraries/server_privileges.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_gis_visualization.lib.php M libraries/tbl_relation.lib.php M libraries/tbl_tracking.lib.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 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 tbl_replace.php M test/AllSeleniumTests.php M test/classes/PMA_Advisor_test.php M test/classes/PMA_DBQbe_test.php M test/classes/PMA_File_test.php M test/classes/PMA_Header_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_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_Trigger_Container_test.php M test/classes/navigation/PMA_Node_Trigger_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_ExportExcel_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_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_Imagelink_test.php M test/classes/plugin/transformations/Text_Plain_Longtoipv4_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/Svg_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_ip_allow_deny_test.php M test/libraries/PMA_mult_submits_test.php M test/libraries/PMA_mysql_charsets_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_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_getDivForSliderEffect_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting_pretty_fix
Commit: 5c102f48aff35bb78c3aca6e2ae03a81fee50240 https://github.com/phpmyadmin/phpmyadmin/commit/5c102f48aff35bb78c3aca6e2ae0... Author: Mohamed Ashraf mohamed.ashraf.213@gmail.com Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths: M libraries/error_report.lib.php A test/libraries/PMA_prettyPrint_test.php
Log Message: ----------- Added test cases for PMA_prettyPrint
Commit: 71862deca2e48e90e33b9d602a72904f3ec12455 https://github.com/phpmyadmin/phpmyadmin/commit/71862deca2e48e90e33b9d602a72... Author: Mohamed Ashraf mohamed.ashraf.213@gmail.com Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths: M libraries/error_report.lib.php
Log Message: ----------- fixed merge conflict bug
Commit: 2549260267e876945a75dface399167d0c72964c https://github.com/phpmyadmin/phpmyadmin/commit/2549260267e876945a75dface399... Author: Mohamed Ashraf mohamed.ashraf.213@gmail.com Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths: M test/libraries/PMA_prettyPrint_test.php
Log Message: ----------- removed no-op method
Commit: 3a76b83343c8ffb4cec349cc33308ab81c8629cb https://github.com/phpmyadmin/phpmyadmin/commit/3a76b83343c8ffb4cec349cc3330... Author: Mohamed Ashraf mohamed.ashraf.213@gmail.com Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths: M libraries/error_report.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Moved inline css to theme files
Commit: 118c6f3501e4e196e5d60cf3c4f3d088e555eba5 https://github.com/phpmyadmin/phpmyadmin/commit/118c6f3501e4e196e5d60cf3c4f3... Author: Michal Čihař michal@cihar.com Date: 2013-11-18 (Mon, 18 Nov 2013)
Changed paths: M libraries/error_report.lib.php A test/libraries/PMA_prettyPrint_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge pull request #735 from m0hamed/error_reporting_pretty_fix
Fixed prettifying for older php versions
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fc9bb0da1de9...118c6f3501e4