Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 68b2be5f3117f0eb85ad92d9c581c2aa486238bf https://github.com/phpmyadmin/phpmyadmin/commit/68b2be5f3117f0eb85ad92d9c581... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths: M libraries/sql.lib.php M libraries/user_preferences.lib.php M sql.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_File_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_List_Database_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/PMA_Util_test.php M test/classes/gis/PMA_GIS_Geometrycollection_test.php M test/classes/gis/PMA_GIS_Linestring_test.php M test/classes/gis/PMA_GIS_Multilinestring_test.php M test/classes/gis/PMA_GIS_Multipoint_test.php M test/classes/gis/PMA_GIS_Multipolygon_test.php M test/classes/gis/PMA_GIS_Point_test.php M test/classes/gis/PMA_GIS_Polygon_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_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/ImportSql_test.php M test/classes/plugin/import/ImportXml_test.php M test/libraries/PMA_user_preferences_test.php

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table

Commit: 9f7b725a47219e3ce773f34d015385392e9aa1e5 https://github.com/phpmyadmin/phpmyadmin/commit/9f7b725a47219e3ce773f34d0153... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-08-08 (Thu, 08 Aug 2013)

Changed paths: M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_columns_definition_form.lib.php M po/fi.po

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table

Commit: 1f8604e9a31d3a5a9c2172e6f6f305cddc01d270 https://github.com/phpmyadmin/phpmyadmin/commit/1f8604e9a31d3a5a9c2172e6f6f3... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths: M ChangeLog M export.php M js/messages.php M libraries/navigation/NavigationHeader.class.php M libraries/server_status_monitor.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_columns_definition_form.lib.php M libraries/zip.lib.php M pmd_pdf.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 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 test/classes/PMA_Table_test.php M test/classes/navigation/PMA_Node_Database_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_Table_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_View_test.php M test/classes/navigation/PMA_Node_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/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/libraries/PMA_ip_allow_deny_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_relation_test.php A test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_server_user_groups_test.php

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table

Commit: 05f7400ff9cae5e6746e0de5a94f072bf2db2876 https://github.com/phpmyadmin/phpmyadmin/commit/05f7400ff9cae5e6746e0de5a94f... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths: M test/classes/PMA_Advisor_test.php M test/classes/PMA_Config_test.php M test/classes/PMA_Table_test.php M test/classes/PMA_Util_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_tbl_relation_test.php

Log Message: ----------- fix code Static Analysis Warnings

Commit: 8c7566093da7f03204b8df6fd2911377b3947ce5 https://github.com/phpmyadmin/phpmyadmin/commit/8c7566093da7f03204b8df6fd291... Author: adamgsoc2013 adamgsoc2013@gmail.com Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths: M test/libraries/PMA_relation_test.php

Log Message: ----------- fix the assertion error for testPMAGetRelationsParam

Commit: a4cf73c1ad93e2e6e7e32ded92715d23f798121a https://github.com/phpmyadmin/phpmyadmin/commit/a4cf73c1ad93e2e6e7e32ded9271... Author: Michal Čihař michal@cihar.com Date: 2013-08-11 (Sun, 11 Aug 2013)

Changed paths: M test/classes/PMA_Advisor_test.php M test/classes/PMA_Config_test.php M test/classes/PMA_Table_test.php M test/classes/PMA_Util_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_relation_cleanup_test.php M test/libraries/PMA_relation_test.php M test/libraries/PMA_tbl_relation_test.php

Log Message: ----------- Merge pull request #587 from adamgsoc2013/UT_plu_table

fix code Static Analysis Warnings

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f0cdccecdbc8...a4cf73c1ad93