Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 92b71154be66e67860a94530b6ab762e79f336f3 https://github.com/phpmyadmin/phpmyadmin/commit/92b71154be66e67860a94530b6ab... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths: M libraries/common.lib.php M libraries/display_tbl.lib.php M sql.php
Log Message: ----------- Introduce DisplayResults class
Commit: 54119d89e91755c007ce4b9fb2282c4e43f14771 https://github.com/phpmyadmin/phpmyadmin/commit/54119d89e91755c007ce4b9fb228... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths: M libraries/display_tbl.lib.php
Log Message: ----------- Add constants to DisplayResults class
Commit: 8b5195b4cfcb2691d34b469d19cebe5fe7ab98fe https://github.com/phpmyadmin/phpmyadmin/commit/8b5195b4cfcb2691d34b469d19ce... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths: M libraries/insert_edit.lib.php M tbl_replace.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: 0f86dd71520d8f8b03f56fce2e640a250d6b3be4 https://github.com/phpmyadmin/phpmyadmin/commit/0f86dd71520d8f8b03f56fce2e64... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths: A libraries/DisplayResults.class.php R libraries/display_tbl.lib.php M sql.php M tbl_replace.php
Log Message: ----------- Renamed display_tbl.lib.php file as DisplayResults.class.php
Commit: 0689a312bd0d37d3a4fb3416c2ab1a7b5a125e6d https://github.com/phpmyadmin/phpmyadmin/commit/0689a312bd0d37d3a4fb3416c2ab... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- Fix some code violations
Commit: 2aec4150b0345e6189552981570105f86fbb8e52 https://github.com/phpmyadmin/phpmyadmin/commit/2aec4150b0345e61895529815701... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php M sql.php
Log Message: ----------- Implement constructor and use global variable instead of variable , which imported from superglobals for functions
Commit: 4e01dd5ae5690ebbc79454def437ddce9a52ac70 https://github.com/phpmyadmin/phpmyadmin/commit/4e01dd5ae5690ebbc79454def437... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths: M ChangeLog M config.sample.inc.php M js/server_status.js M js/server_variables.js M js/tbl_zoom_plot_jqplot.js M libraries/common.lib.php M libraries/tbl_select.lib.php M sql.php M tbl_select.php M tbl_zoom_select.php
Log Message: ----------- Resolved conflict in common.lib.php
Commit: a3d970c981bd6ea0e65a2bcc8d6e5d2fa3945515 https://github.com/phpmyadmin/phpmyadmin/commit/a3d970c981bd6ea0e65a2bcc8d6e... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- use global variable _table instead of variable table, which imported from superglobals for functions
Commit: 3b2538a6a405976a96214d068ed157cdb672df9a https://github.com/phpmyadmin/phpmyadmin/commit/3b2538a6a405976a96214d068ed1... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- use global variable _goto instead of variable goto, which imported from superglobals for functions
Commit: 2b38b9501e49f92a5632eff49eed1c47756531ea https://github.com/phpmyadmin/phpmyadmin/commit/2b38b9501e49f92a5632eff49eed... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- use global variable _sql_query instead of variable sql_query, which imported from superglobals for functions
Commit: 146fbc4c9300db83e4e8c13fc66db09b6147601c https://github.com/phpmyadmin/phpmyadmin/commit/146fbc4c9300db83e4e8c13fc66d... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- Remove useless variable cfgRelation from both constructor and getTable() function
Commit: ba97627d1c829d6930e9d9867fade38b72b74a34 https://github.com/phpmyadmin/phpmyadmin/commit/ba97627d1c829d6930e9d9867fad... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php M sql.php
Log Message: ----------- Correction sql file and use docblock comment for constructor of PMA_DisplayResults class
Commit: be37fd3d962e265c784d62ecc2826263af153c33 https://github.com/phpmyadmin/phpmyadmin/commit/be37fd3d962e265c784d62ecc282... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-12 (Tue, 12 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- Use superglobals instead of importing superglobals inside functions
Commit: 8782c6d3144e343d6e993edfccc76aeeffd0e5b3 https://github.com/phpmyadmin/phpmyadmin/commit/8782c6d3144e343d6e993edfccc7... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- Fixed bug due to breaking _getTableBody() into subfunctions - link is missing where foreign key pointing to relavant table
Commit: 253de23cf39dafe330b2ba18ab097c0acc10b2b8 https://github.com/phpmyadmin/phpmyadmin/commit/253de23cf39dafe330b2ba18ab09... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths: M Documentation.html M browse_foreigners.php M chk_rel.php M db_create.php M db_datadict.php M db_events.php M db_export.php M db_import.php M db_operations.php M db_printview.php M db_qbe.php M db_routines.php M db_search.php M db_sql.php M db_structure.php M db_tables_search.php M db_tracking.php M db_triggers.php M export.php M gis_data_editor.php M import.php M index.php M js/common.js M js/config.js M js/cross_framing_protection.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/server_status.js M js/server_status_monitor.js M js/server_variables.js M js/sql.js M js/tbl_change.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js M libraries/Error.class.php M libraries/Error_Handler.class.php A libraries/Footer.class.php A libraries/Header.class.php M libraries/Menu.class.php M libraries/Message.class.php A libraries/OutputBuffering.class.php M libraries/PDF.class.php A libraries/Response.class.php A libraries/Scripts.class.php M libraries/Theme.class.php M libraries/Theme_Manager.class.php M libraries/auth/config.auth.lib.php M libraries/auth/cookie.auth.lib.php M libraries/auth/http.auth.lib.php M libraries/common.inc.php M libraries/common.lib.php M libraries/core.lib.php M libraries/db_common.inc.php M libraries/display_export.lib.php M libraries/display_git_revision.lib.php M libraries/display_import.lib.php M libraries/error.inc.php R libraries/footer.inc.php R libraries/header.inc.php R libraries/header_http.inc.php R libraries/header_meta_style.inc.php R libraries/header_printview.inc.php R libraries/header_scripts.inc.php M libraries/insert_edit.lib.php M libraries/mult_submits.inc.php M libraries/navigation_header.inc.php R libraries/ob.lib.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_export.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/Export_Relation_Schema.class.php M libraries/server_common.inc.php M libraries/tbl_common.inc.php M libraries/tbl_info.inc.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M main.php M navigation.php M pmd_display_field.php M pmd_general.php M pmd_pdf.php M pmd_relation_new.php M pmd_relation_upd.php M prefs_forms.php M prefs_manage.php M querywindow.php M schema_edit.php M schema_export.php M server_binlog.php M server_collations.php M server_databases.php M server_engines.php M server_export.php M server_import.php M server_plugins.php M server_privileges.php M server_replication.php M server_sql.php M server_status.php M server_synchronize.php M server_variables.php M setup/index.php M setup/styles.css M sql.php M tbl_addfield.php M tbl_alter.php M tbl_change.php M tbl_chart.php M tbl_create.php M tbl_export.php M tbl_gis_visualization.php M tbl_import.php M tbl_indexes.php M tbl_move_copy.php M tbl_operations.php M tbl_printview.php M tbl_relation.php M tbl_replace.php M tbl_row_action.php M tbl_select.php M tbl_sql.php M tbl_structure.php M tbl_tracking.php M tbl_zoom_select.php R test/PMA_showHint_test.php R test/libraries/common/PMA_ajaxResponse_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_headerLocation_test_disabled.php M themes.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php M themes/sprites.css.php M transformation_overview.php M transformation_wrapper.php M user_password.php M view_create.php M view_operations.php
Log Message: ----------- Resolved conflicts
Commit: 9fba69e73ae53b4f4da8ebb37cfcfb158842c101 https://github.com/phpmyadmin/phpmyadmin/commit/9fba69e73ae53b4f4da8ebb37cfc... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths: M db_structure.php M libraries/common.lib.php M navigation.php M server_databases.php
Log Message: ----------- Modifications to PMA_listNavigator() function in common.lib.php and renamed as PMA_getListNavigator()
Commit: 71b01ec8799280a5f2967c98286673e963836bb0 https://github.com/phpmyadmin/phpmyadmin/commit/71b01ec8799280a5f2967c982866... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths: M libraries/common.lib.php M libraries/display_export.lib.php
Log Message: ----------- Modifications to PMA_externalBug() function in common.lib.php and renamed as PMA_getExternalBug()
Commit: c5127066772e55ad556a6ef8e94d550752334e88 https://github.com/phpmyadmin/phpmyadmin/commit/c5127066772e55ad556a6ef8e94d... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths: M libraries/common.lib.php M libraries/display_import.lib.php M test/libraries/common/PMA_browseUploadFile_test.php
Log Message: ----------- Modifications to PMA_browseUploadFile() function in common.lib.php and renamed as PMA_getBrowseUploadFileBlock()
Commit: 4720a4884cdb5b36069bc4dfc8c28cc67c6ffa10 https://github.com/phpmyadmin/phpmyadmin/commit/4720a4884cdb5b36069bc4dfc8c2... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths: M libraries/common.lib.php M libraries/display_import.lib.php
Log Message: ----------- Modifications to PMA_selectUploadFile() function in common.lib.php and renamed as PMA_getSelectUploadFileBlock()
Commit: 35f4599870096d0d7256a7bba94c0416fa8910e5 https://github.com/phpmyadmin/phpmyadmin/commit/35f4599870096d0d7256a7bba94c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths: M db_datadict.php M db_printview.php M libraries/common.lib.php M sql.php M tbl_printview.php
Log Message: ----------- Modifications to PMA_printButton() function in common.lib.php and renamed as PMA_getButton()()
Commit: 0445b1fb51996248fb5a5c77d04ca6e918fa255a https://github.com/phpmyadmin/phpmyadmin/commit/0445b1fb51996248fb5a5c77d04c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths: M libraries/common.lib.php
Log Message: ----------- Some improvements to common.lib.php
Commit: 17b942bf29a76e8cf2d6f05918cf595f462014d0 https://github.com/phpmyadmin/phpmyadmin/commit/17b942bf29a76e8cf2d6f05918cf... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- _getDataCellForBlobField() function renamed as _getDataCellForBlobColumns()
Commit: 69d4894940655b346a69c8ba334cf4b665bdf76e https://github.com/phpmyadmin/phpmyadmin/commit/69d4894940655b346a69c8ba334c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- _getDataCellForGeometryFields() function renamed as _getDataCellForGeometryColumns()
Commit: d94077549816b3cd0dfe1e15bef0d4113939a61c https://github.com/phpmyadmin/phpmyadmin/commit/d94077549816b3cd0dfe1e15bef0... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- _getDataCellForNonNumericAndNonBlobColumns() function renamed as _getDataCellForNonNumericAndNonBlobColumns()
Commit: d557597dae5df506523457754e95955eb8c6bfbe https://github.com/phpmyadmin/phpmyadmin/commit/d557597dae5df506523457754e95... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- _getDataCellForNumericFeilds() function renamed as _getDataCellForNumericColumns()
Commit: 26d08ccc3a990ad5c8b9cf47e4aa288034afa07b https://github.com/phpmyadmin/phpmyadmin/commit/26d08ccc3a990ad5c8b9cf47e4aa... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths: A libraries/TableSearch.class.php M libraries/tbl_select.lib.php M main.php M server_privileges.php M tbl_select.php M tbl_zoom_select.php M user_password.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: 5037181363471411ccd18e98d53f82b4fa15cb92 https://github.com/phpmyadmin/phpmyadmin/commit/5037181363471411ccd18e98d53f... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths: M libraries/TableSearch.class.php R libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Merge remote branch 'upstream/master'
Commit: 3d2d7bf6dda59a8651b96452a4f7a2b4814806f5 https://github.com/phpmyadmin/phpmyadmin/commit/3d2d7bf6dda59a8651b96452a4f7... Author: Michal Čihař mcihar@suse.cz Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths: M db_datadict.php M db_printview.php M db_structure.php A libraries/DisplayResults.class.php M libraries/common.lib.php M libraries/display_export.lib.php M libraries/display_import.lib.php R libraries/display_tbl.lib.php M navigation.php M server_databases.php M sql.php M tbl_printview.php M tbl_replace.php M test/libraries/common/PMA_browseUploadFile_test.php
Log Message: ----------- Merge remote-tracking branch 'chanaka/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/48861507440a...3d2d7bf6dda5