[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d31e96: 4.1.1-dev

2013-12-18 Thread Marc Delisle
  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d31e966a43b31758cff708a068dded2d79e46118
  
https://github.com/phpmyadmin/phpmyadmin/commit/d31e966a43b31758cff708a068dded2d79e46118
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

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

  Log Message:
  ---
  4.1.1-dev

Signed-off-by: Marc Delisle 


  Commit: 274943c0c5979b8f789ad15e949c1c7ff0af7577
  
https://github.com/phpmyadmin/phpmyadmin/commit/274943c0c5979b8f789ad15e949c1c7ff0af7577
  Author: lakshit 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M libraries/sql.lib.php

  Log Message:
  ---
  Fixed bug 4154

Signed-off-by: lakshit 


  Commit: 6dccaa3b5bae9ec25363915fbf5ba00b1d5053ac
  
https://github.com/phpmyadmin/phpmyadmin/commit/6dccaa3b5bae9ec25363915fbf5ba00b1d5053ac
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M ChangeLog

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

Signed-off-by: Marc Delisle 


  Commit: 672075174479cfd272dd30ffae4bb3c97d3e1b1c
  
https://github.com/phpmyadmin/phpmyadmin/commit/672075174479cfd272dd30ffae4bb3c97d3e1b1c
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M libraries/sql.lib.php

  Log Message:
  ---
  Fix undefined variable

Signed-off-by: Marc Delisle 


  Commit: 709396337ba7b7b160f2b68286aea58b349b7d58
  
https://github.com/phpmyadmin/phpmyadmin/commit/709396337ba7b7b160f2b68286aea58b349b7d58
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M ChangeLog
M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  ---
  bug #4173 Transformations overview not reachable

Signed-off-by: Marc Delisle 


  Commit: f488cbbb863461b05ace5b73831a3942228cc0a6
  
https://github.com/phpmyadmin/phpmyadmin/commit/f488cbbb863461b05ace5b73831a3942228cc0a6
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  ---
  Remove test no longer correct

Signed-off-by: Marc Delisle 


  Commit: 4cbf408ed25ad1f1ea390715864efd09ebd6aaa9
  
https://github.com/phpmyadmin/phpmyadmin/commit/4cbf408ed25ad1f1ea390715864efd09ebd6aaa9
  Author: Michal Čihař 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M .travis.yml

  Log Message:
  ---
  Use $TRAVIS_BRANCH instead of hardcoding it


  Commit: b5210ba1428ebdc8728fd1a796442ec47ad49ac8
  
https://github.com/phpmyadmin/phpmyadmin/commit/b5210ba1428ebdc8728fd1a796442ec47ad49ac8
  Author: Gemorroj 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M libraries/replication_gui.lib.php

  Log Message:
  ---
  fix #4149

Signed-off-by: Marc Delisle 


  Commit: 0232003ad25ac29bb03d36befb92c54ebdbcea73
  
https://github.com/phpmyadmin/phpmyadmin/commit/0232003ad25ac29bb03d36befb92c54ebdbcea73
  Author: Gemorroj 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M libraries/replication_gui.lib.php

  Log Message:
  ---
  accept license

Signed-off-by: Gemorroj 


  Commit: 32234fb68e0b7e315a0f94999e4013c8ad721d51
  
https://github.com/phpmyadmin/phpmyadmin/commit/32234fb68e0b7e315a0f94999e4013c8ad721d51
  Author: Marc Delisle 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M ChangeLog

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


  Commit: c8ac4349319e3d6cffe5f469199099ccee5f154a
  
https://github.com/phpmyadmin/phpmyadmin/commit/c8ac4349319e3d6cffe5f469199099ccee5f154a
  Author: Marc Delisle 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M libraries/replication_gui.lib.php

  Log Message:
  ---
  Fix undefined variable

Signed-off-by: Marc Delisle 


  Commit: 7370133b86847f03224f3be2bdec34a86842ad9d
  
https://github.com/phpmyadmin/phpmyadmin/commit/7370133b86847f03224f3be2bdec34a86842ad9d
  Author: Raul Malea 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M po/ro.po

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

Currently translated at 57.3% (1572 of 2742)


  Commit: 73c6d64d9df61eb543525646262515de3b89db47
  
https://github.com/phpmyadmin/phpmyadmin/commit/73c6d64d9df61eb543525646262515de3b89db47
  Author: Weblate 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M ChangeLog
M libraries/replication_gui.lib.php

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


  Commit: 10ee896b033b5aea5822d71ccdd71ee607fa677b
  
https://github.com/phpmyadmin/phpmyadmin/commit/10ee896b033b5aea5822d71ccdd71ee607fa677b
  Author: Marc Delisle 
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/b...@latin.po
M po/

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d31e96: 4.1.1-dev

2013-12-08 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d31e966a43b31758cff708a068dded2d79e46118
  
https://github.com/phpmyadmin/phpmyadmin/commit/d31e966a43b31758cff708a068dded2d79e46118
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

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

  Log Message:
  ---
  4.1.1-dev

Signed-off-by: Marc Delisle 


  Commit: 971db6ef8b739ac290de5aaa6a5bcb81508d2541
  
https://github.com/phpmyadmin/phpmyadmin/commit/971db6ef8b739ac290de5aaa6a5bcb81508d2541
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Log Message:
  ---
  Merge commit 'd31e966'


  Commit: 8d1be739b0053424ebd7563eb6bc7eb4aace6bba
  
https://github.com/phpmyadmin/phpmyadmin/commit/8d1be739b0053424ebd7563eb6bc7eb4aace6bba
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Fix merge conflict

Signed-off-by: Marc Delisle 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/227445371734...8d1be739b005--
Sponsored by Intel(R) XDK 
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git


[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d31e96: 4.1.1-dev

2013-12-08 Thread Marc Delisle
  Branch: refs/heads/QA_4_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d31e966a43b31758cff708a068dded2d79e46118
  
https://github.com/phpmyadmin/phpmyadmin/commit/d31e966a43b31758cff708a068dded2d79e46118
  Author: Marc Delisle 
  Date:   2013-12-08 (Sun, 08 Dec 2013)

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

  Log Message:
  ---
  4.1.1-dev

Signed-off-by: Marc Delisle 


--
Sponsored by Intel(R) XDK 
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk___
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git