[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f2ff49: Merge branch 'master' of https://github.com/phpmya...

Marc Delisle marc at infomarc.info
Tue Jul 16 17:29:32 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f2ff4931df40c2e951f99e7da56831a3da16dbbe
      https://github.com/phpmyadmin/phpmyadmin/commit/f2ff4931df40c2e951f99e7da56831a3da16dbbe
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M ChangeLog
    M db_structure.php
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M js/functions.js
    M js/messages.php
    M libraries/DatabaseInterface.class.php
    M libraries/Index.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/config.values.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    A libraries/config/Validator.class.php
    R libraries/config/validate.lib.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/insert_edit.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugins/PluginObserver.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/user_preferences.lib.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
    M po/zh_CN.po
    M po/zh_TW.po
    M setup/lib/form_processing.lib.php
    M setup/lib/index.lib.php
    M setup/validate.php
    M sql.php
    M test/classes/PMA_Util_test.php
    A test/classes/config/PMA_FormDisplay_test.php
    M test/classes/config/PMA_Form_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/libraries/PMA_ConfigFile_test.php
    A test/libraries/PMA_ConfigGenerator_test.php
    A test/libraries/PMA_FormDisplay_tpl_test.php
    A test/libraries/PMA_Form_Processing_test.php
    A test/libraries/PMA_Index_test.php
    M test/libraries/PMA_SQL_parser_data_test.php
    A test/libraries/PMA_server_replication_test.php
    A test/libraries/PMA_user_preferences_test.php
    M version_check.php
    M view_create.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into serverview_refactor


  Commit: da80a3a2706f11fc780c7a22996a1a9104af5f6b
      https://github.com/phpmyadmin/phpmyadmin/commit/da80a3a2706f11fc780c7a22996a1a9104af5f6b
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M po/be.po
    M po/bg.po
    M po/br.po
    M po/cs.po
    M po/de.po
    M po/el.po
    M po/fi.po
    M po/gl.po
    M po/hr.po
    M po/kk.po
    M po/lt.po
    M po/lv.po
    M po/nb.po
    M po/pl.po
    M po/pt.po
    M po/ro.po
    M po/ru.po
    M po/sk.po
    M po/sr at latin.po
    M po/uk.po
    M po/uz at latin.po
    M test/bootstrap-dist.php
    M test/classes/config/PMA_FormDisplay_test.php
    M test/libraries/PMA_ConfigFile_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_Index_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_headerLocation_test.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into serverview_refactor


  Commit: 247ea08eafa55ab6b3495018c8764245d713ad9b
      https://github.com/phpmyadmin/phpmyadmin/commit/247ea08eafa55ab6b3495018c8764245d713ad9b
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M libraries/operations.lib.php
    M libraries/sqlparser.lib.php
    A test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/libraries/PMA_Form_Processing_test.php
    M test/libraries/PMA_user_preferences_test.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into serverview_refactor


  Commit: 5282b838ce927ff084a5a531c701206b09d87478
      https://github.com/phpmyadmin/phpmyadmin/commit/5282b838ce927ff084a5a531c701206b09d87478
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    A test/libraries/PMA_server_status_advisor_test.php

  Log Message:
  -----------
  UTs for PMA_server_status_advisor


  Commit: 22d10cbac955c3be0961b3274c9af1b3f804d004
      https://github.com/phpmyadmin/phpmyadmin/commit/22d10cbac955c3be0961b3274c9af1b3f804d004
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M libraries/sysinfo.lib.php

  Log Message:
  -----------
  fix undefined error


  Commit: c7e6069de7c3e160baad5b85192d087abc39464e
      https://github.com/phpmyadmin/phpmyadmin/commit/c7e6069de7c3e160baad5b85192d087abc39464e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M libraries/sysinfo.lib.php
    A test/libraries/PMA_server_status_advisor_test.php

  Log Message:
  -----------
  Merge pull request #506 from xmujay/serverview_refactor

UTs for PMA_server_status_advisor


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9525e09e1b63...c7e6069de7c3


More information about the Git mailing list