[Phpmyadmin-git] [phpmyadmin/phpmyadmin] accfba: Merge remote-tracking branch 'upstream/master'

21 Jul 2012


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: accfba4e6c1b14e1c5f56550a5888e2d03708a6d
      https://github.com/phpmyadmin/phpmyadmin/commit/accfba4e6c1b14e1c5f56550a588...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-16 (Sat, 16 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
    A libraries/TableSearch.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/display_tbl.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
    R libraries/tbl_select.lib.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:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: cd899dea267af52c3b6aee4291a69a81691f3fc6
      https://github.com/phpmyadmin/phpmyadmin/commit/cd899dea267af52c3b6aee4291a6...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  code refactoring for PMA_displayColumnPrivs function in server_privileges-php file
Commit: 44c084069d2438495cda54411dcced07f50e3893
      https://github.com/phpmyadmin/phpmyadmin/commit/44c084069d2438495cda54411dcc...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  some refactoring for PMA_displayPrivTable function in server_privileges script
Commit: b538b88b7a43190f78a936ed2d3d8e75a61bf75f
      https://github.com/phpmyadmin/phpmyadmin/commit/b538b88b7a43190f78a936ed2d3d...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
    M ChangeLog
    M db_operations.php
    M db_structure.php
    M db_tracking.php
    M export.php
    M import_status.php
    M js/functions.js
    M js/server_databases.js
    M libraries/Config.class.php
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/Menu.class.php
    M libraries/OutputBuffering.class.php
    M libraries/RecentTable.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/Tracker.class.php
    M libraries/auth/config.auth.lib.php
    M libraries/auth/cookie.auth.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/core.lib.php
    M libraries/database_interface.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    M libraries/gis/pma_gis_visualization.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/navigation_header.inc.php
    M libraries/opendocument.lib.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/sanitizing.lib.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/schema/Visio_Relation_Schema.class.php
    M libraries/select_server.lib.php
    M libraries/server_common.inc.php
    M libraries/server_synchronize.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlvalidator.class.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M libraries/zip.lib.php
    M main.php
    M navigation.php
    M pmd_display_field.php
    M pmd_pdf.php
    M pmd_relation_new.php
    M pmd_relation_upd.php
    M pmd_save_pos.php
    M po/de.po
    M po/fi.po
    M po/ko.po
    M po/si.po
    M server_databases.php
    M server_privileges.php
    M tbl_operations.php
    M tbl_relation.php
    M tbl_replace.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/libraries/core/PMA_fatalError_test.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/navigation.css.php
    M webapp.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 9e25fa580a8604775668b9fc4800c8f9faaa0f01
      https://github.com/phpmyadmin/phpmyadmin/commit/9e25fa580a8604775668b9fc4800...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  function for Resource limits in server_privileges
Commit: 1578cee9ac0c7680337b5b483a178d7f45c57746
      https://github.com/phpmyadmin/phpmyadmin/commit/1578cee9ac0c7680337b5b483a17...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
    A libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  new lib file for server_privileges
Commit: 07c1de8616e9af0b6b3921c84c55961e9c5acffe
      https://github.com/phpmyadmin/phpmyadmin/commit/07c1de8616e9af0b6b3921c84c55...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
    M ChangeLog
    M db_search.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
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 8fb4c87621fcab9a7b1d082abf1344edede7478f
      https://github.com/phpmyadmin/phpmyadmin/commit/8fb4c87621fcab9a7b1d082abf13...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  fixed bug in Add user panel in privileges
Commit: 7bb7bafc5f0f16058f28076765105e8946597292
      https://github.com/phpmyadmin/phpmyadmin/commit/7bb7bafc5f0f16058f2807676510...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implement PMA_getGrantsArray() in server_privileges-lib
Commit: 8d0237139ead9e7f00266929eb2cae9048ca9a03
      https://github.com/phpmyadmin/phpmyadmin/commit/8d0237139ead9e7f00266929eb2c...
  Author: Thilina Buddika thilinaabeyrathna@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: d37b4a4255bd7f862ff8ee270559b289869bc706
      https://github.com/phpmyadmin/phpmyadmin/commit/d37b4a4255bd7f862ff8ee270559...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove new line
Commit: fdc792cd65b2f8634cc8c8d5d8c39ad69119003d
      https://github.com/phpmyadmin/phpmyadmin/commit/fdc792cd65b2f8634cc8c8d5d8c3...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M db_operations.php
    M db_search.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
    A libraries/db_search.lib.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
    A test/classes/PMA_DisplayResults_test.php
    M test/libraries/PMA_blowfish_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test_disabled.php
    M transformation_overview.php
    M user_password.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 58908f962bd89f0e6620eb8d0683fc16f91ae958
      https://github.com/phpmyadmin/phpmyadmin/commit/58908f962bd89f0e6620eb8d0683...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  function implementations for table specific privileges
Commit: 5a6c11259bde32114dfe1cc3aac6189432fcf2b5
      https://github.com/phpmyadmin/phpmyadmin/commit/5a6c11259bde32114dfe1cc3aac6...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  removing new line
Commit: adec50eb2487473a26004d53cb33817076072c6b
      https://github.com/phpmyadmin/phpmyadmin/commit/adec50eb2487473a26004d53cb33...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  functions for global specific privs
Commit: 21dc59ed28370c96a2dfef21787336c63d85062c
      https://github.com/phpmyadmin/phpmyadmin/commit/21dc59ed28370c96a2dfef217873...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  correct wrong variable define
