24 May
2013
24 May
'13
4:02 p.m.
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4d79fabac30983fcde843230aa77fbd32b29cfcd
https://github.com/phpmyadmin/phpmyadmin/commit/4d79fabac30983fcde843230aa7…
Author: Brad Jorgensen <brad.gnugget(a)gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M ChangeLog
M js/functions.js
M js/sql.js
M libraries/sql.lib.php
M sql.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
implementation of feature request #1363
Commit: c56e42bc2205d5c882986c14e736252f90fe5336
https://github.com/phpmyadmin/phpmyadmin/commit/c56e42bc2205d5c882986c14e73…
Author: Brad Jorgensen <brad.gnugget(a)gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M js/sql.js
Log Message:
-----------
typo fix
Commit: 5ba39c172a632a1f869aa818010cfb011b388ac3
https://github.com/phpmyadmin/phpmyadmin/commit/5ba39c172a632a1f869aa818010…
Author: Brad Jorgensen <brad.gnugget(a)gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
Changed paths:
M ChangeLog
M doc/config.rst
M doc/faq.rst
M libraries/DisplayResults.class.php
M libraries/Table.class.php
M libraries/Util.class.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
A libraries/create_addfield.lib.php
M libraries/plugins/export/ExportPhparray.class.php
M libraries/server_privileges.lib.php
M libraries/sql.lib.php
M po/zh_CN.po
M sql.php
M tbl_addfield.php
M tbl_change.php
M tbl_create.php
M test/classes/PMA_Index_test.php
M test/libraries/common/PMA_getIcon_test.php
M version_check.php
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin.git into
profiler3
Commit: d71478f56f66b50063b1cc6421619c9d7ca975cf
https://github.com/phpmyadmin/phpmyadmin/commit/d71478f56f66b50063b1cc64216…
Author: Brad Jorgensen <brad.gnugget(a)gmail.com>
Date: 2013-05-20 (Mon, 20 May 2013)
Changed paths:
M libraries/sql.lib.php
Log Message:
-----------
table title updates
Commit: be31655c389d66e55fe39578a238d9be9eaa8503
https://github.com/phpmyadmin/phpmyadmin/commit/be31655c389d66e55fe39578a23…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-05-24 (Fri, 24 May 2013)
Changed paths:
M ChangeLog
M js/functions.js
M js/sql.js
M libraries/sql.lib.php
M sql.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Fix merge conflicts
Commit: 9ce77e21b2316dc1cc4672394c9e51318279be14
https://github.com/phpmyadmin/phpmyadmin/commit/9ce77e21b2316dc1cc4672394c9…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-05-24 (Fri, 24 May 2013)
Changed paths:
M libraries/sql.lib.php
Log Message:
-----------
Localize strings
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/73a55847945e...9ce77e21b231