Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0cc8121846d3f424182ecceca3d1d7ac4875d900 https://github.com/phpmyadmin/phpmyadmin/commit/0cc8121846d3f424182ecceca3d1... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M js/makegrid.js M tbl_replace.php

Log Message: ----------- Extend support for inline edit, smallint fields

Commit: 9633fafbdfd631b42f62554d3b08d4bb513803df https://github.com/phpmyadmin/phpmyadmin/commit/9633fafbdfd631b42f62554d3b08... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M js/makegrid.js M tbl_replace.php

Log Message: ----------- Merge branch 'QA_3_5'

Commit: bd0b51bc172e3e6082dd1d4edee0bebb3d156961 https://github.com/phpmyadmin/phpmyadmin/commit/bd0b51bc172e3e6082dd1d4edee0... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M tbl_replace.php

Log Message: ----------- Change the way of calling backquote function

Commit: 80d0287dbd9a32930b50c47e4c29cb9653b7bf7d https://github.com/phpmyadmin/phpmyadmin/commit/80d0287dbd9a32930b50c47e4c29... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M ChangeLog M db_tracking.php M doc/config.rst M index.php M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js R js/jquery/jquery.event.drag-2.0.js A js/jquery/jquery.event.drag-2.2.js R js/jquery/jquery.json-2.2.js A js/jquery/jquery.json-2.4.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/sql.js M js/tbl_select.js M js/tbl_structure.js M libraries/DbSearch.class.php M libraries/DisplayResults.class.php M libraries/Header.class.php M libraries/Index.class.php M libraries/TableSearch.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/db_info.inc.php M libraries/display_change_password.lib.php M libraries/display_create_database.lib.php M libraries/display_import.lib.php M libraries/navigation/NodeFactory.class.php M libraries/operations.lib.php M libraries/rte/rte_main.inc.php M libraries/server_privileges.lib.php M libraries/sql_query_form.lib.php M libraries/structure.lib.php M libraries/tbl_columns_definition_form.inc.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.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/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@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@latin.po M po/zh_CN.po M po/zh_TW.po M server_databases.php M server_privileges.php M server_status_monitor.php M setup/index.php M sql.php M tbl_indexes.php M tbl_structure.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php A test/classes/navigation/PMA_NodeFactory_test.php A test/classes/navigation/PMA_Node_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_transformation_test.php

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 949aa86cbf4863b0e5d5df2994403b5a5275104d https://github.com/phpmyadmin/phpmyadmin/commit/949aa86cbf4863b0e5d5df299440... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M js/db_operations.js M js/navigation.js

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 1ae30d2ba79d68b6f7a6029d901788c6b358f485 https://github.com/phpmyadmin/phpmyadmin/commit/1ae30d2ba79d68b6f7a6029d9017... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M libraries/insert_edit.lib.php M tbl_replace.php

Log Message: ----------- Move hasPrimaryKeyOrUniqueKey function to insert_edit.lib.php file

Commit: b16a6afeb6779fcf5013213b95ecfc9b778666c8 https://github.com/phpmyadmin/phpmyadmin/commit/b16a6afeb6779fcf5013213b95ec... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M js/makegrid.js M tbl_replace.php

Log Message: ----------- Introduce new function for check truncatable values

Commit: baac672144b73df606b2604c0bcc044912335753 https://github.com/phpmyadmin/phpmyadmin/commit/baac672144b73df606b2604c0bcc... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M js/makegrid.js M libraries/insert_edit.lib.php M tbl_replace.php

Log Message: ----------- Resolve conflicts

Commit: 1c7d0b0fc114e0b2e6498f9fa728893154c520c2 https://github.com/phpmyadmin/phpmyadmin/commit/1c7d0b0fc114e0b2e6498f9fa728... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-23 (Sun, 23 Dec 2012)

Changed paths: M test/classes/PMA_Scripts_test.php

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 7099facbcb699facdb772194815f22d024b17faf https://github.com/phpmyadmin/phpmyadmin/commit/7099facbcb699facdb772194815f... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-28 (Fri, 28 Dec 2012)

Changed paths: M ChangeLog M doc/config.rst M doc/glossary.rst M js/common.js M js/functions.js M libraries/Table.class.php M libraries/ip_allow_deny.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.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/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@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@latin.po M po/zh_CN.po M po/zh_TW.po

Log Message: ----------- Merge remote branch 'upstream/master'

Commit: 5de29afc71278b8828ba3e3874188725f33da15f https://github.com/phpmyadmin/phpmyadmin/commit/5de29afc71278b8828ba3e387418... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-12-28 (Fri, 28 Dec 2012)

Changed paths: M js/makegrid.js M libraries/insert_edit.lib.php M tbl_replace.php

Log Message: ----------- Merge pull request #124 from Chanaka/master

Extend support for inline edit, for smallint fields

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7feced10005...5de29afc7127