Commit: e953deca3c50ee424d7597ce890a8a2641c05ed8
      https://github.com/phpmyadmin/phpmyadmin/commit/e953deca3c50ee424d7597ce890a...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_change.php
Log Message:
  -----------
  rplace use of PMA_showMessage with PMA_getMessage in insert_edit-lib and tbl_change
Commit: 121333d51fbc17e5926d286e1963120670b8a893
      https://github.com/phpmyadmin/phpmyadmin/commit/121333d51fbc17e5926d286e1963...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  implement PMA_getUsernameAndHostnameLength() in server_privilegs-lib
Commit: 78331e952b02abd1f717005df888ffa644aa2953
      https://github.com/phpmyadmin/phpmyadmin/commit/78331e952b02abd1f717005df888...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M import_status.php
    M libraries/DisplayResults.class.php
    M po/ru.po
    M po/sl.po
    M tbl_change.php
    A test/classes/PMA_Error_test.php
    M test/classes/PMA_Message_test.php
Log Message:
  -----------
  upstream merge
Commit: e5fc6bbea8eb3faf7f5eae01e066b94b406839d7
      https://github.com/phpmyadmin/phpmyadmin/commit/e5fc6bbea8eb3faf7f5eae01e066...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/display_import_ajax.lib.php
    M libraries/insert_edit.lib.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 9ca636fe21cf6fc63f359715447b654be1395ae0
      https://github.com/phpmyadmin/phpmyadmin/commit/9ca636fe21cf6fc63f359715447b...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  modify a doc comment
Commit: f330f7840a64b0bff5ca39115455168498a214f0
      https://github.com/phpmyadmin/phpmyadmin/commit/f330f7840a64b0bff5ca39115455...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M ChangeLog
    M libraries/insert_edit.lib.php
    M libraries/replication_gui.lib.php
    M tbl_replace.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: e4631d837e5251fb39c33f24e4de5df5b5e7cba2
      https://github.com/phpmyadmin/phpmyadmin/commit/e4631d837e5251fb39c33f24e4de...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function for update password in privileges
Commit: 8f2af471a46311208d5bdfca852592a7694fd679
      https://github.com/phpmyadmin/phpmyadmin/commit/8f2af471a46311208d5bdfca8525...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  a function for privileges revoke
Commit: c09e857763c6ab995862bdc211b76e7b816adfb5
      https://github.com/phpmyadmin/phpmyadmin/commit/c09e857763c6ab995862bdc211b7...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove duplicate code snippet from server_privileges script
Commit: d96b0aa7242cf58e15d35f019e6723e59dcf3b74
      https://github.com/phpmyadmin/phpmyadmin/commit/d96b0aa7242cf58e15d35f019e67...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove unwanted function parameters
Commit: 39cb681f265246296a5fbb02bee70e707b98e5b4
      https://github.com/phpmyadmin/phpmyadmin/commit/39cb681f265246296a5fbb02bee7...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  modify PMA_getCommonSQlQueryForAddUserAndUpdatePrivs() function
Commit: 46dd65f0e1913f01f029eaf7011cd3e4ff52e860
      https://github.com/phpmyadmin/phpmyadmin/commit/46dd65f0e1913f01f029eaf7011c...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
    M ChangeLog
    M browse_foreigners.php
    M db_create.php
    M db_datadict.php
    M db_events.php
    M db_operations.php
    M db_printview.php
    M db_qbe.php
    M db_routines.php
    M db_search.php
    M db_structure.php
    M db_tables_search.php
    M db_tracking.php
    M export.php
    M import.php
    M index.php
    M js/db_operations.js
    M js/functions.js
    M js/tbl_change.js
    M libraries/Advisor.class.php
    A libraries/CommonFunctions.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    R libraries/common.lib.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/core.lib.php
    M libraries/database_interface.lib.php
    M libraries/db_common.inc.php
    M libraries/db_info.inc.php
    M libraries/db_structure.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/display_import.lib.php
    M libraries/display_select_lang.lib.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/gis/pma_gis_polygon.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/js_escape.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation_header.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/export/ExportCodegen.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportMediawiki.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportPhparray.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportDocsql.class.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/plugins/import/ImportXml.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_export.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.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/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/schema/Visio_Relation_Schema.class.php
    M libraries/server_common.inc.php
    M libraries/server_synchronize.lib.php
    M libraries/server_variables_doc.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_properties.inc.php
    M libraries/tcpdf/tcpdf.php
    M libraries/transformations.lib.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 pmd_save_pos.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 prefs_manage.php
    M querywindow.php
    M schema_edit.php
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_plugins.php
    M server_privileges.php
    M server_replication.php
    M server_status.php
    M server_synchronize.php
    M server_variables.php
    M sql.php
    M tbl_addfield.php
    M tbl_alter.php
    M tbl_change.php
    M tbl_create.php
    M tbl_export.php
    M tbl_get_field.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_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/classes/PMA_DisplayResults_test.php
    A test/classes/PMA_Error_Handler_test.php
    M test/classes/PMA_File_test.php
    A test/classes/PMA_Footer_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_PDF_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    M test/libraries/PMA_STR_sub_test.php
    M test/libraries/common/PMA_browseUploadFile_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_cache_test.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
    M test/libraries/common/PMA_convert_bit_default_value_test.php
    M test/libraries/common/PMA_escapeMySqlWildcards_test.php
    M test/libraries/common/PMA_expandUserString_test.php
    M test/libraries/common/PMA_extractColumnSpec_test.php
    M test/libraries/common/PMA_extractValueFromFormattedSize_test.php
    M test/libraries/common/PMA_foreignKeySupported_test.php
    M test/libraries/common/PMA_formatNumberByteDown_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    M test/libraries/common/PMA_getCheckbox_test.php
    M test/libraries/common/PMA_getDbLink_test.php
    M test/libraries/common/PMA_getDivForSliderEffect_test.php
    M test/libraries/common/PMA_getDropdown_test.php
    M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_getRadioFields_test.php
    M test/libraries/common/PMA_getTitleForTarget_test.php
    M test/libraries/common/PMA_localisedDateTimespan_test.php
    M test/libraries/common/PMA_pow_test.php
    M test/libraries/common/PMA_printableBitValue_test.php
    M test/libraries/common/PMA_quoting_slashing_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    M test/libraries/common/PMA_stringOperations_test.php
    M test/libraries/common/PMA_unsupportedDatatypes_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_fatalError_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test_disabled.php
    M test/libraries/js_escape_test.php
    M test/libraries/rte/PMA_EVN_getEditorForm_test.php
    M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_RTN_ParameterParser_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_TRI_getEditorForm_test.php
    M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
    M test/theme.php
    M transformation_wrapper.php
    M url.php
    M user_password.php
    M view_create.php
    M view_operations.php
