- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 450dc2: 4.4.6-dev
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 450dc28aed6b32252fc62f7674193936c5c51eb7 https://github.com/phpmyadmin/phpmyadmin/commit/450dc28aed6b32252fc62f76741… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-05 (Tue, 05 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.6-dev Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 069a2a09e73469315857d0a622ae1af6f1afb5f2 https://github.com/phpmyadmin/phpmyadmin/commit/069a2a09e73469315857d0a622a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-05 (Tue, 05 May 2015) Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: d3338edf87246f868b72a02239a746437e2aeacf https://github.com/phpmyadmin/phpmyadmin/commit/d3338edf87246f868b72a02239a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-05 (Tue, 05 May 2015) Changed paths: M libraries/browse_foreigners.lib.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_browse_foreigners_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 65277b2ebb869f96583d1b3eedfbc4b112a9ff4f https://github.com/phpmyadmin/phpmyadmin/commit/65277b2ebb869f96583d1b3eedf… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-05 (Tue, 05 May 2015) Changed paths: M libraries/insert_edit.lib.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 1a9c45734f6ce30748e9e99373e2c95432361a81 https://github.com/phpmyadmin/phpmyadmin/commit/1a9c45734f6ce30748e9e99373e… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2015-05-05 (Tue, 05 May 2015) Changed paths: M libraries/config/messages.inc.php Log Message: ----------- Bug 4876: Improve language for navigation separator in setup script/Settings tab Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: e6105f7e5ceda88ae7b0391b83aadfdce77f8864 https://github.com/phpmyadmin/phpmyadmin/commit/e6105f7e5ceda88ae7b0391b83a… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2015-05-05 (Tue, 05 May 2015) Changed paths: M doc/Makefile Log Message: ----------- Bug 4884: make clean removes all documentation files Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: fe293f8e1bd61615412c8cf2f252ccd5197e7f15 https://github.com/phpmyadmin/phpmyadmin/commit/fe293f8e1bd61615412c8cf2f25… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-05 (Tue, 05 May 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> Commit: dacca215e87f64b5bfa04a26fed28cdb3aca1234 https://github.com/phpmyadmin/phpmyadmin/commit/dacca215e87f64b5bfa04a26fed… Author: Παναγιώτης Παπάζογλου <papaz_p(a)yahoo.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: 28c1bcc11a12a3373dc48fca4d7885b7eb017511 https://github.com/phpmyadmin/phpmyadmin/commit/28c1bcc11a12a3373dc48fca4d7… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 99.8% (3029 of 3035 strings) [CI skip] Commit: 4026d947bf9e416912a176beaf583937961f2dce https://github.com/phpmyadmin/phpmyadmin/commit/4026d947bf9e416912a176beaf5… Author: Weblate <noreply(a)weblate.org> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M ChangeLog M js/error_report.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 Commit: 44668d051a0274dcaaf10d7e07e52474f4f74106 https://github.com/phpmyadmin/phpmyadmin/commit/44668d051a0274dcaaf10d7e07e… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M ChangeLog M js/error_report.js Log Message: ----------- bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: aa060d37188c28cfefe2ebb9da0a3a1b779b987b https://github.com/phpmyadmin/phpmyadmin/commit/aa060d37188c28cfefe2ebb9da0… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: 134380587dacf6c8129ae15e18a2d99c010cd1a5 https://github.com/phpmyadmin/phpmyadmin/commit/134380587dacf6c8129ae15e18a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: 8a5824968aaa9d4430c8567eeb95b6d93c020543 https://github.com/phpmyadmin/phpmyadmin/commit/8a5824968aaa9d4430c8567eeb9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M test/libraries/PMA_normalization_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: e68fdc2e9a059e01e0a132fad16f64210088fcac https://github.com/phpmyadmin/phpmyadmin/commit/e68fdc2e9a059e01e0a132fad16… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 69.2% (2103 of 3035 strings) [CI skip] Commit: 5b7f12a6528baf7cef58ae94b787dbaa6cf99db6 https://github.com/phpmyadmin/phpmyadmin/commit/5b7f12a6528baf7cef58ae94b78… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: 71a2975f5f0377711438b85a4a2efa3b0e527939 https://github.com/phpmyadmin/phpmyadmin/commit/71a2975f5f0377711438b85a4a2… Author: Weblate <noreply(a)weblate.org> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M test/libraries/PMA_normalization_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 Commit: 555bbd057ef9bce2fddba9ad7fdbc50b8a373c76 https://github.com/phpmyadmin/phpmyadmin/commit/555bbd057ef9bce2fddba9ad7fd… Author: Balázs Úr <urbalazs(a)gmail.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/hu.po Log Message: ----------- Translated using Weblate (Hungarian) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: 6dfd1c135c25245de22b79549f7ad1cf7d0715d8 https://github.com/phpmyadmin/phpmyadmin/commit/6dfd1c135c25245de22b79549f7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 84e7513bf89638c60754e63608d271d8f21ad824 https://github.com/phpmyadmin/phpmyadmin/commit/84e7513bf89638c60754e63608d… Author: dingo thirteen <dingo13(a)gmail.com> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] Commit: 3e5eb604c6a2f69790b8ebffe70d7982f5de6b58 https://github.com/phpmyadmin/phpmyadmin/commit/3e5eb604c6a2f69790b8ebffe70… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-06 (Wed, 06 May 2015) Changed paths: M test/libraries/PMA_user_preferences_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 1e6750cbc9e91645407f7e4b4dd0e4187202b38d https://github.com/phpmyadmin/phpmyadmin/commit/1e6750cbc9e91645407f7e4b4dd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/DisplayResults.class.php Log Message: ----------- bug #4892 Undefined variable: unique_conditions Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: f7716754f4a045c82147b67058b55171ef75e1c0 https://github.com/phpmyadmin/phpmyadmin/commit/f7716754f4a045c82147b67058b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M po/fr.po M po/hu.po M po/ia.po M po/nl.po M po/tr.po M test/libraries/PMA_normalization_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 Commit: 1663995c59bb989b43f7b91736c147abd6358fa2 https://github.com/phpmyadmin/phpmyadmin/commit/1663995c59bb989b43f7b91736c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- bug #4891 CSV Import ignores "Replace table data with file" checkbox Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: a0d89755448e3ff4e3a34fa0ef1405593fe7ac24 https://github.com/phpmyadmin/phpmyadmin/commit/a0d89755448e3ff4e3a34fa0ef1… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge pull request #1663 from madhuracj/bug4891 bug #4891 CSV Import ignores "Replace table data with file" checkbox Commit: 9306a93bec4179230d989e3331402b9b6526272f https://github.com/phpmyadmin/phpmyadmin/commit/9306a93bec4179230d989e33314… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 53677b8e250e98bc5310097cbbbe6c9a49b77a5f https://github.com/phpmyadmin/phpmyadmin/commit/53677b8e250e98bc5310097cbbb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 Commit: 504b80adbf7a2c614b92dbe467dcc91198f7a45a https://github.com/phpmyadmin/phpmyadmin/commit/504b80adbf7a2c614b92dbe467d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: dba2af651a53d5037296a1dc827081a94ef1062c https://github.com/phpmyadmin/phpmyadmin/commit/dba2af651a53d5037296a1dc827… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.6 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: ef30025a0f92602499ae41a7cb10a1c103c258b1 https://github.com/phpmyadmin/phpmyadmin/commit/ef30025a0f92602499ae41a7cb1… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/Makefile M doc/conf.py M js/error_report.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/browse_foreigners.lib.php M libraries/config/messages.inc.php M libraries/insert_edit.lib.php M libraries/plugins/import/AbstractImportCsv.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/bootstrap-dist.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php M test/libraries/PMA_FormDisplay_tpl_test.php M test/libraries/PMA_browse_foreigners_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_normalization_test.php M test/libraries/PMA_server_privileges_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php M test/libraries/PMA_user_preferences_test.php M test/libraries/rte/PMA_EVN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- Merge branch 'MAINT_4_4_6' into STABLE Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2f6d37c6886b...ef30025a0f92

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 07 May '15

