[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 25c227: complete patch for #4279 ctrl +up/down + ff issue

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 25c227ac04d129f3c4746dd480aa1c0f742985cf
      https://github.com/phpmyadmin/phpmyadmin/commit/25c227ac04d129f3c4746dd480aa1c0f742985cf
  Author: Aayush <aayushism12 at gmail.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M js/keyhandler.js

  Log Message:
  -----------
  complete patch for #4279 ctrl +up/down + ff issue 

Signed-off-by: Aayush Anand aayushism12 at gmail.com


  Commit: e8315404e02e67dce96e3f20a80c25144ed853a6
      https://github.com/phpmyadmin/phpmyadmin/commit/e8315404e02e67dce96e3f20a80c25144ed853a6
  Author: Aayush <aayushism12 at gmail.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M js/keyhandler.js

  Log Message:
  -----------
  #4279 ctrl+up/down for all ff

Signed-off-by: Aayush Anand <aayushism12 at gmail.com>


  Commit: d131cda6cb0cc16883fd4d55dfc3261d9d8e05f8
      https://github.com/phpmyadmin/phpmyadmin/commit/d131cda6cb0cc16883fd4d55dfc3261d9d8e05f8
  Author: Aayush <aayushism12 at gmail.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M js/keyhandler.js

  Log Message:
  -----------
  complete patch for #4279 ctrl +up/down final

Signed-off-by: Aayush Anand <aayushism12 at gmail.com>


  Commit: 7da28dbec1d6f939f9c1168b12b9cba08ecfdd38
      https://github.com/phpmyadmin/phpmyadmin/commit/7da28dbec1d6f939f9c1168b12b9cba08ecfdd38
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M js/keyhandler.js

  Log Message:
  -----------
  Merge pull request #1100 from whitepiegon/QA_4_1_b3

complete patch for #4279 ctrl +up/down + ff issue


  Commit: 9b72244b65cb44a7da47a07fe08a63567394193f
      https://github.com/phpmyadmin/phpmyadmin/commit/9b72244b65cb44a7da47a07fe08a63567394193f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: 66f95ce4dce1bbfb5c699d825204ccfbbd4a6d36
      https://github.com/phpmyadmin/phpmyadmin/commit/66f95ce4dce1bbfb5c699d825204ccfbbd4a6d36
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M po/cy.po

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

Currently translated at 23.5% (648 of 2750)


  Commit: 952a24a50832f9f900ecd5ac372940a7d4157e8a
      https://github.com/phpmyadmin/phpmyadmin/commit/952a24a50832f9f900ecd5ac372940a7d4157e8a
  Author: Weblate <noreply at weblate.org>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M ChangeLog

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


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

  Changed paths:
    M js/keyhandler.js

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

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


  Commit: 99904dcf6f9e3da119c029de68c9d37c3a817f7d
      https://github.com/phpmyadmin/phpmyadmin/commit/99904dcf6f9e3da119c029de68c9d37c3a817f7d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Log Message:
  -----------
  Merge commit '7da28db'


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit '9b72244'


  Commit: 1416d33bf569d763a36400822c555b82802bad6d
      https://github.com/phpmyadmin/phpmyadmin/commit/1416d33bf569d763a36400822c555b82802bad6d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Log Message:
  -----------
  Merge commit '952a24a'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2eae8cc4b699...1416d33bf569