Git May 2015

git@phpmyadmin.net

29 participants
514 discussions

[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 07 May '15

07 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

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

07 May '15

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

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7134bd: Translated using Weblate (Dutch)
by Weblate 06 May '15

06 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7134bdad04dda6b5162f64f291de14964bcdee7f https://github.com/phpmyadmin/phpmyadmin/commit/7134bdad04dda6b5162f64f291d… 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% (3082 of 3082 strings) [CI skip] Commit: b5c7b6445d79cfe553c95d9616f0d7b1d8f86a69 https://github.com/phpmyadmin/phpmyadmin/commit/b5c7b6445d79cfe553c95d9616f… Author: Weblate <noreply(a)weblate.org> 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: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/96500249da1b...b5c7b6445d79

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 84e751: Translated using Weblate (Dutch)
by Marc Delisle 06 May '15

06 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin 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: 14a4ebbd7d1fa7d6ef73ebd4b419b1cab66be940 https://github.com/phpmyadmin/phpmyadmin/commit/14a4ebbd7d1fa7d6ef73ebd4b41… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-06 (Wed, 06 May 2015) Log Message: ----------- Merge commit '84e7513' Commit: 96500249da1b6b27b4b475ed8f74977db8ac9bc2 https://github.com/phpmyadmin/phpmyadmin/commit/96500249da1b6b27b4b475ed8f7… 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: ----------- Merge branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/10fcc393fb65...96500249da1b

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3e5eb6: phpunit 4.2: assertTag is deprecated
by Marc Delisle 06 May '15

06 May '15

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

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 84e751: Translated using Weblate (Dutch)
by dingo thirteen 06 May '15

06 May '15

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

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e68fdc: Translated using Weblate (Interlingua)
by Marc Delisle 06 May '15

06 May '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin 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: fdf5e7f93d147d36be0ef17163183dfcf10096d0 https://github.com/phpmyadmin/phpmyadmin/commit/fdf5e7f93d147d36be0ef171631… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-06 (Wed, 06 May 2015) Log Message: ----------- Merge commit '555bbd0' Commit: 10fcc393fb6588dd356a5bbb2557d9d42c559652 https://github.com/phpmyadmin/phpmyadmin/commit/10fcc393fb6588dd356a5bbb255… 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: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a6da0dda0e46...10fcc393fb65

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git May 2015