Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8676b5cc56f90e89c18acee86361dbd95c130a3b
      
https://github.com/phpmyadmin/phpmyadmin/commit/8676b5cc56f90e89c18acee86361dbd95c130a3b
  Author: Yungu Kim <crimso...@gmail.com>
  Date:   2014-01-26 (Sun, 26 Jan 2014)

  Changed paths:
    M po/ko.po

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

Currently translated at 72.5% (1995 of 2749)


  Commit: ea708974c78b39b138198986a2f9674e09ac0117
      
https://github.com/phpmyadmin/phpmyadmin/commit/ea708974c78b39b138198986a2f9674e09ac0117
  Author: Eduardo Abreu <eduardextr...@hotmail.com>
  Date:   2014-01-26 (Sun, 26 Jan 2014)

  Changed paths:
    M po/pt.po

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

Currently translated at 61.0% (1679 of 2749)


  Commit: 24cc797e5071626a30b0f485b6b8f296132fcd42
      
https://github.com/phpmyadmin/phpmyadmin/commit/24cc797e5071626a30b0f485b6b8f296132fcd42
  Author: Weblate <nore...@weblate.org>
  Date:   2014-01-26 (Sun, 26 Jan 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

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


  Commit: e8fa9e533565eb2503586ce7040236a928a50de2
      
https://github.com/phpmyadmin/phpmyadmin/commit/e8fa9e533565eb2503586ce7040236a928a50de2
  Author: Sampath Liyanage <plb...@gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  bug 4245 fix with minimum changes

Signed-off-by: Sampath Liyanage <plb...@gmail.com>


  Commit: ea0ad9d41c1726a573d6c0beeba7eec5cfa147c7
      
https://github.com/phpmyadmin/phpmyadmin/commit/ea0ad9d41c1726a573d6c0beeba7eec5cfa147c7
  Author: Sampath Liyanage <plb...@gmail.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  unit tests updated. Some global variables were set in setup functions of some 
test files. one testing function with mockobjects was changed from once() to 
exactly(2) because the bug fix has made that function calls twice

Signed-off-by: Sampath Liyanage <plb...@gmail.com>


  Commit: c357b1b4aa8508462d7f5e541704deb4f5de5bfc
      
https://github.com/phpmyadmin/phpmyadmin/commit/c357b1b4aa8508462d7f5e541704deb4f5de5bfc
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge pull request #878 from sampathLiyanage/bugfix4245

Bug fix (#4245) - initial "Browse" query does not match sorting order


  Commit: 9ec1d29a41ec06d6a2cea8b1f69df0c60ac3ac4a
      
https://github.com/phpmyadmin/phpmyadmin/commit/9ec1d29a41ec06d6a2cea8b1f69df0c60ac3ac4a
  Author: Dadan Setia <da2...@yahoo.co.id>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M po/id.po

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

Currently translated at 80.0% (2200 of 2749)


  Commit: de5637139f71dc834832f7cb45030bd0241e1505
      
https://github.com/phpmyadmin/phpmyadmin/commit/de5637139f71dc834832f7cb45030bd0241e1505
  Author: Weblate <nore...@weblate.org>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

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


  Commit: e3cdf91e225e31d83afbb18e997b92ad7176359b
      
https://github.com/phpmyadmin/phpmyadmin/commit/e3cdf91e225e31d83afbb18e997b92ad7176359b
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ChangeLog

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 185f16e36e99af4a9db5f4e502532b141d9b4b06
      
https://github.com/phpmyadmin/phpmyadmin/commit/185f16e36e99af4a9db5f4e502532b141d9b4b06
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M po/id.po

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


  Commit: 9c6a5a6e09dc3a665cd67e8d2e7e3ddafe8eaf49
      
https://github.com/phpmyadmin/phpmyadmin/commit/9c6a5a6e09dc3a665cd67e8d2e7e3ddafe8eaf49
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Log Message:
  -----------
  Merge commit '24cc797'


  Commit: 8ba45481469df55626d7b44eebe823ed22cf881d
      
https://github.com/phpmyadmin/phpmyadmin/commit/8ba45481469df55626d7b44eebe823ed22cf881d
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M libraries/Util.class.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge commit 'e8fa9e5'


  Commit: 2a2d4cd2bb5f157601286cae7909b626a9a81d15
      
https://github.com/phpmyadmin/phpmyadmin/commit/2a2d4cd2bb5f157601286cae7909b626a9a81d15
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M test/classes/PMA_Header_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_privileges_test.php

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 08b19ae088e7cc43088d893118ba84d233cf2c4d
      
https://github.com/phpmyadmin/phpmyadmin/commit/08b19ae088e7cc43088d893118ba84d233cf2c4d
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Log Message:
  -----------
  Merge commit 'c357b1b'


  Commit: ce84e3aae36ec8aa532f9da44d3320b2e380c1cc
      
https://github.com/phpmyadmin/phpmyadmin/commit/ce84e3aae36ec8aa532f9da44d3320b2e380c1cc
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Log Message:
  -----------
  Merge commit 'de56371'


  Commit: ae4a7ad57eb39fba5b990a60343ca8f9dda7d4d4
      
https://github.com/phpmyadmin/phpmyadmin/commit/ae4a7ad57eb39fba5b990a60343ca8f9dda7d4d4
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit 'e3cdf91'


  Commit: d948ff1ce6d872e009216d4b071bbdf6bffc991f
      
https://github.com/phpmyadmin/phpmyadmin/commit/d948ff1ce6d872e009216d4b071bbdf6bffc991f
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Log Message:
  -----------
  Merge commit '185f16e'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/fefb9b815c3d...d948ff1ce6d8
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to