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

6 Aug 2013

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 84d88d2a79f2f049f92146ad8f2469777e105f68
     
https://github.com/phpmyadmin/phpmyadmin/commit/84d88d2a79f2f049f92146ad8f2…
  Author: adamgsoc2013 &lt;adamgsoc2013(a)gmail.com&gt;
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M libraries/Index.class.php
    M libraries/engines/bdb.lib.php
    M libraries/engines/berkeleydb.lib.php
    M libraries/engines/binlog.lib.php
    M libraries/engines/innobase.lib.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/memory.lib.php
    M libraries/engines/merge.lib.php
    M libraries/engines/mrg_myisam.lib.php
    M libraries/engines/myisam.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/server_privileges.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be(a)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(a)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(a)latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

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


  Commit: 0b93175c9f210ca1e5baca53bae0329731f54d4f
     
https://github.com/phpmyadmin/phpmyadmin/commit/0b93175c9f210ca1e5baca53bae…
  Author: adamgsoc2013 &lt;adamgsoc2013(a)gmail.com&gt;
  Date:   2013-08-04 (Sun, 04 Aug 2013)

  Changed paths:
    M .gitignore
    M ChangeLog
    M README
    M db_export.php
    M db_operations.php
    M db_structure.php
    M doc/setup.rst
    M export.php
    A js/jquery/MIT-LICENSE.txt
    M js/jquery/jquery.svg.js
    A js/jquery/src/README
    A js/jquery/src/jquery-ui/jquery.ui.accordion.js
    A js/jquery/src/jquery-ui/jquery.ui.autocomplete.js
    A js/jquery/src/jquery-ui/jquery.ui.button.js
    A js/jquery/src/jquery-ui/jquery.ui.core.js
    A js/jquery/src/jquery-ui/jquery.ui.datepicker.js
    A js/jquery/src/jquery-ui/jquery.ui.dialog.js
    A js/jquery/src/jquery-ui/jquery.ui.draggable.js
    A js/jquery/src/jquery-ui/jquery.ui.droppable.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-blind.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-bounce.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-clip.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-drop.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-explode.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-fade.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-fold.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-highlight.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-pulsate.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-scale.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-shake.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-slide.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-transfer.js
    A js/jquery/src/jquery-ui/jquery.ui.effect.js
    A js/jquery/src/jquery-ui/jquery.ui.menu.js
    A js/jquery/src/jquery-ui/jquery.ui.mouse.js
    A js/jquery/src/jquery-ui/jquery.ui.position.js
    A js/jquery/src/jquery-ui/jquery.ui.progressbar.js
    A js/jquery/src/jquery-ui/jquery.ui.resizable.js
    A js/jquery/src/jquery-ui/jquery.ui.selectable.js
    A js/jquery/src/jquery-ui/jquery.ui.slider.js
    A js/jquery/src/jquery-ui/jquery.ui.sortable.js
    A js/jquery/src/jquery-ui/jquery.ui.spinner.js
    A js/jquery/src/jquery-ui/jquery.ui.tabs.js
    A js/jquery/src/jquery-ui/jquery.ui.tooltip.js
    A js/jquery/src/jquery-ui/jquery.ui.widget.js
    A js/jquery/src/jquery/ajax.js
    A js/jquery/src/jquery/ajax/jsonp.js
    A js/jquery/src/jquery/ajax/script.js
    A js/jquery/src/jquery/ajax/xhr.js
    A js/jquery/src/jquery/attributes.js
    A js/jquery/src/jquery/callbacks.js
    A js/jquery/src/jquery/core.js
    A js/jquery/src/jquery/css.js
    A js/jquery/src/jquery/data.js
    A js/jquery/src/jquery/deferred.js
    A js/jquery/src/jquery/deprecated.js
    A js/jquery/src/jquery/dimensions.js
    A js/jquery/src/jquery/effects.js
    A js/jquery/src/jquery/event-alias.js
    A js/jquery/src/jquery/event.js
    A js/jquery/src/jquery/intro.js
    A js/jquery/src/jquery/manipulation.js
    A js/jquery/src/jquery/offset.js
    A js/jquery/src/jquery/outro.js
    A js/jquery/src/jquery/queue.js
    A js/jquery/src/jquery/selector-native.js
    A js/jquery/src/jquery/serialize.js
    A js/jquery/src/jquery/sizzle-jquery.js
    A js/jquery/src/jquery/support.js
    A js/jquery/src/jquery/traversing.js
    A js/jquery/src/jquery/wrap.js
    M js/messages.php
    A js/server_user_groups.js
    M js/tbl_structure.js
    M libraries/common.inc.php
    M libraries/display_import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mult_submits.inc.php
    M libraries/server_common.lib.php
    M libraries/server_privileges.lib.php
    A libraries/server_variables.lib.php
    R libraries/server_variables_doc.php
    M libraries/tbl_columns_definition_form.inc.php
    A libraries/tbl_columns_definition_form.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be(a)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(a)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(a)latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M scripts/revision-info
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_plugins.php
    M server_replication.php
    M server_user_groups.php
    M server_variables.php
    M tbl_change.php
    M tbl_printview.php
    M tbl_structure.php
    A test/classes/PMA_TableReplaceSearch_test.php
    A test/classes/dbi/DBIDrizzle_test.php
    A test/classes/plugin/export/PMA_ExportCodegen_test.php
    A test/classes/plugin/export/PMA_ExportCsv_test.php
    A test/classes/plugin/export/PMA_ExportExcel_test.php
    A test/classes/plugin/export/PMA_ExportHtmlword_test.php
    A test/classes/plugin/export/PMA_ExportJson_test.php
    A test/classes/plugin/export/PMA_ExportLatex_test.php
    A test/classes/plugin/export/PMA_ExportMediawiki_test.php
    A test/classes/plugin/export/PMA_ExportOds_test.php
    A test/classes/plugin/export/PMA_ExportOdt_test.php
    A test/classes/plugin/export/PMA_ExportPdf_test.php
    A test/classes/plugin/export/PMA_ExportPhparray_test.php
    M test/libraries/PMA_server_common_test.php
    A test/libraries/PMA_server_status_queries_test.php
    A test/libraries/PMA_server_user_groups_test.php
    A test/libraries/PMA_server_variables_test.php
    A test/libraries/PMA_tbl_relation_test.php
    M test/libraries/PMA_user_preferences_test.php

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


  Commit: 66184fe8cc6d54d47c53e064e6cba43d18b8d8cd
     
