- Git - lists.phpmyadmin.net

[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

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 166399: bug #4891 CSV Import ignores "Replace table data w...
by Madhura Jayaratne 07 May '15

07 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin 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: 0e7ac33cb42f84e30e3fdd90951803f810a94434 https://github.com/phpmyadmin/phpmyadmin/commit/0e7ac33cb42f84e30e3fdd90951… 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 branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7199825abd4a...0e7ac33cb42f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 166399: bug #4891 CSV Import ignores "Replace table data w...
by Madhura Jayaratne 07 May '15

07 May '15

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin 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 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f7716754f4a0...a0d89755448e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 719982: Long links may be converted to forms
by Madhura Jayaratne 07 May '15

07 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7199825abd4a913e158fa7731ab3b9d17d7013a0 https://github.com/phpmyadmin/phpmyadmin/commit/7199825abd4a913e158fa7731ab… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M libraries/Util.class.php M url.php Log Message: ----------- Long links may be converted to forms Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ae4e5d: rfe #1413 Explain analyzer
by Madhura Jayaratne 07 May '15

07 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ae4e5db3761ac0bbac9586c89ce956fae0b3f01f https://github.com/phpmyadmin/phpmyadmin/commit/ae4e5db3761ac0bbac9586c89ce… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/Util.class.php M libraries/core.lib.php Log Message: ----------- rfe #1413 Explain analyzer Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1e6750: bug #4892 Undefined variable: unique_conditions
by Madhura Jayaratne 06 May '15

06 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin 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: 11893d99dc3596229e1d95e36249593fa7360655 https://github.com/phpmyadmin/phpmyadmin/commit/11893d99dc3596229e1d95e3624… 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: ----------- Merge branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b5c7b6445d79...11893d99dc35

1 0