Log Message:
  -----------
  upstream merge
Commit: ac4a01ca790648b475ba60a2ad803aba6ceae641
      https://github.com/phpmyadmin/phpmyadmin/commit/ac4a01ca790648b475ba60a2ad80...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  correct wrong common function calls in sever_privileges-lib
Commit: 945d38c853f70d526b9da7a618e3188b0ae0a043
      https://github.com/phpmyadmin/phpmyadmin/commit/945d38c853f70d526b9da7a618e3...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  change a function signature
Commit: 6eca5e45b8b38ea5cb26edb36bee4211638eeccb
      https://github.com/phpmyadmin/phpmyadmin/commit/6eca5e45b8b38ea5cb26edb36bee...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove long code line in PMA_getStructurePrivilegeTable() in sever_privileges-lib
Commit: c3d02bbc5105de54d8f3c6a8e64bb3d7ab2e0054
      https://github.com/phpmyadmin/phpmyadmin/commit/c3d02bbc5105de54d8f3c6a8e64b...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove long code line in PMA_getAdministrationPrivilegeTable in sever_privileges-lib
Commit: 137582cf07edf92e18725bf87c38bdf0867baac9
      https://github.com/phpmyadmin/phpmyadmin/commit/137582cf07edf92e18725bf87c38...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implementation for PMA_getHtmlForAddUser()
Commit: e3941295bf7a5c0774a9fe935e0555db17d1f167
      https://github.com/phpmyadmin/phpmyadmin/commit/e3941295bf7a5c0774a9fe935e05...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function implementations for user form for privilees
Commit: 7ab2f4762a49e697abed97c707d15ca86f51d040
      https://github.com/phpmyadmin/phpmyadmin/commit/7ab2f4762a49e697abed97c707d1...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove php notice
Commit: ca60e07103dd37c1c3bf6dcd1752da1f4b031ca0
      https://github.com/phpmyadmin/phpmyadmin/commit/ca60e07103dd37c1c3bf6dcd1752...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function for get standard links
Commit: 9298b2dde3b858fbdfbded3657fc72c6f873e684
      https://github.com/phpmyadmin/phpmyadmin/commit/9298b2dde3b858fbdfbded3657fc...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
    M libraries/Tracker.class.php
    M libraries/transformations.lib.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 test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Theme_test.php
    M transformation_wrapper.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 307884506cf5f2cfc56fa9f2f3edeeb2fd2c38f1
      https://github.com/phpmyadmin/phpmyadmin/commit/307884506cf5f2cfc56fa9f2f3ed...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function for ajax behavior in privileges
Commit: c44331820df081f1ebbaa0da14a9d1267b01e2d9
      https://github.com/phpmyadmin/phpmyadmin/commit/c44331820df081f1ebbaa0da14a9...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
    M db_qbe.php
    M db_search.php
    M libraries/CommonFunctions.class.php
    M libraries/db_search.lib.php
    M libraries/plugins/export/ExportJson.class.php
    A libraries/plugins/export/README
    M libraries/plugins/import/README
    M po/da.po
    M po/fa.po
    M po/nb.po
    M po/pt_BR.po
    M test/classes/PMA_DisplayResults_test.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 980e0ecdada93edaaf142863fea04032c4f61e77
      https://github.com/phpmyadmin/phpmyadmin/commit/980e0ecdada93edaaf142863fea0...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  some changes to PMA_getExtraDataForAjaxBehavior function
Commit: a529d729e09e69b9f276962139a93f41d0528b2d
      https://github.com/phpmyadmin/phpmyadmin/commit/a529d729e09e69b9f276962139a9...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-05 (Thu, 05 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove var_dump and a notice
Commit: 5b8bfdca6878e0a0befd57f2e16dbca00a00cd7a
      https://github.com/phpmyadmin/phpmyadmin/commit/5b8bfdca6878e0a0befd57f2e16d...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove GLOBALS
Commit: ef35f35cd011cea5a3d98ffd4abefb19a8452b40
      https://github.com/phpmyadmin/phpmyadmin/commit/ef35f35cd011cea5a3d98ffd4abe...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  formating
Commit: 5ca4e74c6bf1e054994d3056ccec13adce2e318c
      https://github.com/phpmyadmin/phpmyadmin/commit/5ca4e74c6bf1e054994d3056ccec...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function for change login information
