[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 785123: bug #4705 Table structure: adding primary key does...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 785123b6437bafdcaf0405e9d7db290de7676560
      https://github.com/phpmyadmin/phpmyadmin/commit/785123b6437bafdcaf0405e9d7db290de7676560
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ChangeLog
    M js/tbl_structure.js
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M tbl_structure.php

  Log Message:
  -----------
  bug #4705 Table structure: adding primary key doesn't refresh page

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: b28bb3ec3ea00bfadbf115dff96411cd64ffcbd0
      https://github.com/phpmyadmin/phpmyadmin/commit/b28bb3ec3ea00bfadbf115dff96411cd64ffcbd0
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M tbl_structure.php

  Log Message:
  -----------
  Reload navigation after adding indexes

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 737e51eeb033d4fea18f0f657bbc78d98d30aba8
      https://github.com/phpmyadmin/phpmyadmin/commit/737e51eeb033d4fea18f0f657bbc78d98d30aba8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M js/tbl_structure.js

  Log Message:
  -----------
  Fix typo

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 205e4175e5679dff47825fec6db7d7ada22610ca
      https://github.com/phpmyadmin/phpmyadmin/commit/205e4175e5679dff47825fec6db7d7ada22610ca
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ChangeLog
    M js/tbl_structure.js
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M tbl_structure.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d7d15040aa81...205e4175e567