[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 54c29c: "Edit user group" link should not be presented whe...

Fri Aug 2 16:03:01 CEST 2013

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 54c29c182ffa40abffe8136f85ce3b8f38c4b5d2
      https://github.com/phpmyadmin/phpmyadmin/commit/54c29c182ffa40abffe8136f85ce3b8f38c4b5d2
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  "Edit user group" link should not be presented when no user group is defined


  Commit: 25e9672f37471c614b026655f694e1b470d9c715
      https://github.com/phpmyadmin/phpmyadmin/commit/25e9672f37471c614b026655f694e1b470d9c715
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M js/messages.php
    M js/server_privileges.js
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Ask for confirmation before deleting a user group


  Commit: 36217b01eecd84357b7a211d626c9452379793b9
      https://github.com/phpmyadmin/phpmyadmin/commit/36217b01eecd84357b7a211d626c9452379793b9
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Do not show table header it there were no user groups


  Commit: d8c97fa0348511a2305198ee56fca3ed306124db
      https://github.com/phpmyadmin/phpmyadmin/commit/d8c97fa0348511a2305198ee56fca3ed306124db
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Delete related user group assignments when deleting a user group


  Commit: 82e776bd7459581a6272b2b660c6355686bc30a4
      https://github.com/phpmyadmin/phpmyadmin/commit/82e776bd7459581a6272b2b660c6355686bc30a4
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Order user groups in ascending order


  Commit: 896c560b3f23d8e95796d5cf7689c113c564f507
      https://github.com/phpmyadmin/phpmyadmin/commit/896c560b3f23d8e95796d5cf7689c113c564f507
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M ChangeLog
    M browse_foreigners.php
    M build.xml
    M changelog.php
    M config.sample.inc.php
    M db_export.php
    M db_import.php
    M db_qbe.php
    M db_structure.php
    M db_tracking.php
    M doc/config.rst
    M doc/require.rst
    M examples/config.manyhosts.inc.php
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M export.php
    M import.php
    M import_status.php
    M index.php
    M js/ajax.js
    M js/chart.js
    A js/cross_framing_protection.js
    M js/export.js
    M js/functions.js
    M js/keyhandler.js
    M js/messages.php
    M js/navigation.js
    M js/rte.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_variables.js
    M js/sql.js
    M js/tbl_chart.js
    M js/tbl_find_replace.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js
    R libraries/.htaccess
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.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/PMA.php
    M libraries/RecentTable.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    A libraries/String.class.php
    A libraries/StringAbstractType.class.php
    A libraries/StringByte.int.php
    M libraries/StringCType.class.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/StringNativeType.class.php
    A libraries/StringType.int.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/advisory_rules.txt
    M libraries/bookmark.lib.php
    M libraries/charset_conversion.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/Validator.class.php
    M libraries/config/config_functions.lib.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/display_create_table.lib.php
    A libraries/display_export.inc.php
    M libraries/display_export.lib.php
    A libraries/display_import.inc.php
    M libraries/display_import.lib.php
    M libraries/display_structure.lib.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mult_submits.inc.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    A libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/navigation/Nodes/Node_Event.class.php
    M libraries/navigation/Nodes/Node_Function.class.php
    M libraries/navigation/Nodes/Node_Procedure.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_View.class.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/select_lang.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_privileges.lib.php
    A libraries/server_status.lib.php
    A libraries/server_status_advisor.lib.php
    A libraries/server_status_queries.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    A libraries/string.inc.php
    R libraries/string.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/transformations.lib.php
    M navigation.php
    M phpunit.xml.dist
    M pmd_display_field.php
    M pmd_pdf.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at 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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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 at 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 at latin.po
    A po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M schema_export.php
    A scripts/revision-info
    M server_export.php
    M server_import.php
    M server_plugins.php
    M server_replication.php
    M server_status.php
    M server_status_advisor.php
    M server_status_queries.php
    R setup/frames/.htaccess
    R setup/lib/.htaccess
    M setup/lib/ConfigGenerator.class.php
    M setup/scripts.js
    M sql.php
    M tbl_export.php
    M tbl_import.php
    M tbl_row_action.php
    M tbl_select.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/bootstrap-dist.php
    M test/classes/PMA_DisplayResults_test.php
    A test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Types_Drizzle_test.php
    M test/classes/config/PMA_FormDisplay_test.php
    A test/classes/dbi/DBIMysql_test.php
    A test/classes/dbi/DBIMysqli_test.php
    A test/classes/plugin/PMA_PluginManager_test.php
    A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
    A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    A test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
    A test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/classes/plugin/transformations/Image_JPEG_Inline_test.php
    M test/classes/plugin/transformations/Image_Link_test.php
    M test/classes/plugin/transformations/Image_PNG_Inline_test.php
    M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    M test/classes/plugin/transformations/Text_Plain_Download_test.php
    M test/classes/plugin/transformations/Text_Plain_External_test.php
    M test/classes/plugin/transformations/Text_Plain_Formatted_test.php
    M test/classes/plugin/transformations/Text_Plain_Hex_test.php
    M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
    M test/classes/plugin/transformations/Text_Plain_Link_test.php
    A test/classes/properties/PMA_PorpertyItem_test.php
    A test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
    A test/classes/properties/options/PMA_OptionsPropertyItem_test.php
    A test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
    A test/classes/properties/options/items/PMA_PropertyItems_test.php
    A test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
    A test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
    A test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php
    M test/classes/schema/Dia_Relation_Schema_test.php
    M test/classes/schema/Eps_Relation_Schema_test.php
    M test/classes/schema/Pdf_Relation_Schema_test.php
    M test/classes/schema/Svg_Relation_Schema_test.php
    A test/classes/schema/User_Schema_test.php
    M test/libraries/PMA_ConfigFile_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_Form_Processing_test.php
    M test/libraries/PMA_Index_test.php
    A test/libraries/PMA_SQL_parse_analyze_test.php
    M test/libraries/PMA_SQL_parser_data_test.php
    M test/libraries/PMA_SQL_parser_test.php
    R test/libraries/PMA_STR_sub_test.php
    M test/libraries/PMA_StringCType_test.php
    M test/libraries/PMA_StringMB_test.php
    M test/libraries/PMA_StringNativeType_test.php
    M test/libraries/PMA_StringNative_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_charset_conversion_test.php
    A test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_iconv_wrapper_test.php
    M test/libraries/PMA_mime_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    A test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_relation_test.php
    A test/libraries/PMA_server_replication_test.php
    A test/libraries/PMA_server_status_advisor_test.php
    A test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_string_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/PMA_zip_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_headerLocation_test.php
    M themes/.gitignore
    M themes/original/css/common.css.php
    M themes/original/css/navigation.css.php
    A themes/original/img/b_undo.png
    M themes/original/img/sprites.png
    M themes/original/sprites.lib.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/css/navigation.css.php
    A themes/pmahomme/img/b_undo.png
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/sprites.lib.php
    M version_check.php
    M view_create.php

  Log Message:
  -----------
  Merge branch 'master' into configurableMenus

Conflicts:
	libraries/server_privileges.lib.php


  Commit: b5890b8a743f640993b421ea3db8575fd94e7bb7
      https://github.com/phpmyadmin/phpmyadmin/commit/b5890b8a743f640993b421ea3db8575fd94e7bb7
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M js/server_privileges.js

  Log Message:
  -----------
  Escape html


  Commit: a28f43b288d2162981784b3c79f0af628c76640f
      https://github.com/phpmyadmin/phpmyadmin/commit/a28f43b288d2162981784b3c79f0af628c76640f
  Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M js/server_privileges.js
    A js/server_user_groups.js
    M server_user_groups.php

  Log Message:
  -----------
  Add new JS file for server_user_groups


  Commit: 066b753a5a505d6c2d6ba43660228d9dcf21479a
      https://github.com/phpmyadmin/phpmyadmin/commit/066b753a5a505d6c2d6ba43660228d9dcf21479a
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M js/messages.php
    A js/server_user_groups.js
    M libraries/server_privileges.lib.php
    M server_user_groups.php

  Log Message:
  -----------
  Merge pull request #554 from kasunchathuranga/configurableMenus

Improvements to configurable menus


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d9fecc136df4...066b753a5a50