Commit: d244bffde2e57b90dcf58372f296945615dd273b
      https://github.com/phpmyadmin/phpmyadmin/commit/d244bffde2e57b90dcf58372f296...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implemeetation of PMA_getLinkToDbAndTable
Commit: ef0d745786acbdce440e3c636bc89e6e3feaefab
      https://github.com/phpmyadmin/phpmyadmin/commit/ef0d745786acbdce440e3c636bc8...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implemeetation of PMA_getAllUserSpecificRightsForReleventDb()
Commit: 1d166192321554bcfdb771b7dd3b48642ba04886
      https://github.com/phpmyadmin/phpmyadmin/commit/1d166192321554bcfdb771b7dd3b...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  Edit privileges section impelementation and remove duplicate code
Commit: d565fe45f1a2e72113a61ada4cf92949170013d2
      https://github.com/phpmyadmin/phpmyadmin/commit/d565fe45f1a2e72113a61ada4cf9...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  correct spelling mistake and change a function name
Commit: 5b7d51ce875bb67e688580aae570a6028fd8aa9a
      https://github.com/phpmyadmin/phpmyadmin/commit/5b7d51ce875bb67e688580aae570...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implement PMA_displayUserRightsInRaws
Commit: 34b38354fb27ad4bf818d10ea7dd84cba223dda5
      https://github.com/phpmyadmin/phpmyadmin/commit/34b38354fb27ad4bf818d10ea7dd...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implement function PMA_getTableForDisplayAllTableSpecificRights and formatting
Commit: 1074f56e7b97d73bd731adceeda7b230dee012be
      https://github.com/phpmyadmin/phpmyadmin/commit/1074f56e7b97d73bd731adceeda7...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implement PMA_displaySelectDbInEditPrivs and solved fetal error in server_privileges-lib script
Commit: 5b0a2626983b867b75da1b28f2ff3b6cae8bfa06
      https://github.com/phpmyadmin/phpmyadmin/commit/5b0a2626983b867b75da1b28f2ff...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  functions for display user overview
Commit: 3f52b6e70c62346fcc9fd177ffdf40fbb1d67c08
      https://github.com/phpmyadmin/phpmyadmin/commit/3f52b6e70c62346fcc9fd177ffdf...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  correct spelling mistake and chane functions names
Commit: efbba643500358ef6fed352b7180d6e5e3077225
      https://github.com/phpmyadmin/phpmyadmin/commit/efbba643500358ef6fed352b7180...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  correct spelling mistake
Commit: e72e4ef7f46a1ca12dc74c4444bb97acb376bb26
      https://github.com/phpmyadmin/phpmyadmin/commit/e72e4ef7f46a1ca12dc74c4444bb...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  formating
Commit: 4542651db19e32e3ebb7bc07899905fa3e857235
      https://github.com/phpmyadmin/phpmyadmin/commit/4542651db19e32e3ebb7bc078999...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implementation of PMA_getHtmlForDisplayTheInitials
Commit: e88b83c8198d29869e88f2ac01387a1bf14b2da8
      https://github.com/phpmyadmin/phpmyadmin/commit/e88b83c8198d29869e88f2ac0138...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  formatting
Commit: 146fdf49bbf76c458d44556e5ea8fe54d4a1145b
      https://github.com/phpmyadmin/phpmyadmin/commit/146fdf49bbf76c458d44556e5ea8...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implement PMA_getDbRightsForUserOverview()
Commit: 65ecb83a72be7a9a5e50c8922ce8fd3ccf425f09
      https://github.com/phpmyadmin/phpmyadmin/commit/65ecb83a72be7a9a5e50c8922ce8...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
    M ChangeLog
    M Documentation.html
    M db_qbe.php
    M db_search.php
    A libraries/DbSearch.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    R libraries/db_search.lib.php
    M libraries/gis/pma_gis_multilinestring.php
    M libraries/gis/pma_gis_multipolygon.php
    M libraries/gis/pma_gis_polygon.php
    M libraries/gis/pma_gis_visualization.php
    M libraries/insert_edit.lib.php
    M libraries/plugins/AuthenticationPlugin.class.php
    M libraries/plugins/ExportPlugin.class.php
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/TransformationsInterface.int.php
    A libraries/plugins/transformations/README
    A libraries/plugins/transformations/TEMPLATE
    A libraries/plugins/transformations/TEMPLATE_ABSTRACT
    A libraries/plugins/transformations/generator_main_class.sh
    A libraries/plugins/transformations/generator_plugin.sh
    R libraries/plugins/transformations/todo_rewrite/README
    R libraries/plugins/transformations/todo_rewrite/TEMPLATE
    R libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE
    R libraries/plugins/transformations/todo_rewrite/generator.sh
    R libraries/plugins/transformations/todo_rewrite/template_generator.sh
    R libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh
    M po/ca.po
    M po/ckb.po
    M po/da.po
    M po/fa.po
    M po/gl.po
    M po/nb.po
    M po/pt_BR.po
    R test/classes/Advisor_test.php
    A test/classes/PMA_Advisor_test.php
    M test/classes/PMA_Error_test.php
    M test/classes/PMA_List_Database_test.php
    A test/classes/PMA_Scripts_test.php
    A test/classes/PMA_StorageEngine_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/classes/PMA_Theme_test.php
    A test/classes/PMA_Types_Drizzle_test.php
    A test/classes/PMA_Types_MySQL_test.php
    M test/classes/PMA_Types_test.php
    M test/classes/gis/PMA_GIS_Geom_test.php
    A test/libraries/PMA_bookmark_test.php
    A test/libraries/PMA_build_html_for_db_test.php
    A test/libraries/PMA_js_escape_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_formatNumberByteDown_test.php
    M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
    M test/libraries/common/PMA_getTitleForTarget_test.php
    M test/libraries/common/PMA_localisedDateTimespan_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    R test/libraries/js_escape_test.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 7ca5fe8e53eb3a304003403ea6f2c3536227938e
      https://github.com/phpmyadmin/phpmyadmin/commit/7ca5fe8e53eb3a304003403ea6f2...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function implementation PMA_deleteUser
