23 Jul
2015
23 Jul
'15
4:05 p.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 66361530713fcf99b9e090b82ccd016dc3c287b2
https://github.com/phpmyadmin/phpmyadmin/commit/66361530713fcf99b9e090b82cc…
Author: Jason <jason.daurus(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M db_structure.php
M libraries/DBQbe.class.php
M libraries/DatabaseInterface.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Table.class.php
R libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/controllers/TableRelationController.class.php
A libraries/controllers/TableSearchController.class.php
M libraries/db_table_exists.lib.php
M libraries/display_export.lib.php
M libraries/export.lib.php
M libraries/import.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
M libraries/relation.lib.php
M libraries/sql.lib.php
M libraries/structure.lib.php
M libraries/tbl_info.inc.php
M libraries/tracking.lib.php
M tbl_find_replace.php
M tbl_operations.php
M tbl_replace.php
M tbl_select.php
M tbl_tracking.php
M tbl_zoom_select.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/libraries/PMA_display_export_test.php
Log Message:
-----------
Resolve conflicts from upstream
Signed-off-by: Jason <jason.daurus(a)gmail.com>
Commit: 12ac57e0bd60ef1e3b63e95ce64d0137a8df25d8
https://github.com/phpmyadmin/phpmyadmin/commit/12ac57e0bd60ef1e3b63e95ce64…
Author: Jason <jason.daurus(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
R test/classes/PMA_TableReplaceSearch_test.php
R test/classes/PMA_TableSearch_test.php
Log Message:
-----------
Remove references to TableSearch.class.php
Signed-off-by: Jason <jason.daurus(a)gmail.com>
Commit: 6fd29078b645c9f8a3c38cf9e9a346ee4aa303af
https://github.com/phpmyadmin/phpmyadmin/commit/6fd29078b645c9f8a3c38cf9e9a…
Author: Jason <jason.daurus(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M db_datadict.php
M libraries/DatabaseInterface.class.php
M libraries/DisplayResults.class.php
M libraries/Table.class.php
M libraries/controllers/TableRelationController.class.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/structure.lib.php
M libraries/tbl_info.inc.php
M tbl_relation.php
M tbl_structure.php
M templates/tbl_relation/foreign_key_row.phtml
A test/classes/PMA_TableReplaceSearch_test.php
A test/classes/PMA_TableSearch_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Fix test failures
Signed-off-by: Jason <jason.daurus(a)gmail.com>
Commit: 682614277c35bcaf388589ad139fd1aaf709e9db
https://github.com/phpmyadmin/phpmyadmin/commit/682614277c35bcaf388589ad139…
Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M db_datadict.php
M db_structure.php
M libraries/DBQbe.class.php
M libraries/DatabaseInterface.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Table.class.php
R libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/controllers/TableRelationController.class.php
A libraries/controllers/TableSearchController.class.php
M libraries/db_table_exists.lib.php
M libraries/display_export.lib.php
M libraries/export.lib.php
M libraries/import.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/export/ExportXml.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/relation.lib.php
M libraries/sql.lib.php
M libraries/structure.lib.php
M libraries/tbl_info.inc.php
M libraries/tracking.lib.php
M tbl_find_replace.php
M tbl_operations.php
M tbl_relation.php
M tbl_replace.php
M tbl_select.php
M tbl_structure.php
M tbl_tracking.php
M tbl_zoom_select.php
M templates/tbl_relation/foreign_key_row.phtml
M test/classes/PMA_TableReplaceSearch_test.php
M test/classes/PMA_TableSearch_test.php
M test/classes/PMA_Table_test.php
M test/classes/plugin/export/PMA_ExportSql_test.php
M test/classes/plugin/export/PMA_ExportXml_test.php
M test/libraries/PMA_display_export_test.php
M test/libraries/PMA_insert_edit_test.php
Log Message:
-----------
Merge pull request #1777 from gzzhanghao/table
WIP: Refining Table & TableSearch class
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84baa4df3ed8...682614277c35