Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 23107c0521cf397edd559afd232ff3a59427111c https://github.com/phpmyadmin/phpmyadmin/commit/23107c0521cf397edd559afd232f... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-26 (Tue, 26 Jun 2012) Changed paths: M db_search.php Log Message: ----------- Slice PMA_dbSearchGetWhereClause out of PMA_getSearchSqls Commit: e23ba53da008f6af60b5548925ce13ab04e449d5 https://github.com/phpmyadmin/phpmyadmin/commit/e23ba53da008f6af60b5548925ce... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-26 (Tue, 26 Jun 2012) Changed paths: M db_search.php Log Message: ----------- Rearrange content in db_search.php Commit: 2c4a14a8f820353912591572b7f933f080c18d63 https://github.com/phpmyadmin/phpmyadmin/commit/2c4a14a8f820353912591572b7f9... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-26 (Tue, 26 Jun 2012) Changed paths: M db_search.php Log Message: ----------- Fix broken delete feature in database search Commit: 9e1fca92944fd2f4417439d653e73a5e1c739fd2 https://github.com/phpmyadmin/phpmyadmin/commit/9e1fca92944fd2f4417439d653e7... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-27 (Wed, 27 Jun 2012) Changed paths: M libraries/Header.class.php M libraries/TableSearch.class.php M libraries/sql_query_form.lib.php M po/es.po M po/fr.po M po/ko.po M po/pt_BR.po M po/ru.po M po/si.po M po/sl.po M po/sv.po M tbl_structure.php Log Message: ----------- Merge remote-tracking branch 'upstream/master' Commit: b19d201c16af86c6e76e52ae7b6df61299f3a949 https://github.com/phpmyadmin/phpmyadmin/commit/b19d201c16af86c6e76e52ae7b6d... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-27 (Wed, 27 Jun 2012) Changed paths: M db_search.php Log Message: ----------- Make variable names more readable in db_search.php Commit: b10429b268dab578d9b1a829fe1347a3ee41408a https://github.com/phpmyadmin/phpmyadmin/commit/b10429b268dab578d9b1a829fe13... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-27 (Wed, 27 Jun 2012) Changed paths: M db_search.php Log Message: ----------- Fix comment Commit: f3d2f177000e8c3855798d14d442b68a1256e524 https://github.com/phpmyadmin/phpmyadmin/commit/f3d2f177000e8c3855798d14d442... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-27 (Wed, 27 Jun 2012) Changed paths: M db_search.php A libraries/db_search.lib.php Log Message: ----------- Move functions to separate library file Commit: 417856ee9f7e1aa9472120f3b5a316ee3c8de1a4 https://github.com/phpmyadmin/phpmyadmin/commit/417856ee9f7e1aa9472120f3b5a3... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-28 (Thu, 28 Jun 2012) Changed paths: M db_search.php M libraries/db_search.lib.php Log Message: ----------- Variable name improvements Commit: ceea0e13f186bc20bf1adb9fdf2c421bc29e9783 https://github.com/phpmyadmin/phpmyadmin/commit/ceea0e13f186bc20bf1adb9fdf2c... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2012-06-28 (Thu, 28 Jun 2012) Changed paths: M db_operations.php M export.php M import.php M libraries/DisplayResults.class.php M libraries/Menu.class.php M libraries/Table.class.php M libraries/Tracker.class.php R libraries/auth/config.auth.lib.php R libraries/auth/cookie.auth.lib.php R libraries/auth/http.auth.lib.php R libraries/auth/signon.auth.lib.php R libraries/auth/swekey/authentication.inc.php R libraries/auth/swekey/musbe-ca.crt R libraries/auth/swekey/swekey.auth.lib.php R libraries/auth/swekey/swekey.php M libraries/blowfish.php M libraries/check_user_privileges.lib.php M libraries/common.inc.php M libraries/common.lib.php M libraries/config.default.php M libraries/dbi/drizzle.dbi.lib.php M libraries/dbi/mysql.dbi.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/display_export.lib.php M libraries/display_import.lib.php M libraries/display_import_ajax.lib.php R libraries/export/codegen.php R libraries/export/csv.php R libraries/export/excel.php R libraries/export/htmlword.php R libraries/export/json.php R libraries/export/latex.php R libraries/export/mediawiki.php R libraries/export/ods.php R libraries/export/odt.php R libraries/export/pdf.php R libraries/export/php_array.php R libraries/export/sql.php R libraries/export/texytext.php R libraries/export/xml.php R libraries/export/yaml.php R libraries/import/README R libraries/import/csv.php R libraries/import/docsql.php R libraries/import/ldi.php R libraries/import/mediawiki.php R libraries/import/ods.php R libraries/import/shp.php R libraries/import/sql.php R libraries/import/upload/apc.php R libraries/import/upload/noplugin.php R libraries/import/upload/session.php R libraries/import/upload/uploadprogress.php R libraries/import/xml.php M libraries/plugin_interface.lib.php A libraries/plugins/AuthenticationPlugin.class.php A libraries/plugins/ExportPlugin.class.php A libraries/plugins/ImportPlugin.class.php A libraries/plugins/PluginManager.class.php A libraries/plugins/PluginObserver.class.php A libraries/plugins/TransformationsInterface.int.php A libraries/plugins/TransformationsPlugin.class.php A libraries/plugins/UploadInterface.int.php A libraries/plugins/auth/AuthenticationConfig.class.php A libraries/plugins/auth/AuthenticationCookie.class.php A libraries/plugins/auth/AuthenticationHttp.class.php A libraries/plugins/auth/AuthenticationSignon.class.php A libraries/plugins/auth/HordeCipherBlowfishOperations.class.php A libraries/plugins/auth/swekey/authentication.inc.php A libraries/plugins/auth/swekey/musbe-ca.crt A libraries/plugins/auth/swekey/swekey.auth.lib.php A libraries/plugins/auth/swekey/swekey.php A libraries/plugins/export/ExportCodegen.class.php A libraries/plugins/export/ExportCsv.class.php A libraries/plugins/export/ExportExcel.class.php A libraries/plugins/export/ExportHtmlword.class.php A libraries/plugins/export/ExportJson.class.php A libraries/plugins/export/ExportLatex.class.php A libraries/plugins/export/ExportMediawiki.class.php A libraries/plugins/export/ExportOds.class.php A libraries/plugins/export/ExportOdt.class.php A libraries/plugins/export/ExportPdf.class.php A libraries/plugins/export/ExportPhparray.class.php A libraries/plugins/export/ExportSql.class.php A libraries/plugins/export/ExportTexytext.class.php A libraries/plugins/export/ExportXml.class.php A libraries/plugins/export/ExportYaml.class.php A libraries/plugins/export/PMA_ExportPdf.class.php A libraries/plugins/export/TableProperty.class.php A libraries/plugins/import/ImportCsv.class.php A libraries/plugins/import/ImportDocsql.class.php A libraries/plugins/import/ImportLdi.class.php A libraries/plugins/import/ImportMediawiki.class.php A libraries/plugins/import/ImportOds.class.php A libraries/plugins/import/ImportShp.class.php A libraries/plugins/import/ImportSql.class.php A libraries/plugins/import/ImportXml.class.php A libraries/plugins/import/PMA_ShapeFile.class.php A libraries/plugins/import/PMA_ShapeRecord.class.php A libraries/plugins/import/README A libraries/plugins/import/upload/UploadApc.class.php A libraries/plugins/import/upload/UploadNoplugin.class.php A libraries/plugins/import/upload/UploadProgress.class.php A libraries/plugins/import/upload/UploadSession.class.php A libraries/plugins/transformations/Application_Octetstream_Download.class.php A libraries/plugins/transformations/Application_Octetstream_Hex.class.php A libraries/plugins/transformations/Image_JPEG_Inline.class.php A libraries/plugins/transformations/Image_JPEG_Link.class.php A libraries/plugins/transformations/Image_PNG_Inline.class.php A libraries/plugins/transformations/Text_Plain_Append.class.php A libraries/plugins/transformations/Text_Plain_Dateformat.class.php A libraries/plugins/transformations/Text_Plain_External.class.php A libraries/plugins/transformations/Text_Plain_Formatted.class.php A libraries/plugins/transformations/Text_Plain_Imagelink.class.php A libraries/plugins/transformations/Text_Plain_Link.class.php A libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php A libraries/plugins/transformations/Text_Plain_Sql.class.php A libraries/plugins/transformations/Text_Plain_Substring.class.php A libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php A libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php A libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php A libraries/plugins/transformations/todo_rewrite/README A libraries/plugins/transformations/todo_rewrite/TEMPLATE A libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE A libraries/plugins/transformations/todo_rewrite/generator.sh A libraries/plugins/transformations/todo_rewrite/template_generator.sh A libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh M libraries/tbl_properties.inc.php M libraries/transformations.lib.php R libraries/transformations/README R libraries/transformations/TEMPLATE R libraries/transformations/TEMPLATE_MIMETYPE R libraries/transformations/application_octetstream__download.inc.php R libraries/transformations/application_octetstream__hex.inc.php R libraries/transformations/generator.sh R libraries/transformations/image_jpeg__inline.inc.php R libraries/transformations/image_jpeg__link.inc.php R libraries/transformations/image_png__inline.inc.php R libraries/transformations/template_generator.sh R libraries/transformations/template_generator_mimetype.sh R libraries/transformations/text_plain__append.inc.php R libraries/transformations/text_plain__dateformat.inc.php R libraries/transformations/text_plain__external.inc.php R libraries/transformations/text_plain__formatted.inc.php R libraries/transformations/text_plain__imagelink.inc.php R libraries/transformations/text_plain__link.inc.php R libraries/transformations/text_plain__longToIpv4.inc.php R libraries/transformations/text_plain__sql.inc.php R libraries/transformations/text_plain__substr.inc.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_alter.php M tbl_replace.php M test/libraries/PMA_blowfish_test.php M transformation_overview.php M user_password.php Log Message: ----------- Merge remote-tracking branch 'upstream/master' Commit: 0e4d7af07afd099eb627a7f86970f36b64b5e916 https://github.com/phpmyadmin/phpmyadmin/commit/0e4d7af07afd099eb627a7f86970... Author: Marc Delisle <marc@infomarc.info> Date: 2012-06-29 (Fri, 29 Jun 2012) Changed paths: M db_search.php A libraries/db_search.lib.php Log Message: ----------- Merge branch 'atul' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/79925dec4488...0e4d7af07afd