Commit: 43ec1212f408e1090f1727781930d7645c116b76
      https://github.com/phpmyadmin/phpmyadmin/commit/43ec1212f408e1090f1727781930...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implemet PMA_updatePrivileges() and change PMA_getCommonSQlQueryForAddUserAndUpdatePrivs() function
Commit: 86353ab7d67949d820dd3f185596faad63fddc8e
      https://github.com/phpmyadmin/phpmyadmin/commit/86353ab7d67949d820dd3f185596...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  implemet PMA_getHtmlForExportUserDefinition()
Commit: da5d307da33ea75d0f5398e447b5137aa1f8aa7d
      https://github.com/phpmyadmin/phpmyadmin/commit/da5d307da33ea75d0f5398e447b5...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  remove echo
Commit: b7074327b6f7fe15d7005fd8a9a88f447c389661
      https://github.com/phpmyadmin/phpmyadmin/commit/b7074327b6f7fe15d7005fd8a9a8...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  correct function signature
Commit: ef4d31e581f5430dcd1d2cc5d9e0afdcabc6d1bc
      https://github.com/phpmyadmin/phpmyadmin/commit/ef4d31e581f5430dcd1d2cc5d9e0...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  correct spelling mistake
Commit: c1a8445bcf55e42ec4f685d8e417687beb6a540c
      https://github.com/phpmyadmin/phpmyadmin/commit/c1a8445bcf55e42ec4f685d8e417...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  some changes to PMA_deleteUser and PMA_updatePrivileges
Commit: e032d61483f74cf4776b6551555a038e58fbe384
      https://github.com/phpmyadmin/phpmyadmin/commit/e032d61483f74cf4776b6551555a...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Menu.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M main.php
    M po/cs.po
    M po/es.po
    M po/nb.po
    M po/pt_BR.po
    M sql.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Theme_test.php
    M test/libraries/PMA_bookmark_test.php
    A test/libraries/PMA_mime_test.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 290eee2bcc8c1573875e72d8c1bb264133133891
      https://github.com/phpmyadmin/phpmyadmin/commit/290eee2bcc8c1573875e72d8c1bb...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  resolve fetal error
Commit: 042eda33b61c20d5c50905ced48a2a3d998f79b0
      https://github.com/phpmyadmin/phpmyadmin/commit/042eda33b61c20d5c50905ced48a...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  resolve fetal error
Commit: 6e74d23e18fa5e2dff89bfbf69e7ba6d7970708b
      https://github.com/phpmyadmin/phpmyadmin/commit/6e74d23e18fa5e2dff89bfbf69e7...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove php notice
Commit: c83857c9782af59178892a3ca491798530bd4b71
      https://github.com/phpmyadmin/phpmyadmin/commit/c83857c9782af59178892a3ca491...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove php notice
Commit: d1f808b51244dc750f277e166291f4869afc1832
      https://github.com/phpmyadmin/phpmyadmin/commit/d1f808b51244dc750f277e166291...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove mistakenly commited functions
Commit: 8d4ebcc6c2879ba3bdcf96515c61a44249f4ac1f
      https://github.com/phpmyadmin/phpmyadmin/commit/8d4ebcc6c2879ba3bdcf96515c61...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function implemetations and midifications to siplay user page
Commit: 07139d60b83fe290eb64b352b06415fb7af65a56
      https://github.com/phpmyadmin/phpmyadmin/commit/07139d60b83fe290eb64b352b064...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  add doc blocks and correct spelling mistake
Commit: df6ea4f4998f4cfd6209c8ecd505cce42ab119a5
      https://github.com/phpmyadmin/phpmyadmin/commit/df6ea4f4998f4cfd6209c8ecd505...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove unwanted unset()
Commit: b9ad5351f195628f5624bcaafd126809f74f94eb
      https://github.com/phpmyadmin/phpmyadmin/commit/b9ad5351f195628f5624bcaafd12...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  change function name
Commit: 10da9e98194c7904a969a93192f9377c2c78adad
      https://github.com/phpmyadmin/phpmyadmin/commit/10da9e98194c7904a969a93192f9...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  spelling mistake
Commit: d2e720af289b02ed6018f471f57165d727f19561
      https://github.com/phpmyadmin/phpmyadmin/commit/d2e720af289b02ed6018f471f571...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve doc
Commit: 83368f096f0c14279fafa8a2f96afbd20e823d0d
      https://github.com/phpmyadmin/phpmyadmin/commit/83368f096f0c14279fafa8a2f96a...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  improve a function name
Commit: d3092e95492c61461f12a1beffa32a587badc61b
      https://github.com/phpmyadmin/phpmyadmin/commit/d3092e95492c61461f12a1beffa3...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  improve function names and variable names
Commit: 4efa2156887185a3d54152b6caaa07d014b6bca1
      https://github.com/phpmyadmin/phpmyadmin/commit/4efa2156887185a3d54152b6caaa...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve doc comment
