[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a4183c: bug #3482113 [edit] Column '0' not changeable

Madhura Jayaratne madhura.cj at gmail.com
Sat Feb 18 10:54:55 CET 2012


  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a4183c6da2c5a604aff5ed155a29f0ed2ad8db1d
      https://github.com/phpmyadmin/phpmyadmin/commit/a4183c6da2c5a604aff5ed155a29f0ed2ad8db1d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M libraries/database_interface.lib.php

  Log Message:
  -----------
  bug #3482113 [edit] Column '0' not changeable


  Commit: 0d1407f178dcd8cf97de424b3611b51043f08377
      https://github.com/phpmyadmin/phpmyadmin/commit/0d1407f178dcd8cf97de424b3611b51043f08377
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M ChangeLog
  M libraries/Error.class.php
  M libraries/common.lib.php
  M libraries/import/xml.php

  Log Message:
  -----------
  bug #3486970 [import] Exception on XML import


  Commit: e14b73d23e20bd334e92180518ada71e6654f96d
      https://github.com/phpmyadmin/phpmyadmin/commit/e14b73d23e20bd334e92180518ada71e6654f96d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M ChangeLog
  M libraries/Error.class.php
  M libraries/common.lib.php
  M libraries/import/xml.php

  Log Message:
  -----------
  Merge branch 'QA_3_4' into QA_3_5

Conflicts:
	libraries/common.lib.php


  Commit: 48cbfe14efe6716ba01f447cc4bb25c5f1b7acdd
      https://github.com/phpmyadmin/phpmyadmin/commit/48cbfe14efe6716ba01f447cc4bb25c5f1b7acdd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M libraries/data_drizzle.inc.php
  M libraries/database_interface.lib.php
  M po/id.po
  M po/ja.po
  M po/ko.po
  M po/nl.po

  Log Message:
  -----------
  Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/277045b...48cbfe1


More information about the Git mailing list