[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c78b05: #BUG:4496 -- part 2 fix

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c78b05eeab9539001671e4bcf6ae284bfd3de160
      https://github.com/phpmyadmin/phpmyadmin/commit/c78b05eeab9539001671e4bcf6ae284bfd3de160
  Author: minhaz <minhazav at gmail.com>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  #BUG:4496 -- part 2 fix

Signed-off-by: A V Minhaz <minhazav at gmail.com>


  Commit: 6330df41758f6323b08d564720bd7d93c62ca370
      https://github.com/phpmyadmin/phpmyadmin/commit/6330df41758f6323b08d564720bd7d93c62ca370
  Author: minhaz <minhazav at gmail.com>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  #BUG4496 -- part 2, propagation bug fixed

Signed-off-by: A V Minhaz <minhazav at gmail.com>


  Commit: e7087eb698ad8b8a898b7634b80d6d02193328a5
      https://github.com/phpmyadmin/phpmyadmin/commit/e7087eb698ad8b8a898b7634b80d6d02193328a5
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  check dragged element is file or not

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 51ffa87647231e23e2456cf8005f9088690edf8a
      https://github.com/phpmyadmin/phpmyadmin/commit/51ffa87647231e23e2456cf8005f9088690edf8a
  Author: minhaz <minhazav at gmail.com>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  Merge pull request #1 from D-storm/drag-drop-import

check dragged element is file or not


  Commit: 7d2cfdf5738acd165f7b77722343a6dc3a29b3a0
      https://github.com/phpmyadmin/phpmyadmin/commit/7d2cfdf5738acd165f7b77722343a6dc3a29b3a0
  Author: minhaz <minhazav at gmail.com>
  Date:   2014-07-26 (Sat, 26 Jul 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  #Feature:1522 enhancement

 - User can close the upload status box, after uploading an invalid extension file, as suggested by D-Storm
 - minimize/maximise changed from -/- to -/+

Signed-off-by: A V Minhaz <minhazav at gmail.com>


  Commit: c125e5a8bc7b6e5c0052cde0de8c385ef731ab52
      https://github.com/phpmyadmin/phpmyadmin/commit/c125e5a8bc7b6e5c0052cde0de8c385ef731ab52
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-07-25 (Fri, 25 Jul 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  Merge pull request #1300 from mebjas/pma_drag&drop

#BUG:4496 -- part 2 fix


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/605381469f27...c125e5a8bc7b