Commit: 6f67701831497c2fa362a261a5a06115d6f1ee75
      https://github.com/phpmyadmin/phpmyadmin/commit/6f67701831497c2fa362a261a5a0...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve doc comment
Commit: 519ff99ff6ab3cf42b4e3d179560c6efa7f6d7fe
      https://github.com/phpmyadmin/phpmyadmin/commit/519ff99ff6ab3cf42b4e3d179560...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  functions implement for get queries for Db speicific privs
Commit: 2bb169e1d63082f5a1883d3b635afaffc937fac1
      https://github.com/phpmyadmin/phpmyadmin/commit/2bb169e1d63082f5a1883d3b635a...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  PMA_addUser() function implementation
Commit: bb84591a1de1abefa3c2f1ecb6456fa31d31b5c1
      https://github.com/phpmyadmin/phpmyadmin/commit/bb84591a1de1abefa3c2f1ecb645...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  add doc comment and change function name
Commit: 30cf9d5e3f63e6ad2e68e50bf1de56d7e196b94d
      https://github.com/phpmyadmin/phpmyadmin/commit/30cf9d5e3f63e6ad2e68e50bf1de...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove invalid SQL query
Commit: f0dbcd47334276a3c839045f18f53015d9f76058
      https://github.com/phpmyadmin/phpmyadmin/commit/f0dbcd47334276a3c839045f18f5...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  function name improvement and correct spelling mistake
Commit: 800308a5f117381dee30ab7ca35557fb41937133
      https://github.com/phpmyadmin/phpmyadmin/commit/800308a5f117381dee30ab7ca355...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  improve PMA_getWithClauseForAddUserAndUpdatePrivs() function
Commit: 630b50074a40a6919c9a4d0281bf3212c0b153da
      https://github.com/phpmyadmin/phpmyadmin/commit/630b50074a40a6919c9a4d0281bf...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve doc comment
Commit: c28619d85fe8cdfac8ec4699e3d34d0949a9df3d
      https://github.com/phpmyadmin/phpmyadmin/commit/c28619d85fe8cdfac8ec4699e3d3...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove PHP notice
Commit: e00cf973c001854002e0a40b125ef83a850fe6a6
      https://github.com/phpmyadmin/phpmyadmin/commit/e00cf973c001854002e0a40b125e...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove unwanted parameter from PMA_getHtmlForNotAttachedPrivilegesToTableSpecificColumn()
Commit: 57cc90e00e1c4606fb2f1567f253a548d896aebe
      https://github.com/phpmyadmin/phpmyadmin/commit/57cc90e00e1c4606fb2f1567f253...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  correct wrong variable declaration
Commit: 7f6f3d2338c8703652fd19fc6e066a7feb1eead3
      https://github.com/phpmyadmin/phpmyadmin/commit/7f6f3d2338c8703652fd19fc6e06...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
    M libraries/DisplayResults.class.php
    M libraries/insert_edit.lib.php
    M po/da.po
    M po/de.po
    M po/ko.po
    M po/pl.po
    M po/pt_BR.po
    M sql.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 8ee8a5ffbce0da41007f9042111d15d34c83d359
      https://github.com/phpmyadmin/phpmyadmin/commit/8ee8a5ffbce0da41007f9042111d...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-14 (Sat, 14 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  spelling mistakes
Commit: 9aa636b766fc0fca0f56f4c08f4c90f848a4f32b
      https://github.com/phpmyadmin/phpmyadmin/commit/9aa636b766fc0fca0f56f4c08f4c...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-14 (Sat, 14 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve PMA_getWithClauseForAddUserAndUpdatePrivs()
Commit: b86de1ab5d0798e022dbf2e92cecbf1f036f4340
      https://github.com/phpmyadmin/phpmyadmin/commit/b86de1ab5d0798e022dbf2e92cec...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-15 (Sun, 15 Jul 2012)
Changed paths:
    M ChangeLog
    M Documentation.html
    M libraries/rte/rte_events.lib.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: a4e4544f3397301007f5fef89410490f64018ff9
      https://github.com/phpmyadmin/phpmyadmin/commit/a4e4544f3397301007f5fef89410...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-15 (Sun, 15 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove unwanted function parameter
Commit: 89c68ed98a34e8b147f3dc7e25f92abd185d85b9
      https://github.com/phpmyadmin/phpmyadmin/commit/89c68ed98a34e8b147f3dc7e25f9...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-15 (Sun, 15 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve PMA_getWithClauseForAddUserAndUpdatePrivs()
Commit: 42860cf4f0b1c4c0b8bf7a67b4e3a00b11daff11
      https://github.com/phpmyadmin/phpmyadmin/commit/42860cf4f0b1c4c0b8bf7a67b4e3...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-15 (Sun, 15 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  change some functions signatures
Commit: 45f35c6906ae9f564c19e81bd078ccbcfb3f31d8
      https://github.com/phpmyadmin/phpmyadmin/commit/45f35c6906ae9f564c19e81bd078...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-15 (Sun, 15 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove a php notice
Commit: d8233fcbb96ab2b897ba87a6ccc4cbbf2576d44e
      https://github.com/phpmyadmin/phpmyadmin/commit/d8233fcbb96ab2b897ba87a6ccc4...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve coding style
Commit: 7f0ef97ddebd6853e6567966f0427be24e74d268
      https://github.com/phpmyadmin/phpmyadmin/commit/7f0ef97ddebd6853e6567966f042...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  Spelling mistake
