[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4c0b0f: bug #4821 Timed-out import fails to restart when f...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4c0b0f9687cc03ac92bde7c92ed9b44dbae5ca92
      https://github.com/phpmyadmin/phpmyadmin/commit/4c0b0f9687cc03ac92bde7c92ed9b44dbae5ca92
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M ChangeLog
    M import.php
    M libraries/display_import.inc.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  bug #4821 Timed-out import fails to restart when file represented

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


  Commit: f6dd7c2cd41202ac6c7996f025b1b8488ebcb5b3
      https://github.com/phpmyadmin/phpmyadmin/commit/f6dd7c2cd41202ac6c7996f025b1b8488ebcb5b3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M import.php
    M libraries/display_import.inc.php

  Log Message:
  -----------
  Pass local_import_file

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


  Commit: e3735f951c9f5392b75139d0f317aef7547372fa
      https://github.com/phpmyadmin/phpmyadmin/commit/e3735f951c9f5392b75139d0f317aef7547372fa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M ChangeLog
    M import.php
    M libraries/display_import.inc.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Merge pull request #1619 from madhuracj/bug4821

bug #4821 Timed-out import fails to restart when file represented


  Commit: 5748507835f4dc26627df578ec8a5508b70fa626
      https://github.com/phpmyadmin/phpmyadmin/commit/5748507835f4dc26627df578ec8a5508b70fa626
  Author: Kyeong Su Shin <cdac1234 at gmail.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 81.9% (2486 of 3032 strings)

[CI skip]


  Commit: 0e221640db929d5392f52bd7614484e467ef0cf5
      https://github.com/phpmyadmin/phpmyadmin/commit/0e221640db929d5392f52bd7614484e467ef0cf5
  Author: Weblate <noreply at weblate.org>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M ChangeLog
    M import.php
    M libraries/display_import.inc.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4


  Commit: 0d94439eda08703880ea77fa43474b599c78a02b
      https://github.com/phpmyadmin/phpmyadmin/commit/0d94439eda08703880ea77fa43474b599c78a02b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Improve a message

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


  Commit: 9bd5780710a540a38be157c46a1a4c599d202137
      https://github.com/phpmyadmin/phpmyadmin/commit/9bd5780710a540a38be157c46a1a4c599d202137
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M po/ko.po

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


  Commit: d230d78bb2e0cc6ff13608f95a27f7be4d386e6c
      https://github.com/phpmyadmin/phpmyadmin/commit/d230d78bb2e0cc6ff13608f95a27f7be4d386e6c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M ChangeLog
    M import.php
    M libraries/display_import.inc.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Merge commit 'e3735f9'


  Commit: 88953b17728e99d0fbd454df17758d5f77c41f2a
      https://github.com/phpmyadmin/phpmyadmin/commit/88953b17728e99d0fbd454df17758d5f77c41f2a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Log Message:
  -----------
  Merge commit '0e22164'


  Commit: 3a0440b80f544aab93c661790787c758115d7a1d
      https://github.com/phpmyadmin/phpmyadmin/commit/3a0440b80f544aab93c661790787c758115d7a1d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Merge commit '0d94439'


  Commit: 729ca8a9ee0bdaf77552ee82ec0ad958d6a24de4
      https://github.com/phpmyadmin/phpmyadmin/commit/729ca8a9ee0bdaf77552ee82ec0ad958d6a24de4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Log Message:
  -----------
  Merge branch 'QA_4_4'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7e6e27100fb6...729ca8a9ee0b