07 May '15

Branch: refs/tags/RELEASE_4_4_6 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dba2af: 4.4.6 release
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/MAINT_4_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: dba2af651a53d5037296a1dc827081a94ef1062c https://github.com/phpmyadmin/phpmyadmin/commit/dba2af651a53d5037296a1dc827… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.6 release Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5cb429: 4.4.7-dev
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5cb4292e6a9fd89eb34df7e1b855e492f53e78be https://github.com/phpmyadmin/phpmyadmin/commit/5cb4292e6a9fd89eb34df7e1b85… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.7-dev Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 6bf603d47efc3ec3dbd7d67d6a718e5a1c90a0f5 https://github.com/phpmyadmin/phpmyadmin/commit/6bf603d47efc3ec3dbd7d67d6a7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Log Message: ----------- Merge branch 'QA_4_4' Commit: 73fdb59e728f592efe751bd62c45f381be7c5fa5 https://github.com/phpmyadmin/phpmyadmin/commit/73fdb59e728f592efe751bd62c4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog Log Message: ----------- 4.4.6 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6dd341f5c501...73fdb59e728f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5cb429: 4.4.7-dev
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5cb4292e6a9fd89eb34df7e1b855e492f53e78be https://github.com/phpmyadmin/phpmyadmin/commit/5cb4292e6a9fd89eb34df7e1b85… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.7-dev Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 07 May '15

