Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 155924968844eaa1776f2463fc77c942d8e10f38 https://github.com/phpmyadmin/phpmyadmin/commit/155924968844eaa1776f2463fc77... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths: M tbl_select.php
Log Message: ----------- Fix undefined variable warnings
Commit: 5c83a56512fe0db8128cafcfb5f24ccd4cfc1395 https://github.com/phpmyadmin/phpmyadmin/commit/5c83a56512fe0db8128cafcfb5f2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths: M libraries/TableSearch.class.php
Log Message: ----------- Merge branch 'QA_3_5'
Conflicts: tbl_select.php
Commit: 95860024e5c3a7a3cc71713e250ceea02c63664e https://github.com/phpmyadmin/phpmyadmin/commit/95860024e5c3a7a3cc71713e250c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths: M libraries/TableSearch.class.php
Log Message: ----------- Simplify the code
Commit: 03982728868e514d5bfc9acac4cdff1053d60cd9 https://github.com/phpmyadmin/phpmyadmin/commit/03982728868e514d5bfc9acac4cd... Author: Israel Torres israeltorres29@hotmail.com Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate.
Commit: eb0b010b37f46219086166661aa36b83d6e7e26a https://github.com/phpmyadmin/phpmyadmin/commit/eb0b010b37f46219086166661aa3... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate.
Commit: 3b62a6387dc1f6eaa3c1f15896367c2176cdf5fb https://github.com/phpmyadmin/phpmyadmin/commit/3b62a6387dc1f6eaa3c1f1589636... Author: Weblate noreply@weblate.org Date: 2012-11-01 (Thu, 01 Nov 2012)
Changed paths: M tbl_export.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
Commit: 3fef7c794d4229cd15be04e3b80c39d2d3a94e90 https://github.com/phpmyadmin/phpmyadmin/commit/3fef7c794d4229cd15be04e3b80c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-11-02 (Fri, 02 Nov 2012)
Changed paths: M po/lv.po M po/pt.po M po/pt_BR.po M po/si.po M po/sl.po M po/te.po M po/tr.po M tbl_export.php
Log Message: ----------- Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
Commit: 8ffd8494017bd8c6eac7248e4ef5296cb8374c4b https://github.com/phpmyadmin/phpmyadmin/commit/8ffd8494017bd8c6eac7248e4ef5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-11-02 (Fri, 02 Nov 2012)
Changed paths: M ChangeLog M Documentation.html M js/ajax.js M js/functions.js M js/messages.php M js/navigation.js M js/tbl_zoom_plot_jqplot.js M libraries/DisplayResults.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Response.class.php M libraries/config/messages.inc.php M libraries/core.lib.php M libraries/database_interface.lib.php M libraries/insert_edit.lib.php M libraries/navigation/Nodes/Node_Column_Container.class.php M libraries/navigation/Nodes/Node_Event_Container.class.php M libraries/navigation/Nodes/Node_Function_Container.class.php M libraries/navigation/Nodes/Node_Index_Container.class.php M libraries/navigation/Nodes/Node_Procedure_Container.class.php M libraries/navigation/Nodes/Node_Table_Container.class.php M libraries/navigation/Nodes/Node_Trigger_Container.class.php M libraries/navigation/Nodes/Node_View_Container.class.php M libraries/plugins/auth/swekey/swekey.auth.lib.php M libraries/rte/rte_footer.lib.php M libraries/server_privileges.lib.php M libraries/tbl_properties.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 scripts/update-po M server_status.php M tbl_export.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Theme_test.php M test/libraries/PMA_build_html_for_db_test.php M themes/.gitignore
Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Commit: 6ab74e8790c9ad99f03a079898df642dff935290 https://github.com/phpmyadmin/phpmyadmin/commit/6ab74e8790c9ad99f03a079898df... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-11-02 (Fri, 02 Nov 2012)
Changed paths: M po/pt_BR.po
Log Message: ----------- Merge branch 'QA_3_5'
Conflicts: po/tr.po
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4f50bdbebe7c...6ab74e8790c9