Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9f14151c7ca8968210346ab1cacfda071fdf306e https://github.com/phpmyadmin/phpmyadmin/commit/9f14151c7ca8968210346ab1cacf... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_select.php
Log Message: ----------- Remove more variables from post_params
Commit: 230cae24d418990507754605d0836b526602b5a4 https://github.com/phpmyadmin/phpmyadmin/commit/230cae24d418990507754605d083... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Replace variable i with column_index
Commit: 2d9217f1da69ae60de7aa4f2b3570d94e21ef966 https://github.com/phpmyadmin/phpmyadmin/commit/2d9217f1da69ae60de7aa4f2b357... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Make variable names uniform in search scripts
Commit: 0223a533dedc8f178aae459400b893238b17c570 https://github.com/phpmyadmin/phpmyadmin/commit/0223a533dedc8f178aae459400b8... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/display_tbl.lib.php M libraries/server_variables_doc.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 url.php
Log Message: ----------- Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin
Commit: 6a85bdd16f945cc8edc49a827449c808803f6bfa https://github.com/phpmyadmin/phpmyadmin/commit/6a85bdd16f945cc8edc49a827449... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Use existing function to build SQL query
Commit: a1a2f1857a8d72948ce013a338340bab83bb99c0 https://github.com/phpmyadmin/phpmyadmin/commit/a1a2f1857a8d72948ce013a33834... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix some typos in tbl_select.lib.php
Commit: a4a9ba9b0473bbaa00b26001ca116111afb9d2e9 https://github.com/phpmyadmin/phpmyadmin/commit/a4a9ba9b0473bbaa00b26001ca11... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M export.php M import_status.php M libraries/Config.class.php M libraries/PDF.class.php M libraries/config/ConfigFile.class.php M libraries/config/validate.lib.php M libraries/core.lib.php M libraries/gis/pma_gis_visualization.php M libraries/header_http.inc.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/user_preferences.lib.php M prefs_manage.php M setup/config.php M tbl_get_field.php M tbl_tracking.php M test/classes/PMA_Config_test.php M test/libraries/core/PMA_array_test.php M test/libraries/core/PMA_get_real_size_test.php M transformation_wrapper.php M webapp.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 54be18e0d1075a8bb946332f65432d9e9e791837 https://github.com/phpmyadmin/phpmyadmin/commit/54be18e0d1075a8bb946332f6543... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-01 (Fri, 01 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_select.php
Log Message: ----------- Generalize some new functions for zoom search
Commit: 316dee3ba8143948e0e87104ca401917200c5d57 https://github.com/phpmyadmin/phpmyadmin/commit/316dee3ba8143948e0e87104ca40... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-02 (Sat, 02 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Fix function name: PMA_tbl_setTableHeader -> PMA_tbl_getTableHeader
Commit: e3d8f52cdab69edb3c2340440a68ab2c34216727 https://github.com/phpmyadmin/phpmyadmin/commit/e3d8f52cdab69edb3c2340440a68... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-02 (Sat, 02 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix typo in comment inside PMA_tbl_getTableHeader
Commit: 72cec141049bd193ffdbdf0bc31d4334d6f9c47a https://github.com/phpmyadmin/phpmyadmin/commit/72cec141049bd193ffdbdf0bc31d... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-02 (Sat, 02 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix spacing after if statement in tbl_select.lib.php
Commit: 0b493d7233bc6aa770275aa60b184ba99e282d37 https://github.com/phpmyadmin/phpmyadmin/commit/0b493d7233bc6aa770275aa60b18... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths: M ChangeLog M export.php M file_echo.php M import.php M import_status.php M index.php M js/functions.js M js/messages.php M js/server_privileges.js M libraries/List.class.php M libraries/List_Database.class.php M libraries/StorageEngine.class.php M libraries/Table.class.php M libraries/Theme_Manager.class.php M libraries/display_change_password.lib.php M libraries/header.inc.php M libraries/iconv_wrapper.lib.php M libraries/import.lib.php M libraries/relation.lib.php M libraries/schema/User_Schema.class.php M libraries/session.inc.php M libraries/sqlvalidator.lib.php M libraries/tbl_replace_fields.inc.php M libraries/tbl_select.lib.php M libraries/transformations.lib.php M libraries/user_preferences.inc.php M navigation.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/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_privileges.php M server_status.php M test/classes/PMA_Theme_test.php M test/classes/gis/PMA_GIS_Geometry_test.php M test/libraries/core/PMA_fatalError_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/js_escape_test.php M test/libraries/php-gettext/Parsing_test.php M view_operations.php
Log Message: ----------- Resolve merging conflicts in tbl_select.lib.php
Commit: 88b7056c0672e739179bb8c5fe730bb75dee0f58 https://github.com/phpmyadmin/phpmyadmin/commit/88b7056c0672e739179bb8c5fe73... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths: 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
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 15d266b54f545efe64fb9b594e0fa6846cd09c3d https://github.com/phpmyadmin/phpmyadmin/commit/15d266b54f545efe64fb9b594e0f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths: M libraries/relation.lib.php M libraries/select_lang.lib.php M phpinfo.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 scripts/update-po M show_config_errors.php M test/classes/gis/PMA_GIS_Factory_test.php M test/classes/gis/PMA_GIS_Geom_test.php M test/classes/gis/PMA_GIS_Geometry_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 themes/original/layout.inc.php M themes/pmahomme/css/codemirror.css.php M themes/pmahomme/info.inc.php M themes/pmahomme/layout.inc.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 43ec1eb54a93e44531c57d27ef24022ac0f5ef77 https://github.com/phpmyadmin/phpmyadmin/commit/43ec1eb54a93e44531c57d27ef24... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-04 (Mon, 04 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Some coding style fixes in tbl_select.lib.php
Commit: 27c1ab6c31fda81ae217bef8bc3e171dfc2aaaba https://github.com/phpmyadmin/phpmyadmin/commit/27c1ab6c31fda81ae217bef8bc3e... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Functions for some part of zoom search form display
Commit: 0ac2adf21cafd62338e4486706e998c7d506deb8 https://github.com/phpmyadmin/phpmyadmin/commit/0ac2adf21cafd62338e4486706e9... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths: M db_qbe.php M js/functions.js M libraries/Table.class.php M libraries/engines/bdb.lib.php M libraries/engines/berkeleydb.lib.php M libraries/engines/innodb.lib.php M libraries/engines/memory.lib.php M libraries/engines/merge.lib.php M libraries/engines/myisam.lib.php M libraries/engines/ndbcluster.lib.php M libraries/engines/pbxt.lib.php M libraries/import/upload/apc.php M libraries/import/upload/noplugin.php M libraries/import/upload/session.php M libraries/import/upload/uploadprogress.php M libraries/relation.lib.php M po/sl.po M po/sv.po
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 67190258c1dc6a86e24a6d2f6d78843df00976da https://github.com/phpmyadmin/phpmyadmin/commit/67190258c1dc6a86e24a6d2f6d78... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_select.php M tbl_zoom_select.php
Log Message: ----------- Remove unnecessary variable columnCount
Commit: ad33688c70ec9363c391b666be9db7ac3518c7f1 https://github.com/phpmyadmin/phpmyadmin/commit/ad33688c70ec9363c391b666be9d... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Formed function to display datalabel and maxrowplotlimit options
Commit: 9b3ae37905d739f7c0b75f85764c8964f692fd41 https://github.com/phpmyadmin/phpmyadmin/commit/9b3ae37905d739f7c0b75f85764c... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Some coding style fixes in tbl_select.lib.php
Commit: 60ccfbef70249454e6a37af880e5d8beceedf1a3 https://github.com/phpmyadmin/phpmyadmin/commit/60ccfbef70249454e6a37af880e5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-06 (Wed, 06 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Improve if statement that sets default datalabel
Commit: efbe149def3d80f6e33eb26bf6e850685bce2ed1 https://github.com/phpmyadmin/phpmyadmin/commit/efbe149def3d80f6e33eb26bf6e8... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Use PMA_tblSearchGetSelectionForm to display zoom search form
Commit: 0ff3a394ed05b10c9d9170a2809f9e435ba433d1 https://github.com/phpmyadmin/phpmyadmin/commit/0ff3a394ed05b10c9d9170a2809f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths: M libraries/schema/Pdf_Relation_Schema.class.php M po/de.po
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 79fcb798def03d9a3700f1aa4225d5ccec0d77b7 https://github.com/phpmyadmin/phpmyadmin/commit/79fcb798def03d9a3700f1aa4225... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix logical distinction between normal and zoom search
Commit: 8a0d2d6766297b6168aaefbb8cdfbbebcc528351 https://github.com/phpmyadmin/phpmyadmin/commit/8a0d2d6766297b6168aaefbb8cdf... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Remove unused variables from post_params array
Commit: 5d636a8672911cec580e4896bb86402e1e6e4f56 https://github.com/phpmyadmin/phpmyadmin/commit/5d636a8672911cec580e4896bb86... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-07 (Thu, 07 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Improve some repetitive code
Commit: a812a8919ed5e9d252624d86b70039346aa4df78 https://github.com/phpmyadmin/phpmyadmin/commit/a812a8919ed5e9d252624d86b700... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Remove variables left in 8a0d2d6766297b6168aae
Commit: 3420f14d74ef5a3c0dd8daecd0fb1c6a99d0c727 https://github.com/phpmyadmin/phpmyadmin/commit/3420f14d74ef5a3c0dd8daecd0fb... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Remove unuseful incremental constant in loop variable
Commit: 1b67cbc147cf1f04315580ca83e40115a55a2091 https://github.com/phpmyadmin/phpmyadmin/commit/1b67cbc147cf1f04315580ca83e4... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix legend caption in zoom search
Commit: 228974283625cd368bc23e302801740d39d525d2 https://github.com/phpmyadmin/phpmyadmin/commit/228974283625cd368bc23e302801... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Improve fix: 79fcb798def03d9a3700f1aa4225d5ccec0d77b7
Commit: 26d8848e2c57bf4f3e61a2a681d81fccbd222002 https://github.com/phpmyadmin/phpmyadmin/commit/26d8848e2c57bf4f3e61a2a681d8... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Unset temporary variable
Commit: 9873bdcb3ff703a99310e164d3bdae5d6aaba5ed https://github.com/phpmyadmin/phpmyadmin/commit/9873bdcb3ff703a99310e164d3bd... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix wrong function call
Commit: dd52a06570cd98c1247cd9ffc4d8ae628c658ecd https://github.com/phpmyadmin/phpmyadmin/commit/dd52a06570cd98c1247cd9ffc4d8... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Generalize column properties for search scripts
Commit: 052fd61fddff030ffcf25edcdd69b46202266cee https://github.com/phpmyadmin/phpmyadmin/commit/052fd61fddff030ffcf25edcdd69... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-08 (Fri, 08 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Use PMA_tblSearchGetColumnProperties to change table row
Commit: 46d38714272730eca835b0ff0e50d1e67c52657f https://github.com/phpmyadmin/phpmyadmin/commit/46d38714272730eca835b0ff0e50... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Use PMA_tblSearchGetColumnProperties to get normal search rows
Commit: 291249330a34524d2fb2cf481eb15a4d8edd3198 https://github.com/phpmyadmin/phpmyadmin/commit/291249330a34524d2fb2cf481eb1... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths: M libraries/tbl_select.lib.php
Log Message: ----------- Fix column operator field's name
Commit: 745598a090f09d19f38d88e5aa3b5702734674b6 https://github.com/phpmyadmin/phpmyadmin/commit/745598a090f09d19f38d88e5aa3b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths: M tbl_zoom_select.php
Log Message: ----------- Fix AJAX response extra_data in zoom search
Commit: 96ede30c3cda09659596cae0562fc81bc4e6c05b https://github.com/phpmyadmin/phpmyadmin/commit/96ede30c3cda09659596cae0562f... Author: Atul Pratap Singh atulpratapsingh05@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-tracking branch 'upstream/master'
Commit: 3df8ff1e34a108e0ec7d870ce4c667d4706bcc62 https://github.com/phpmyadmin/phpmyadmin/commit/3df8ff1e34a108e0ec7d870ce4c6... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths: M js/server_variables.js M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: c4a307f91506e52252d9ed585af437ce476400ae https://github.com/phpmyadmin/phpmyadmin/commit/c4a307f91506e52252d9ed585af4... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths: M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Fix bug introduced due to incremental variable
Commit: d7ab56f37bc78945693df8876b35e2e5cde2f7cf https://github.com/phpmyadmin/phpmyadmin/commit/d7ab56f37bc78945693df8876b35... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths: M js/tbl_zoom_plot_jqplot.js M libraries/tbl_select.lib.php M tbl_zoom_select.php
Log Message: ----------- Fix zoom search point edit bug
Commit: 0fbe20103fb4e46ef1be2cd71553dbffabca5eab https://github.com/phpmyadmin/phpmyadmin/commit/0fbe20103fb4e46ef1be2cd71553... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths: M js/tbl_zoom_plot_jqplot.js
Log Message: ----------- Fix mangled datalabels bug(zoom search) in case of chromium browser
Commit: 445bd8c67a1748f50c1be7c40a5cef38cb7749d2 https://github.com/phpmyadmin/phpmyadmin/commit/445bd8c67a1748f50c1be7c40a5c... Author: Marc Delisle marc@infomarc.info Date: 2012-06-11 (Mon, 11 Jun 2012)
Changed paths: M js/tbl_zoom_plot_jqplot.js M libraries/tbl_select.lib.php M tbl_select.php M tbl_zoom_select.php
Log Message: ----------- Merge branch 'atul'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8f698c7...445bd8c