Commit: 18459099240d67b47951175e175e97d93cf823ea
      https://github.com/phpmyadmin/phpmyadmin/commit/18459099240d67b47951175e175e...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  missing semicolon
Commit: a0db338b70345d32cd5d1eee335e0911b90d212e
      https://github.com/phpmyadmin/phpmyadmin/commit/a0db338b70345d32cd5d1eee335e...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  change function signature
Commit: b984bc397bcd958407174aac2bb3322568063e8c
      https://github.com/phpmyadmin/phpmyadmin/commit/b984bc397bcd958407174aac2bb3...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  Improve coding style
Commit: ffc74832ed4d4b99530e5bc3f94385db6342c331
      https://github.com/phpmyadmin/phpmyadmin/commit/ffc74832ed4d4b99530e5bc3f943...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M ChangeLog
    M Documentation.html
    M browse_foreigners.php
    M db_create.php
    M db_datadict.php
    M db_events.php
    M db_operations.php
    M db_printview.php
    M db_qbe.php
    M db_routines.php
    M db_search.php
    M db_structure.php
    M db_tables_search.php
    M db_tracking.php
    M export.php
    M import.php
    M import_status.php
    M index.php
    M js/db_operations.js
    M js/db_search.js
    M js/functions.js
    M js/server_databases.js
    M js/tbl_change.js
    M libraries/Advisor.class.php
    A libraries/CommonFunctions.class.php
    M libraries/Config.class.php
    A libraries/DbSearch.class.php
    A libraries/DisplayResults.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/OutputBuffering.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/Scripts.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.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/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    R libraries/common.lib.php
    M libraries/config.default.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/core.lib.php
    M libraries/database_interface.lib.php
    M libraries/db_common.inc.php
    M libraries/db_info.inc.php
    M libraries/db_structure.lib.php
    M libraries/db_table_exists.lib.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_create_database.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    M libraries/display_select_lang.lib.php
    R libraries/display_tbl.lib.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/error.inc.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
    M libraries/gis/pma_gis_geometrycollection.php
    M libraries/gis/pma_gis_multilinestring.php
    M libraries/gis/pma_gis_multipolygon.php
    M libraries/gis/pma_gis_polygon.php
    M libraries/gis/pma_gis_visualization.php
    M libraries/gis_visualization.lib.php
    M libraries/import.lib.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/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/js_escape.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation_header.inc.php
    M libraries/opendocument.lib.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/README
    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/README
    A libraries/plugins/transformations/TEMPLATE
    A libraries/plugins/transformations/TEMPLATE_ABSTRACT
    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/generator_main_class.sh
    A libraries/plugins/transformations/generator_plugin.sh
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_export.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.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/sanitizing.lib.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/schema/Visio_Relation_Schema.class.php
    M libraries/select_server.lib.php
    M libraries/server_common.inc.php
    A libraries/server_privileges.lib.php
    M libraries/server_synchronize.lib.php
    M libraries/server_variables_doc.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/sqlvalidator.class.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_properties.inc.php
    R libraries/tbl_replace_fields.inc.php
    M libraries/tcpdf/tcpdf.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 libraries/url_generating.lib.php
    M libraries/user_preferences.inc.php
    M libraries/user_preferences.lib.php
    M libraries/zip.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 pmd_save_pos.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 prefs_manage.php
    M querywindow.php
    M schema_edit.php
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_plugins.php
    M server_privileges.php
    M server_replication.php
    M server_status.php
    M server_synchronize.php
    M server_variables.php
    M sql.php
    M tbl_addfield.php
    M tbl_alter.php
    M tbl_change.php
    M tbl_create.php
    M tbl_export.php
    M tbl_get_field.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_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    R test/classes/Advisor_test.php
    A test/classes/PMA_Advisor_test.php
    A test/classes/PMA_DisplayResults_test.php
    A test/classes/PMA_Error_Handler_test.php
    A test/classes/PMA_Error_test.php
    M test/classes/PMA_File_test.php
    A test/classes/PMA_Footer_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_PDF_test.php
    A test/classes/PMA_Scripts_test.php
    A test/classes/PMA_StorageEngine_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/classes/PMA_Theme_test.php
    A test/classes/PMA_Types_Drizzle_test.php
    A test/classes/PMA_Types_MySQL_test.php
    M test/classes/PMA_Types_test.php
    M test/classes/gis/PMA_GIS_Geom_test.php
    M test/classes/gis/PMA_GIS_Geometry_test.php
    A test/classes/gis/PMA_GIS_Geometrycollection_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 test/libraries/PMA_GIS_modifyQuery_test.php
    M test/libraries/PMA_STR_sub_test.php
    M test/libraries/PMA_blowfish_test.php
    A test/libraries/PMA_bookmark_test.php
    A test/libraries/PMA_build_html_for_db_test.php
    A test/libraries/PMA_js_escape_test.php
    A test/libraries/PMA_mime_test.php
    M test/libraries/common/PMA_browseUploadFile_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_cache_test.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
    M test/libraries/common/PMA_convert_bit_default_value_test.php
    M test/libraries/common/PMA_escapeMySqlWildcards_test.php
    M test/libraries/common/PMA_expandUserString_test.php
    M test/libraries/common/PMA_extractColumnSpec_test.php
    M test/libraries/common/PMA_extractValueFromFormattedSize_test.php
    M test/libraries/common/PMA_foreignKeySupported_test.php
    M test/libraries/common/PMA_formatNumberByteDown_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    M test/libraries/common/PMA_getCheckbox_test.php
    M test/libraries/common/PMA_getDbLink_test.php
    M test/libraries/common/PMA_getDivForSliderEffect_test.php
    M test/libraries/common/PMA_getDropdown_test.php
    M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_getRadioFields_test.php
    M test/libraries/common/PMA_getTitleForTarget_test.php
    M test/libraries/common/PMA_localisedDateTimespan_test.php
    M test/libraries/common/PMA_pow_test.php
    M test/libraries/common/PMA_printableBitValue_test.php
    M test/libraries/common/PMA_quoting_slashing_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    M test/libraries/common/PMA_stringOperations_test.php
    M test/libraries/common/PMA_unsupportedDatatypes_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_fatalError_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test_disabled.php
    R test/libraries/js_escape_test.php
    M test/libraries/rte/PMA_EVN_getEditorForm_test.php
    M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_RTN_ParameterParser_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_TRI_getEditorForm_test.php
    M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
    M test/theme.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/navigation.css.php
    M transformation_overview.php
    M transformation_wrapper.php
    M url.php
    M user_password.php
    M view_create.php
    M view_operations.php
    M webapp.php
