Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ee85be10838cd09f835f49ae46b6da21e747ed36
      
https://github.com/phpmyadmin/phpmyadmin/commit/ee85be10838cd09f835f49ae46b6da21e747ed36
  Author: Sevdimali İsa <sevdimaliisa...@mail.ru>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 41.2% (1143 of 2770)


  Commit: 3bf732cf9d6a0f0e6aee6c1d79122521899fdced
      
https://github.com/phpmyadmin/phpmyadmin/commit/3bf732cf9d6a0f0e6aee6c1d79122521899fdced
  Author: Weblate <nore...@weblate.org>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M ChangeLog

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


  Commit: 2819506bb098c7f1a15157152758b5fc34bf55a4
      
https://github.com/phpmyadmin/phpmyadmin/commit/2819506bb098c7f1a15157152758b5fc34bf55a4
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-01 (Tue, 01 Jul 2014)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Have single-sort url besides multi-sort for each column and make single-sort 
default on click

Signed-off-by: Atul Pratap Singh <atulpratapsing...@gmail.com>


  Commit: b756cc66de07aa5a6c6fff8a08687dd3d969eb2c
      
https://github.com/phpmyadmin/phpmyadmin/commit/b756cc66de07aa5a6c6fff8a08687dd3d969eb2c
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    R js/columndelete.js
    M js/makegrid.js
    M js/messages.php
    A js/multi_column_sort.js
    M sql.php

  Log Message:
  -----------
  update js for add/remove modify columns in multi sort

Signed-off-by: Atul Pratap Singh <atulpratapsing...@gmail.com>


  Commit: 5e96d8d5667e0a6d6f003dc472b23103776be775
      
https://github.com/phpmyadmin/phpmyadmin/commit/5e96d8d5667e0a6d6f003dc472b23103776be775
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M ChangeLog
    M po/az.po

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


  Commit: 18973db3c934737ac76ea9bd36bf167404f1b5a2
      
https://github.com/phpmyadmin/phpmyadmin/commit/18973db3c934737ac76ea9bd36bf167404f1b5a2
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog for 4482

Signed-off-by: Atul Pratap Singh <atulpratapsing...@gmail.com>


  Commit: a61bc86d2be39ff04d354372eeb01df30f84761d
      
https://github.com/phpmyadmin/phpmyadmin/commit/a61bc86d2be39ff04d354372eeb01df30f84761d
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M js/multi_column_sort.js

  Log Message:
  -----------
  Remove window.location.replace

Signed-off-by: Atul Pratap Singh <atulpratapsing...@gmail.com>


  Commit: 06f7a7b8a4eba66a00bba512f48268a399392b3d
      
https://github.com/phpmyadmin/phpmyadmin/commit/06f7a7b8a4eba66a00bba512f48268a399392b3d
  Author: Kristjan Räts <kristjanr...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2770 of 2770)


  Commit: b0507aab93412f57f57a2eb17a462a03fdbe6d25
      
https://github.com/phpmyadmin/phpmyadmin/commit/b0507aab93412f57f57a2eb17a462a03fdbe6d25
  Author: Lakshmanan M <send2laksh...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 31.0% (860 of 2770)


  Commit: 0dfa00374d87d49250c80ed92a6ee2b17c717cb6
      
https://github.com/phpmyadmin/phpmyadmin/commit/0dfa00374d87d49250c80ed92a6ee2b17c717cb6
  Author: Weblate <nore...@weblate.org>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M ChangeLog
    M js/multi_column_sort.js

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


  Commit: c2797570d171ccfe8bfdab5873c8306815441c01
      
https://github.com/phpmyadmin/phpmyadmin/commit/c2797570d171ccfe8bfdab5873c8306815441c01
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M js/multi_column_sort.js

  Log Message:
  -----------
  Fix js error on multisort

Signed-off-by: Atul Pratap Singh <atulpratapsing...@gmail.com>


  Commit: b228f74e7c24117d2d17ebf6ac8b653485c4763b
      
https://github.com/phpmyadmin/phpmyadmin/commit/b228f74e7c24117d2d17ebf6ac8b653485c4763b
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Log Message:
  -----------
  Merge commit '3bf732c'


  Commit: ab1d28fb79ad46ca9fa8c010b37d748c592cd75e
      
https://github.com/phpmyadmin/phpmyadmin/commit/ab1d28fb79ad46ca9fa8c010b37d748c592cd75e
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Merge commit '2819506'


  Commit: dc7bdf48c6f70fb15ece2ccdb54a7ad022cb8178
      
https://github.com/phpmyadmin/phpmyadmin/commit/dc7bdf48c6f70fb15ece2ccdb54a7ad022cb8178
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    R js/columndelete.js
    M js/makegrid.js
    M js/messages.php
    A js/multi_column_sort.js
    M sql.php

  Log Message:
  -----------
  Merge commit 'b756cc6'

Conflicts:
        js/makegrid.js
        js/multi_column_sort.js


  Commit: b46f11fe3afeace1a30d7c8e2733e8dd9c116022
      
https://github.com/phpmyadmin/phpmyadmin/commit/b46f11fe3afeace1a30d7c8e2733e8dd9c116022
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Log Message:
  -----------
  Merge commit '5e96d8d'


  Commit: f4b9d1f0aa1df7318442977506b10a2dcb21a888
      
https://github.com/phpmyadmin/phpmyadmin/commit/f4b9d1f0aa1df7318442977506b10a2dcb21a888
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit '18973db'


  Commit: d3e45578ff94de9aedd61c5e8bfe95df2f38f2db
      
https://github.com/phpmyadmin/phpmyadmin/commit/d3e45578ff94de9aedd61c5e8bfe95df2f38f2db
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Log Message:
  -----------
  Merge branch 'QA_4_2'


  Commit: a2fbf798eb3786505403a0f896592e031fc3f2e9
      
https://github.com/phpmyadmin/phpmyadmin/commit/a2fbf798eb3786505403a0f896592e031fc3f2e9
  Author: Atul Pratap Singh <atulpratapsing...@gmail.com>
  Date:   2014-07-02 (Wed, 02 Jul 2014)

  Changed paths:
    M db_operations.php
    M libraries/designer.lib.php
    M libraries/operations.lib.php
    M libraries/pmd_common.php
    R libraries/schema/User_Schema.class.php
    M pmd_general.php
    M po/et.po
    M po/ia.po
    M po/sl.po
    M po/ta.po
    M po/tr.po
    R schema_edit.php
    M schema_export.php
    R test/classes/schema/User_Schema_test.php
    M test/libraries/PMA_designer_test.php
    M test/libraries/PMA_operations_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/8e3034c930e2...a2fbf798eb37
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to