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

Marc Delisle marc at infomarc.info
Tue Jun 25 18:56:51 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c6fb4c4d5f105f263a4b04c620a97f4d3f373e16
      https://github.com/phpmyadmin/phpmyadmin/commit/c6fb4c4d5f105f263a4b04c620a97f4d3f373e16
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-22 (Sat, 22 Jun 2013)

  Changed paths:
    A libraries/StringCType.class.php
    A libraries/StringNativeType.class.php
    M libraries/parse_analyze.inc.php
    M libraries/sqlparser.lib.php
    M libraries/string.lib.php
    R libraries/string_type_ctype.lib.php
    R libraries/string_type_native.lib.php
    M pmd_general.php
    M po/ug.po
    M po/zh_TW.po
    M sql.php
    A test/libraries/PMA_StringMB_test.php
    A test/libraries/PMA_StringNative_test.php
    A test/libraries/PMA_string_test.php

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


  Commit: 6bb321670bbe5f5b086c4e021320894ff10e2c52
      https://github.com/phpmyadmin/phpmyadmin/commit/6bb321670bbe5f5b086c4e021320894ff10e2c52
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M libraries/build_html_for_db.lib.php
    M libraries/display_create_database.lib.php
    M libraries/server_common.lib.php
    A libraries/server_databases.lib.php
    M server_databases.php

  Log Message:
  -----------
  refactor of server_databases.php


  Commit: 5c7c5698a89ed13be518cd8c03f31b290c00669f
      https://github.com/phpmyadmin/phpmyadmin/commit/5c7c5698a89ed13be518cd8c03f31b290c00669f
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-23 (Sun, 23 Jun 2013)

  Changed paths:
    M libraries/DisplayResults.class.php
    M po/hi.po
    M po/zh_TW.po
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

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


  Commit: d33075352ecbbd9a884d89a13a4268d7103bcf40
      https://github.com/phpmyadmin/phpmyadmin/commit/d33075352ecbbd9a884d89a13a4268d7103bcf40
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M libraries/server_databases.lib.php

  Log Message:
  -----------
  split long function to small functions


  Commit: 2f8a74b737c821e742ed95c05ff4d79575a1c991
      https://github.com/phpmyadmin/phpmyadmin/commit/2f8a74b737c821e742ed95c05ff4d79575a1c991
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ChangeLog
    M db_tracking.php
    M doc/config.rst
    M doc/faq.rst
    R js/jquery/jquery-1.8.3.js
    A js/jquery/jquery-1.8.3.min.js
    R js/jquery/jquery-ui-1.9.2.custom.js
    A js/jquery/jquery-ui-1.9.2.custom.min.js
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/StringNativeType.class.php
    M libraries/Util.class.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/FormDisplay.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_create_table.lib.php
    M libraries/display_structure.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/server_bin_log.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    A libraries/tbl_relation.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
    R scripts/compress-js
    M scripts/create-release.sh
    M setup/index.php
    M sql.php
    M tbl_relation.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/plugin/transformations/Text_Plain_Append_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_Hex_test.php
    M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php
    A test/libraries/PMA_StringCType_test.php
    M test/libraries/PMA_StringMB_test.php
    A test/libraries/PMA_StringNativeType_test.php
    M test/libraries/PMA_StringNative_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_getIcon_test.php

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


  Commit: 1c6d98f1963e45c7f17585dcf06642a5aeedf2d2
      https://github.com/phpmyadmin/phpmyadmin/commit/1c6d98f1963e45c7f17585dcf06642a5aeedf2d2
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M libraries/server_databases.lib.php

  Log Message:
  -----------
  fix code style


  Commit: d807bf61d17255ae48f64cc04a9168635afef806
      https://github.com/phpmyadmin/phpmyadmin/commit/d807bf61d17255ae48f64cc04a9168635afef806
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M libraries/server_common.lib.php
    A libraries/server_engines.lib.php
    M po/cs.po
    M po/el.po
    M po/es.po
    M po/et.po
    M po/ko.po
    M po/sl.po
    M po/tr.po
    M po/zh_TW.po
    M server_engines.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    A test/test_data/phpmyadmin.mediawiki

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


  Commit: 2a32fd0b117ce2388186e67c0dad2a1b72f126b4
      https://github.com/phpmyadmin/phpmyadmin/commit/2a32fd0b117ce2388186e67c0dad2a1b72f126b4
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M libraries/server_common.lib.php
    M libraries/server_databases.lib.php

  Log Message:
  -----------
  refactor function names


  Commit: a35e214e2e12d075d9d5eeee6675eb7b032d43bf
      https://github.com/phpmyadmin/phpmyadmin/commit/a35e214e2e12d075d9d5eeee6675eb7b032d43bf
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M libraries/server_databases.lib.php

  Log Message:
  -----------
  change $cfg['PropertiesIconic'] to $cfg['TabsMode']


  Commit: 8340c3993dbc47d6a9fe1b46e0585b1ad1becb9f
      https://github.com/phpmyadmin/phpmyadmin/commit/8340c3993dbc47d6a9fe1b46e0585b1ad1becb9f
  Author: xmujay <xmujay at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M libraries/server_databases.lib.php

  Log Message:
  -----------
  change $cfg['TabsMode'] to $cfg['ActionLinksMode']


  Commit: 275b232b0f2f1ba669d77c2f37a489ad3f802611
      https://github.com/phpmyadmin/phpmyadmin/commit/275b232b0f2f1ba669d77c2f37a489ad3f802611
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M libraries/build_html_for_db.lib.php
    M libraries/display_create_database.lib.php
    M libraries/server_common.lib.php
    A libraries/server_databases.lib.php
    M server_databases.php

  Log Message:
  -----------
  Merge pull request #449 from xmujay/0616_server_replication

refactor of server_databases.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/20907cfe0479...275b232b0f2f


More information about the Git mailing list