07 May '15

Branch: refs/heads/MAINT_4_4_6 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 504b80: phpunit 4.2: assertTag is deprecated
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 504b80adbf7a2c614b92dbe467dcc91198f7a45a https://github.com/phpmyadmin/phpmyadmin/commit/504b80adbf7a2c614b92dbe467d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 5d9a7a748cc378351b8ec22ecd0a6bcb6836a15e https://github.com/phpmyadmin/phpmyadmin/commit/5d9a7a748cc378351b8ec22ecd0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 6dd341f5c501ba3dd54719f0794b849c28c016d4 https://github.com/phpmyadmin/phpmyadmin/commit/6dd341f5c501ba3dd54719f0794… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/PMA_central_columns_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a5398611f706...6dd341f5c501

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 504b80: phpunit 4.2: assertTag is deprecated
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 504b80adbf7a2c614b92dbe467dcc91198f7a45a https://github.com/phpmyadmin/phpmyadmin/commit/504b80adbf7a2c614b92dbe467d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9306a9: phpunit 4.2: assertTag is deprecated
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9306a93bec4179230d989e3331402b9b6526272f https://github.com/phpmyadmin/phpmyadmin/commit/9306a93bec4179230d989e33314… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 53677b8e250e98bc5310097cbbbe6c9a49b77a5f https://github.com/phpmyadmin/phpmyadmin/commit/53677b8e250e98bc5310097cbbb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 Commit: a5398611f706067cca986e545af4256ca15df898 https://github.com/phpmyadmin/phpmyadmin/commit/a5398611f706067cca986e545af… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e7ac33cb42f...a5398611f706

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9306a9: phpunit 4.2: assertTag is deprecated
by Marc Delisle 07 May '15

07 May '15

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9306a93bec4179230d989e3331402b9b6526272f https://github.com/phpmyadmin/phpmyadmin/commit/9306a93bec4179230d989e33314… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 53677b8e250e98bc5310097cbbbe6c9a49b77a5f https://github.com/phpmyadmin/phpmyadmin/commit/53677b8e250e98bc5310097cbbb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0d89755448e...53677b8e250e

1 0