Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ddc820c5f014eb65b0862ad0ee86a3995bee70ca
https://github.com/phpmyadmin/phpmyadmin/commit/ddc820c5f014eb65b0862ad0ee8…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M test/classes/schema/Dia_Relation_Schema_test.php
M test/classes/schema/Eps_Relation_Schema_test.php
M test/classes/schema/Pdf_Relation_Schema_test.php
M test/classes/schema/Svg_Relation_Schema_test.php
Log Message:
-----------
Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 761403517e3ace7e477eee0bae4288926774c526
https://github.com/phpmyadmin/phpmyadmin/commit/761403517e3ace7e477eee0bae4…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M js/ajax.js
M js/console.js
M js/functions.js
M js/messages.php
M js/navigation.js
M libraries/Console.class.php
M libraries/DatabaseInterface.class.php
M libraries/Footer.class.php
M libraries/Response.class.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/eo.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ky.po
M po/li.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/ne.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
M test/classes/PMA_Footer_test.php
M themes/original/css/common.css.php
M themes/original/css/printview.css
M themes/pmahomme/css/common.css.php
M themes/pmahomme/css/printview.css
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cac6955baebb...761403517e3a
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cac6955baebb679d602e1b95c893b4671323350d
https://github.com/phpmyadmin/phpmyadmin/commit/cac6955baebb679d602e1b95c89…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/eo.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ky.po
M po/li.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/ne.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
[CI skip]
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e524023def258a74240f98f139ff050aa57218d4
https://github.com/phpmyadmin/phpmyadmin/commit/e524023def258a74240f98f139f…
Author: Nisarg Jhaveri <nisargjhaveri(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M js/ajax.js
M js/console.js
M js/functions.js
M js/messages.php
M js/navigation.js
M libraries/Console.class.php
M libraries/DatabaseInterface.class.php
M libraries/Footer.class.php
M libraries/Response.class.php
M test/classes/PMA_Footer_test.php
M themes/original/css/common.css.php
M themes/original/css/printview.css
M themes/pmahomme/css/common.css.php
M themes/pmahomme/css/printview.css
Log Message:
-----------
SQL debugging in console
Signed-off-by: Nisarg Jhaveri <nisargjhaveri(a)gmail.com>
Commit: c852dcb228cdda71515c0706600ec21631e1425e
https://github.com/phpmyadmin/phpmyadmin/commit/c852dcb228cdda71515c0706600…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M js/ajax.js
M js/console.js
M js/functions.js
M js/messages.php
M js/navigation.js
M libraries/Console.class.php
M libraries/DatabaseInterface.class.php
M libraries/Footer.class.php
M libraries/Response.class.php
M test/classes/PMA_Footer_test.php
M themes/original/css/common.css.php
M themes/original/css/printview.css
M themes/pmahomme/css/common.css.php
M themes/pmahomme/css/printview.css
Log Message:
-----------
Merge pull request #1736 from nisargjhaveri/debug_console
[WIP] SQL debugging in console
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5eedd7b40b4e...c852dcb228cd
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 365d98d4c6b19f9289161bbd9471d9f0bf542c95
https://github.com/phpmyadmin/phpmyadmin/commit/365d98d4c6b19f9289161bbd947…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M libraries/plugins/SchemaPlugin.class.php
M libraries/plugins/schema/Export_Relation_Schema.class.php
M libraries/plugins/schema/SchemaDia.class.php
M libraries/plugins/schema/SchemaEps.class.php
M libraries/plugins/schema/SchemaPdf.class.php
M libraries/plugins/schema/SchemaSvg.class.php
M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
M schema_export.php
Log Message:
-----------
Revert "Remove unused parameter $db"
This reverts commit d862940cb397cd9e69bba4d356a2e6b7b12dc3ca.
Commit: 9c994c741dbfc6396ea7652edfaae4bed220f919
https://github.com/phpmyadmin/phpmyadmin/commit/9c994c741dbfc6396ea7652edfa…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
Log Message:
-----------
Use instance variable db rather than the GLOBAL value
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: e64ed2e8e4c9ad1a0be75d861334a4e0bfda2e6e
https://github.com/phpmyadmin/phpmyadmin/commit/e64ed2e8e4c9ad1a0be75d86133…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
M libraries/plugins/schema/dia/TableStatsDia.class.php
M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
M libraries/plugins/schema/eps/TableStatsEps.class.php
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
M libraries/plugins/schema/pdf/TableStatsPdf.class.php
M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
M libraries/plugins/schema/svg/TableStatsSvg.class.php
Log Message:
-----------
Pass instance variable db instead of GLOBALS db
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: e86112a487b28a8d75555aa39fcad6bd1b5259c0
https://github.com/phpmyadmin/phpmyadmin/commit/e86112a487b28a8d75555aa39fc…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
Log Message:
-----------
Remove more instances of GLOBALS['db'] usages
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 5d78f4ffc0ee5c08220972288661b1cdc84d3158
https://github.com/phpmyadmin/phpmyadmin/commit/5d78f4ffc0ee5c0822097228866…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-18 (Thu, 18 Jun 2015)
Changed paths:
M js/tbl_change.js
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7135013df935...5d78f4ffc0ee