https://github.com/phpmyadmin/phpmyadmin/commit/66184fe8cc6d54d47c53e064e6c…
  Author: adamgsoc2013 &lt;adamgsoc2013(a)gmail.com&gt;
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M test/classes/dbi/DBIDrizzle_test.php
    M 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
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_relation_cleanup_test.php

  Log Message:
  -----------
  fix code comments on test code


  Commit: 202d7f40bcf5824acdb0e9e3cfd7838581af8803
     
https://github.com/phpmyadmin/phpmyadmin/commit/202d7f40bcf5824acdb0e9e3cfd…
  Author: adamgsoc2013 &lt;adamgsoc2013(a)gmail.com&gt;
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M browse_foreigners.php
    M libraries/Footer.class.php
    M po/ko.po
    M po/nl.po
    M tbl_tracking.php
    M test/classes/plugin/export/PMA_ExportOds_test.php

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


  Commit: a8536660034d25ac2032f25696ac7ad4623b6833
     
https://github.com/phpmyadmin/phpmyadmin/commit/a8536660034d25ac2032f25696a…
  Author: Michal Čihař &lt;michal(a)cihar.com&gt;
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M test/classes/dbi/DBIDrizzle_test.php
    M 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
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_relation_cleanup_test.php

  Log Message:
  -----------
  Merge pull request #568 from adamgsoc2013/UT_plu_table

fix code comments on test codes


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6caccf9d1f91...a8536660034d

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

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