[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d483b9: fixed bug #4257 Hide fractional seconds

[Marc Delisle]

  Branch: refs/heads/QA_4_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d483b9f03af05f646ee33f406e5a8bb1b5d13e0a
      https://github.com/phpmyadmin/phpmyadmin/commit/d483b9f03af05f646ee33f406e5a8bb1b5d13e0a
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M js/functions.js
    M js/jquery/jquery-ui-timepicker-addon.js
    M js/makegrid.js
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  fixed bug #4257 Hide fractional seconds

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: efa453a8a0603d1350c74656785fb17f0bc0fcd3
      https://github.com/phpmyadmin/phpmyadmin/commit/efa453a8a0603d1350c74656785fb17f0bc0fcd3
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  fixed bug #4257 Hide fractional seconds #2

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: fc4ad4b6acfbde357309a98dc9cdeedc08c626fe
      https://github.com/phpmyadmin/phpmyadmin/commit/fc4ad4b6acfbde357309a98dc9cdeedc08c626fe
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M js/jquery/jquery-ui-timepicker-addon.js

  Log Message:
  -----------
  fixed bug #4257 Hide fractional seconds #3

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: b93e4269985688eab4b8899347e4c3040d10d0ea
      https://github.com/phpmyadmin/phpmyadmin/commit/b93e4269985688eab4b8899347e4c3040d10d0ea
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M js/functions.js
    M libraries/Util.class.php
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  bug#4257 - fixed datetimepicker view of record edit page

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: 2f2dd3b548e769f2e65ab838cd5cca9fbb8c2561
      https://github.com/phpmyadmin/phpmyadmin/commit/2f2dd3b548e769f2e65ab838cd5cca9fbb8c2561
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  bug#4257 - refixed datetimepicker view of record edit page

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: 8cc01b38ae313d5f3e8576b1b4180e8ee1e92896
      https://github.com/phpmyadmin/phpmyadmin/commit/8cc01b38ae313d5f3e8576b1b4180e8ee1e92896
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M js/functions.js
    M libraries/DisplayResults.class.php
    M libraries/Util.class.php
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  bug#4257 - fixed test failures

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: 4616eb093ecd8b2f4a5fbb29f641a7f64fc238b4
      https://github.com/phpmyadmin/phpmyadmin/commit/4616eb093ecd8b2f4a5fbb29f641a7f64fc238b4
  Author: Viduranga Wijesooriya <vpowerrc at gmail.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  bug#4257 - readded something missed

Signed-off-by: Viduranga Wijesooriya <vpowerrc at gmail.com>


  Commit: 2bca34d2f8030ff5b0705ff63fa8a592650430c1
      https://github.com/phpmyadmin/phpmyadmin/commit/2bca34d2f8030ff5b0705ff63fa8a592650430c1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M js/functions.js
    M js/jquery/jquery-ui-timepicker-addon.js
    M js/makegrid.js
    M libraries/DisplayResults.class.php
    M libraries/Util.class.php
    M libraries/insert_edit.lib.php

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

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


  Commit: 03e61d4f510b4cb454f4858465a025c028520d71
      https://github.com/phpmyadmin/phpmyadmin/commit/03e61d4f510b4cb454f4858465a025c028520d71
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #4257

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7dfae03b90e...03e61d4f510b