[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 089b38: bug fix #4298:ImportCSV options UI validation incl...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 089b382e22767468092b9dccc1cefef742a6b3a4
      https://github.com/phpmyadmin/phpmyadmin/commit/089b382e22767468092b9dccc1cefef742a6b3a4
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    M libraries/plugins/import/AbstractImportCsv.class.php

  Log Message:
  -----------
  bug fix #4298:ImportCSV options UI validation includes "Columns separated with" allows string while "Columns enclosed with" and "Columns escaped with" allow to enter just one character

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 65e24c0b0a5e8f367f919c58585c38c731e880fd
      https://github.com/phpmyadmin/phpmyadmin/commit/65e24c0b0a5e8f367f919c58585c38c731e880fd
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    M js/import.js
    M libraries/plugins/import/AbstractImportCsv.class.php

  Log Message:
  -----------
  bug fix #4298: added javascript allow just one character if first character is not escape character else allow two including escape character

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: d2dbe10b5ade45d81c69b009f640ee58795aa988
      https://github.com/phpmyadmin/phpmyadmin/commit/d2dbe10b5ade45d81c69b009f640ee58795aa988
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M js/import.js

  Log Message:
  -----------
  unbinding keyup event

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>


  Commit: 1c481a54ae646293edf6d418c8dd6981e9d5bad3
      https://github.com/phpmyadmin/phpmyadmin/commit/1c481a54ae646293edf6d418c8dd6981e9d5bad3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M js/import.js
    M libraries/plugins/import/AbstractImportCsv.class.php

  Log Message:
  -----------
  Merge pull request #966 from smita786/QA_4_1

bug fix #4298:ImportCSV options UI validation includes "Columns separate...


  Commit: 44cb913b406d33b7ad8594d6c54423fdfc504c5d
      https://github.com/phpmyadmin/phpmyadmin/commit/44cb913b406d33b7ad8594d6c54423fdfc504c5d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

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


  Commit: 8c795aede7b15af8c15d7e48286099d1933b7d67
      https://github.com/phpmyadmin/phpmyadmin/commit/8c795aede7b15af8c15d7e48286099d1933b7d67
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M libraries/plugins/import/AbstractImportCsv.class.php

  Log Message:
  -----------
  Merge commit '089b382'


  Commit: b50ed1aac482888c78080695c29c49f6ce9145ab
      https://github.com/phpmyadmin/phpmyadmin/commit/b50ed1aac482888c78080695c29c49f6ce9145ab
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M js/import.js
    M libraries/plugins/import/AbstractImportCsv.class.php

  Log Message:
  -----------
  Merge commit '65e24c0'


  Commit: 93db7fac2df399f6fff2761e18e34f2a8660eb07
      https://github.com/phpmyadmin/phpmyadmin/commit/93db7fac2df399f6fff2761e18e34f2a8660eb07
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M js/import.js

  Log Message:
  -----------
  Merge commit 'd2dbe10'


  Commit: 51a981c4b42c2d2ff303e91de618b707a28b284a
      https://github.com/phpmyadmin/phpmyadmin/commit/51a981c4b42c2d2ff303e91de618b707a28b284a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Log Message:
  -----------
  Merge commit '1c481a5'


  Commit: 17dea6dda90b5b596ffecb49ea5527e80fa56d13
      https://github.com/phpmyadmin/phpmyadmin/commit/17dea6dda90b5b596ffecb49ea5527e80fa56d13
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-02 (Sun, 02 Mar 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_1'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/872e4d039bd9...17dea6dda90b