Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e7cd2a11cd8767c1fb535918e12a0bcab40fd4f3
https://github.com/phpmyadmin/phpmyadmin/commit/e7cd2a11cd8767c1fb535918e12…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Changed paths:
M js/indexes.js
M libraries/tbl_columns_definition_form.inc.php
M libraries/tbl_columns_definition_form.lib.php
Log Message:
-----------
Add index dialog does not open on choosing index from create table page
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 8fa9f576fdfd748b3485322bd6dc27438511237a
https://github.com/phpmyadmin/phpmyadmin/commit/8fa9f576fdfd748b3485322bd6d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Changed paths:
M ChangeLog
A js/codemirror/addon/hint/show-hint.js
A js/codemirror/addon/hint/sql-hint.js
M js/console.js
M js/functions.js
M libraries/Console.class.php
M libraries/DisplayResults.class.php
M libraries/Header.class.php
M libraries/Util.class.php
M themes/pmahomme/css/codemirror.css.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7f99c14f5d41...8fa9f576fdfd
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 516f62561bb6d5551d0d9801ec4e0b48ed449e18
https://github.com/phpmyadmin/phpmyadmin/commit/516f62561bb6d5551d0d9801ec4…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-10-02 (Thu, 02 Oct 2014)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
M libraries/Util.class.php
Log Message:
-----------
bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 432790c0d9bf679c3a9f808acfffe54aefbef809
https://github.com/phpmyadmin/phpmyadmin/commit/432790c0d9bf679c3a9f808acff…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-10-04 (Sat, 04 Oct 2014)
Changed paths:
M ChangeLog
M README.rst
M db_designer.php
M doc/faq.rst
M js/ajax.js
M js/common.js
M js/config.js
M js/db_qbe.js
M js/db_structure.js
M js/functions.js
M js/gis_data_editor.js
R js/jquery/jquery.sprintf.js
M js/normalization.js
M js/pmd/move.js
M js/server_databases.js
M js/server_privileges.js
M js/server_status_monitor.js
M js/server_user_groups.js
A js/sprintf.js
M js/sql.js
M js/tbl_relation.js
M js/tbl_structure.js
M libraries/Header.class.php
M libraries/Table.class.php
M libraries/db_designer.lib.php
M libraries/display_change_password.lib.php
M libraries/display_import.lib.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/pmd_common.php
M libraries/server_privileges.lib.php
M libraries/server_user_groups.lib.php
M libraries/structure.lib.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/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.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/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/vls.po
M po/zh_CN.po
M po/zh_TW.po
M scripts/advisor2po
M server_privileges.php
Log Message:
-----------
Merge branch 'master' into Bug4537
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 13155b65a2fd735e39da18a5d5de11680cfefe19
https://github.com/phpmyadmin/phpmyadmin/commit/13155b65a2fd735e39da18a5d5d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Changed paths:
M ChangeLog
M db_designer.php
M db_operations.php
M index.php
M js/navigation.js
M js/pmd/move.js
M libraries/DisplayResults.class.php
M libraries/TableSearch.class.php
M libraries/Util.class.php
M libraries/display_create_database.lib.php
M libraries/insert_edit.lib.php
M libraries/mysql_charsets.lib.php
M libraries/operations.lib.php
M libraries/tbl_columns_definition_form.lib.php
M libraries/tbl_relation.lib.php
M po/ca.po
M tbl_change.php
M tbl_relation.php
M test/libraries/PMA_insert_edit_test.php
M test/libraries/PMA_mysql_charsets_test.php
M view_create.php
Log Message:
-----------
Merge branch 'master' into Bug4537
Conflicts:
ChangeLog
Commit: 2e05422b1af2301433b7424833a164b91c2bcce4
https://github.com/phpmyadmin/phpmyadmin/commit/2e05422b1af2301433b7424833a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
M libraries/Util.class.php
Log Message:
-----------
Merge pull request #1368 from madhuracj/Bug4537
bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0f6c46292e8...2e05422b1af2