Log Message:
  -----------
  Merge branch 'master' of github.com:thilinaa/phpmyadmin
Commit: 9199e0262e3c6ad0bd16b635913c8dec39f38ffd
      https://github.com/phpmyadmin/phpmyadmin/commit/9199e0262e3c6ad0bd16b635913c...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove php parse error
Commit: c998cbc3daae6ed528e5b304e460871d540b82c3
      https://github.com/phpmyadmin/phpmyadmin/commit/c998cbc3daae6ed528e5b304e460...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/Advisor.class.php
    M libraries/CommonFunctions.class.php
    M libraries/DisplayResults.class.php
    M libraries/bookmark.lib.php
    M po/pt_BR.po
    M po/sk.po
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Error_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_Scripts_test.php
    M test/classes/PMA_StorageEngine_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/classes/PMA_Types_MySQL_test.php
    M test/libraries/PMA_SQL_parser_test.php
    M test/libraries/PMA_STR_sub_test.php
    M test/libraries/PMA_bookmark_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 6eeb80da2484353c298065f64fc59bb08d8379b2
      https://github.com/phpmyadmin/phpmyadmin/commit/6eeb80da2484353c298065f64fc5...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve coding style
Commit: f998b4c620819befc195f13851829637172cafb5
      https://github.com/phpmyadmin/phpmyadmin/commit/f998b4c620819befc195f1385182...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  improve coding style
Commit: 55018a6a2d6eb0256ff069aec34c3e63ddc3c6b4
      https://github.com/phpmyadmin/phpmyadmin/commit/55018a6a2d6eb0256ff069aec34c...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/CommonFunctions.class.php
Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'
Commit: 8d43951bcd8466e810ecc205c1afb1944d5425db
      https://github.com/phpmyadmin/phpmyadmin/commit/8d43951bcd8466e810ecc205c1af...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  improve coding style
Commit: 9210a1acc95a3dc7956d4addfdede75efae84c21
      https://github.com/phpmyadmin/phpmyadmin/commit/9210a1acc95a3dc7956d4addfded...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove global variables
Commit: 37981416a9fff37b6982b685647a2d8c5cfdf287
      https://github.com/phpmyadmin/phpmyadmin/commit/37981416a9fff37b6982b685647a...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  remove global variable db
Commit: 7245209eae1a466c9eafc6afafd78fde1dfe73cd
      https://github.com/phpmyadmin/phpmyadmin/commit/7245209eae1a466c9eafc6afafd7...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M server_privileges.php
Log Message:
  -----------
  remove global variable
Commit: c6e265c236e3b7d954cf2b88cb51b24a33f65c98
      https://github.com/phpmyadmin/phpmyadmin/commit/c6e265c236e3b7d954cf2b88cb51...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove global variable
Commit: 6ec2e514b6cc2b740aada33a33998ed8a4a161a5
      https://github.com/phpmyadmin/phpmyadmin/commit/6ec2e514b6cc2b740aada33a3399...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove global variable pma_pw2
Commit: f03376076d9b4184e4d7fe16cd5e86b836238582
      https://github.com/phpmyadmin/phpmyadmin/commit/f03376076d9b4184e4d7fe16cd5e...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
Log Message:
  -----------
  remove php notice
Commit: b05ee596f951efd7f42d6943b41bf9bf9f37461b
      https://github.com/phpmyadmin/phpmyadmin/commit/b05ee596f951efd7f42d6943b41b...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  remove global variables
Commit: 75d20f23fc410de26012b0edfcaf55a085405759
      https://github.com/phpmyadmin/phpmyadmin/commit/75d20f23fc410de26012b0edfcaf...
  Author: Thilina Buddika thilinaabeyrathna@gmail.com
  Date:   2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  a function for get sql queries for display and add user
Commit: 0e04e28ac430c8ce998260ca44fba97b91a1e72a
      https://github.com/phpmyadmin/phpmyadmin/commit/0e04e28ac430c8ce998260ca44fb...
  Author: Marc Delisle marc@infomarc.info
  Date:   2012-07-21 (Sat, 21 Jul 2012)
Changed paths:
    A libraries/server_privileges.lib.php
    M server_privileges.php
Log Message:
  -----------
  Merge branch 'thilina'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/baee09913766...0e04e28ac430

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] accfba: Merge remote-tracking branch 'upstream/master'