Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 36d56fb2ea56e47b3979cfb07ff3ad5a1b4f1b2f https://github.com/phpmyadmin/phpmyadmin/commit/36d56fb2ea56e47b3979cfb07ff3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-15 (Tue, 15 May 2012)
Changed paths: M tbl_select.php
Log Message: ----------- Refactoring tbl_select.php
Commit: 0265058ca7166e48996baa374904299d3e6333bd https://github.com/phpmyadmin/phpmyadmin/commit/0265058ca7166e48996baa374904... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-15 (Tue, 15 May 2012)
Changed paths: M tbl_select.php
Log Message: ----------- Fix doc comment in 36d56fb2ea56e47b3979cfb07ff3ad5a1b4f1b2f
Commit: f9a0537fe479aa205e7ef34a8b223af1b6b1b23b https://github.com/phpmyadmin/phpmyadmin/commit/f9a0537fe479aa205e7ef34a8b22... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths: M tbl_select.php
Log Message: ----------- Improvements and fixes in tbl_select.php refactoring
Commit: 30f142abd57fd2c877d695296d78fdccf8e9df36 https://github.com/phpmyadmin/phpmyadmin/commit/30f142abd57fd2c877d695296d78... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-18 (Fri, 18 May 2012)
Changed paths: M ChangeLog M Documentation.html M js/navigation.js M libraries/common.lib.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/messages.inc.php M libraries/config/user_preferences.forms.php M libraries/config/validate.lib.php M libraries/database_interface.lib.php M libraries/display_change_password.lib.php M libraries/header_http.inc.php M libraries/select_lang.lib.php M navigation.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 A 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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M scripts/compress-js R scripts/google-javascript-compiler/COPYING R scripts/google-javascript-compiler/README R scripts/google-javascript-compiler/compiler.jar M setup/frames/index.inc.php M setup/index.php M setup/styles.css M tbl_zoom_select.php M test/classes/PMA_Message_test.php M themes/original/css/theme_left.css.php M themes/pmahomme/css/theme_left.css.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 360e2063ea271030d3042e3d0d2b6b5b2eccc938 https://github.com/phpmyadmin/phpmyadmin/commit/360e2063ea271030d3042e3d0d2b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-18 (Fri, 18 May 2012)
Changed paths: M tbl_select.php
Log Message: ----------- More improvements in tbl_select.php
Commit: 56e44b65dc14d30feda06336f7155641f8bff7ef https://github.com/phpmyadmin/phpmyadmin/commit/56e44b65dc14d30feda06336f715... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-21 (Mon, 21 May 2012)
Changed paths: M browse_foreigners.php M libraries/List_Database.class.php M libraries/Theme.class.php M libraries/Theme_Manager.class.php M libraries/common.inc.php M libraries/database_interface.lib.php M libraries/header_meta_style.inc.php M libraries/mult_submits.inc.php M navigation.php M phpmyadmin.css.php M po/ckb.po M po/fi.po M po/ja.po M po/pt_BR.po M po/ru.po M po/sv.po M test/theme.php A themes/original/css/common.css.php A themes/original/css/navigation.css.php R themes/original/css/theme_left.css.php R themes/original/css/theme_right.css.php A themes/pmahomme/css/common.css.php A themes/pmahomme/css/enum_editor.css.php A themes/pmahomme/css/gis.css.php A themes/pmahomme/css/navigation.css.php A themes/pmahomme/css/pmd.css.php A themes/pmahomme/css/rte.css.php R themes/pmahomme/css/theme_left.css.php R themes/pmahomme/css/theme_right.css.php M themes/sprites.css.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: df0c40f862c25517b1b9d9c74c1fd342fb1eab1c https://github.com/phpmyadmin/phpmyadmin/commit/df0c40f862c25517b1b9d9c74c1f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-23 (Wed, 23 May 2012)
Changed paths: M db_create.php M db_operations.php M db_search.php M db_tracking.php M js/db_operations.js M js/server_privileges.js M js/tbl_change.js M libraries/Menu.class.php M libraries/common.lib.php M libraries/display_tbl.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php M libraries/rte/rte_triggers.lib.php M libraries/schema/User_Schema.class.php M main.php M pmd_pdf.php M po/cs.po M po/fi.po M po/ja.po M po/pt_BR.po M po/zh_TW.po M server_binlog.php M server_databases.php M server_privileges.php M sql.php M tbl_addfield.php M tbl_alter.php M tbl_change.php M tbl_export.php M tbl_indexes.php M tbl_move_copy.php M tbl_operations.php M tbl_relation.php M tbl_replace.php M tbl_structure.php M tbl_tracking.php R test/libraries/common/PMA_display_html_radio_test.php R test/libraries/common/PMA_generate_html_dropdown_test.php R test/libraries/common/PMA_generate_slider_effect_test.php M test/libraries/common/PMA_getCheckbox_test.php A test/libraries/common/PMA_getDivForSliderEffect_test.php A test/libraries/common/PMA_getDropdown_test.php A test/libraries/common/PMA_getRadioFields_test.php M test/libraries/common/PMA_showMessage_test_disabled.php M user_password.php M view_create.php M view_operations.php
Log Message: ----------- Resolving conflicts in tbl_select.php
Commit: bab0096296279331bad42f0295df954a32bfef03 https://github.com/phpmyadmin/phpmyadmin/commit/bab0096296279331bad42f0295df... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-23 (Wed, 23 May 2012)
Changed paths: M tbl_select.php
Log Message: ----------- Fixing broken table search feature due to function name changes
Commit: 470feae4f37819943080c4f690f57be8859cacf5 https://github.com/phpmyadmin/phpmyadmin/commit/470feae4f37819943080c4f690f5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-23 (Wed, 23 May 2012)
Changed paths: M tbl_select.php
Log Message: ----------- Variable name improvements in tbl_select.php
Commit: 4bea69805276c304e200ab75dd4259afa8914e10 https://github.com/phpmyadmin/phpmyadmin/commit/4bea69805276c304e200ab75dd42... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths: M browse_foreigners.php A libraries/insert_edit.lib.php M libraries/tbl_replace_fields.inc.php M tbl_change.php M tbl_relation.php M tbl_replace.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 8cfe30f9019a8ec78902a94b9383e32f0045529e https://github.com/phpmyadmin/phpmyadmin/commit/8cfe30f9019a8ec78902a94b9383... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-25 (Fri, 25 May 2012)
Changed paths: M ChangeLog M js/functions.js A js/jqplot/jquery.jqplot.js A js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js A js/jqplot/plugins/jqplot.canvasTextRenderer.js A js/jqplot/plugins/jqplot.cursor.js A js/jqplot/plugins/jqplot.dateAxisRenderer.js A js/jqplot/plugins/jqplot.highlighter.js A js/jqplot/plugins/jqplot.pieRenderer.js M js/messages.php M js/sql.js R js/tbl_zoom_plot.js A js/tbl_zoom_plot_jqplot.js M libraries/Theme.class.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M server_status.php M sql.php M tbl_zoom_select.php M themes/original/css/common.css.php A themes/pmahomme/css/jqplot.css.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: d3aff8b31ad463d74f9b42d56779f183a14529df https://github.com/phpmyadmin/phpmyadmin/commit/d3aff8b31ad463d74f9b42d56779... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-25 (Fri, 25 May 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_select.php
Log Message: ----------- Move functions from tbl_select.php to libraries/tbl_select.lib.php
Commit: 16f7fb95369c4235665c9fba5c0062107da7bd4e https://github.com/phpmyadmin/phpmyadmin/commit/16f7fb95369c4235665c9fba5c00... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-27 (Sun, 27 May 2012)
Changed paths: M po/fr.po M po/tr.po
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: b8a4e7408a6026e171d99fe9dc69cf765b8fafeb https://github.com/phpmyadmin/phpmyadmin/commit/b8a4e7408a6026e171d99fe9dc69... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-27 (Sun, 27 May 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fixing spaces around exclamation
Commit: d777dce1b969f1bb6c380605830000a5050dae25 https://github.com/phpmyadmin/phpmyadmin/commit/d777dce1b969f1bb6c3806058300... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-28 (Mon, 28 May 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_select.php
Log Message: ----------- Removed some variables from post_params array
Commit: 94690416549f184f93603edddb49ab0bcc22a28c https://github.com/phpmyadmin/phpmyadmin/commit/94690416549f184f93603edddb49... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-29 (Tue, 29 May 2012)
Changed paths: M libraries/Theme.class.php M libraries/common.lib.php M libraries/display_tbl.lib.php M libraries/insert_edit.lib.php M libraries/sqlparser.data.php M libraries/sqlparser.lib.php M libraries/tbl_select.lib.php M phpmyadmin.css.php M pmd_general.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.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/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/zh_CN.po M po/zh_TW.po M tbl_select.php M tbl_zoom_select.php M themes/original/css/common.css.php A themes/pmahomme/css/codemirror.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Resolve conflicts in tbl_select.php
Commit: f829adacab868106d8907ccd261557c4d17091da https://github.com/phpmyadmin/phpmyadmin/commit/f829adacab868106d8907ccd2615... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-29 (Tue, 29 May 2012)
Changed paths: M libraries/server_synchronize.lib.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: ce382803bed3a14719e144628d9a1ab4f2e40f8f https://github.com/phpmyadmin/phpmyadmin/commit/ce382803bed3a14719e144628d9a... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-29 (Tue, 29 May 2012)
Changed paths: M Documentation.html M libraries/Theme.class.php M libraries/common.inc.php M libraries/common.lib.php M libraries/config.default.php M libraries/core.lib.php M libraries/server_synchronize.lib.php M libraries/tbl_properties.inc.php M main.php M pmd_general.php M server_status.php M server_variables.php M tbl_printview.php R themes/original/img/pmd/1.png R themes/original/img/pmd/2.png R themes/original/img/pmd/2leftarrow.png R themes/original/img/pmd/2leftarrow_m.png R themes/original/img/pmd/2rightarrow.png R themes/original/img/pmd/2rightarrow_m.png R themes/original/img/pmd/3.png R themes/original/img/pmd/4.png R themes/original/img/pmd/5.png R themes/original/img/pmd/6.png R themes/original/img/pmd/7.png R themes/original/img/pmd/8.png R themes/original/img/pmd/FieldKey_small.png R themes/original/img/pmd/Field_small.png R themes/original/img/pmd/Field_small_char.png R themes/original/img/pmd/Field_small_date.png R themes/original/img/pmd/Field_small_int.png R themes/original/img/pmd/Header.png R themes/original/img/pmd/Header_Linked.png R themes/original/img/pmd/and_icon.png R themes/original/img/pmd/ang_direct.png R themes/original/img/pmd/bord.png R themes/original/img/pmd/bottom.png R themes/original/img/pmd/def.png R themes/original/img/pmd/display_field.png R themes/original/img/pmd/downarrow1.png R themes/original/img/pmd/downarrow2.png R themes/original/img/pmd/downarrow2_m.png R themes/original/img/pmd/exec.png R themes/original/img/pmd/exec_small.png R themes/original/img/pmd/favicon.ico R themes/original/img/pmd/grid.png R themes/original/img/pmd/help.png R themes/original/img/pmd/help_relation.png R themes/original/img/pmd/left_panel_butt.png R themes/original/img/pmd/left_panel_tab.png R themes/original/img/pmd/minus.png R themes/original/img/pmd/or_icon.png R themes/original/img/pmd/pdf.png R themes/original/img/pmd/plus.png R themes/original/img/pmd/query_builder.png R themes/original/img/pmd/relation.png R themes/original/img/pmd/reload.png R themes/original/img/pmd/resize.png R themes/original/img/pmd/rightarrow1.png R themes/original/img/pmd/rightarrow2.png R themes/original/img/pmd/save.png R themes/original/img/pmd/small_tab.png R themes/original/img/pmd/table.png R themes/original/img/pmd/toggle_lines.png R themes/original/img/pmd/top_panel.png R themes/original/img/pmd/uparrow2_m.png M themes/pmahomme/css/pmd.css.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 3faab474f35e03d6d89a2d607a206167c40d58ff https://github.com/phpmyadmin/phpmyadmin/commit/3faab474f35e03d6d89a2d607a20... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths: M libraries/sqlparser.data.php M libraries/sqlparser.lib.php M po/es.po M po/pt_BR.po M po/sv.po M tbl_printview.php M tbl_structure.php M tbl_zoom_select.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: b37066c4a4cf9b19ee98742837b01fb21d89abb4 https://github.com/phpmyadmin/phpmyadmin/commit/b37066c4a4cf9b19ee98742837b0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths: M libraries/Types.class.php M tbl_zoom_select.php
Log Message: ----------- Search criteria now gets displayed after zoom search operation
Commit: 81602beef87bb9d40c3c5ecf50c6155ce02de39d https://github.com/phpmyadmin/phpmyadmin/commit/81602beef87bb9d40c3c5ecf50c6... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Remove some unused variables from tbl_zoom_select.php
Commit: 606862bc74a775490d485eae2ce352a7093d96e7 https://github.com/phpmyadmin/phpmyadmin/commit/606862bc74a775490d485eae2ce3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Remove unuseful variable introduced in d777dce1b969f1bb6c380605830000a5050dae25
Commit: 540bfeb593d6e3a11f4b0b3528500b7a60a161d7 https://github.com/phpmyadmin/phpmyadmin/commit/540bfeb593d6e3a11f4b0b352850... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Improve some Html readability
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/539465a...540bfeb