- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 564163: Fix coding style
by Marc Delisle 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5641638897aed4f41d1fe622a01bab961d6fb938 https://github.com/phpmyadmin/phpmyadmin/commit/5641638897aed4f41d1fe622a01… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Util.class.php Log Message: ----------- Fix coding style Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 96daf9: Use numerical value instead of possibly undefined ...
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 96daf9eea504341cda7b5e45688e9e43250ceba4 https://github.com/phpmyadmin/phpmyadmin/commit/96daf9eea504341cda7b5e45688… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/dbi/DBIDrizzle.class.php Log Message: ----------- Use numerical value instead of possibly undefined constant Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9fbabd: Backport Advisor cleanups from master
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9fbabd62029522e0100ce9eb3df382dddab7ebf0 https://github.com/phpmyadmin/phpmyadmin/commit/9fbabd62029522e0100ce9eb3df… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Backport Advisor cleanups from master Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 98f01722f80e260d046dd1136f149ab164dd2f81 https://github.com/phpmyadmin/phpmyadmin/commit/98f01722f80e260d046dd1136f1… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b38215fd0b47...98f01722f80e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9fbabd: Backport Advisor cleanups from master
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9fbabd62029522e0100ce9eb3df382dddab7ebf0 https://github.com/phpmyadmin/phpmyadmin/commit/9fbabd62029522e0100ce9eb3df… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Backport Advisor cleanups from master Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c8c77d: Translated using Weblate (Norwegian Bokmål)
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c8c77db60874710e54e5beb318077e3b2707fc9e https://github.com/phpmyadmin/phpmyadmin/commit/c8c77db60874710e54e5beb3180… Author: Erik Hepsø <hepso(a)hoved.org> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate (Norwegian Bokmål) Currently translated at 66.8% (1837 of 2749) Commit: 99b7b74040ce0b7e66c6d70cfffb5e08a6b1a4c0 https://github.com/phpmyadmin/phpmyadmin/commit/99b7b74040ce0b7e66c6d70cfff… Author: Weblate <noreply(a)weblate.org> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php M test/classes/PMA_Advisor_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 Commit: b38215fd0b473542f2ccea0df1b1a192022a5c1e https://github.com/phpmyadmin/phpmyadmin/commit/b38215fd0b473542f2ccea0df1b… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0de05db11349...b38215fd0b47

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8b2d5c: Translated using Weblate (Norwegian Bokmål)
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b2d5c4cec96cfd0ffd8595609cc552fe97cc1be https://github.com/phpmyadmin/phpmyadmin/commit/8b2d5c4cec96cfd0ffd8595609c… Author: Erik Hepsø <hepso(a)hoved.org> Date: 2014-03-13 (Thu, 13 Mar 2014) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate (Norwegian Bokmål) Currently translated at 66.4% (1828 of 2749) Commit: 199d560e8e5a74555939d2083322fe3435ca6a5e https://github.com/phpmyadmin/phpmyadmin/commit/199d560e8e5a74555939d208332… Author: Nicholas Arnesen <baretester(a)live.no> Date: 2014-03-13 (Thu, 13 Mar 2014) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate (Norwegian Bokmål) Currently translated at 66.5% (1829 of 2749) Commit: 3e83565cf22332f5968cf77ac6861e8d3bd354ed https://github.com/phpmyadmin/phpmyadmin/commit/3e83565cf22332f5968cf77ac68… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: ----------- Fix order of params to assertEquals Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3d0f2370318702b27f3a36b42ab3cb38adb727c7 https://github.com/phpmyadmin/phpmyadmin/commit/3d0f2370318702b27f3a36b42ab… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: ----------- Fix expected message to match code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 53cc186591f574299fe1951873fa9458b291b6e2 https://github.com/phpmyadmin/phpmyadmin/commit/53cc186591f574299fe1951873f… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Fixed ob_start/eval problems in phpunit When running in phpunit, the eval can raise exception, so treat it same as it would be output returned by the eval. Without catching it, output buffering gets one more level of nesting leading to occassional timeouts in Travis-CI. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7b3de5b5662560d91e778ddb1cb2bb3f99a8dfc3 https://github.com/phpmyadmin/phpmyadmin/commit/7b3de5b5662560d91e778ddb1cb… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Log Message: ----------- Merge commit '199d560e8e5a74555939d2083322fe3435ca6a5e' Commit: 0de05db1134955f79fb02096c197e464379c7f2c https://github.com/phpmyadmin/phpmyadmin/commit/0de05db1134955f79fb02096c19… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9dfe58cb3d34...0de05db11349

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c8c77d: Translated using Weblate (Norwegian Bokmål)
by Weblate 14 Mar '14

14 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c8c77db60874710e54e5beb318077e3b2707fc9e https://github.com/phpmyadmin/phpmyadmin/commit/c8c77db60874710e54e5beb3180… Author: Erik Hepsø <hepso(a)hoved.org> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M po/nb.po Log Message: ----------- Translated using Weblate (Norwegian Bokmål) Currently translated at 66.8% (1837 of 2749) Commit: 99b7b74040ce0b7e66c6d70cfffb5e08a6b1a4c0 https://github.com/phpmyadmin/phpmyadmin/commit/99b7b74040ce0b7e66c6d70cfff… Author: Weblate <noreply(a)weblate.org> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php M test/classes/PMA_Advisor_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/53cc186591f5...99b7b74040ce

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3e8356: Fix order of params to assertEquals
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e83565cf22332f5968cf77ac6861e8d3bd354ed https://github.com/phpmyadmin/phpmyadmin/commit/3e83565cf22332f5968cf77ac68… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: ----------- Fix order of params to assertEquals Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3d0f2370318702b27f3a36b42ab3cb38adb727c7 https://github.com/phpmyadmin/phpmyadmin/commit/3d0f2370318702b27f3a36b42ab… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M test/classes/PMA_Advisor_test.php Log Message: ----------- Fix expected message to match code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 53cc186591f574299fe1951873fa9458b291b6e2 https://github.com/phpmyadmin/phpmyadmin/commit/53cc186591f574299fe1951873f… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Fixed ob_start/eval problems in phpunit When running in phpunit, the eval can raise exception, so treat it same as it would be output returned by the eval. Without catching it, output buffering gets one more level of nesting leading to occassional timeouts in Travis-CI. Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/199d560e8e5a...53cc186591f5

1 0

[Phpmyadmin-git] [phpmyadmin/scripts] 10725f: Make the script name more versatile
by Michal Čihař 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 10725fd91ced083de1db741cc6dadc63c71511d5 https://github.com/phpmyadmin/scripts/commit/10725fd91ced083de1db741cc6dadc… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M hooks/README.rst A hooks/commits.php R hooks/sob.php Log Message: ----------- Make the script name more versatile Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9dfe58: Translated using Weblate (Greek)
by Panagiotis Papazoglou 14 Mar '14

14 Mar '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9dfe58cb3d3488855b77472614e9b59eb1a92b17 https://github.com/phpmyadmin/phpmyadmin/commit/9dfe58cb3d3488855b77472614e… Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: 2014-03-14 (Fri, 14 Mar 2014) Changed paths: M po/el.po Log Message: ----------- Translated using Weblate (Greek) Currently translated at 100.0% (2754 of 2754)

1 0