Git April 2012

git@phpmyadmin.net

29 participants
532 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dd3c44: rfe #3507804 Session upload progress (PHP 5.4)
by Jo Michael 03 Apr '12

03 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dd3c44359190c130bf56609a0d01b97204743264 https://github.com/phpmyadmin/phpmyadmin/commit/dd3c44359190c130bf56609a0d0… Author: Jo Michael <me(a)mynetx.net> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog M libraries/display_import_ajax.lib.php A libraries/import/upload/session.php Log Message: ----------- rfe #3507804 Session upload progress (PHP 5.4)

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1dd6b7: Merge remote-tracking branch 'origin/QA_3_5' into ...
by Rouslan Placella 02 Apr '12

02 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1dd6b71a78931773894b18e57221360c8d3ac533 https://github.com/phpmyadmin/phpmyadmin/commit/1dd6b71a78931773894b18e5722… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Conflicts: ChangeLog Commit: 58c8b7662cb94eea7b4c67dcdcfb93a23d2f91a9 https://github.com/phpmyadmin/phpmyadmin/commit/58c8b7662cb94eea7b4c67dcdcf… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge branch 'QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/22f57c7...58c8b76

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f8d4f2: Revert "Fixed missing Codemirror for inline query ...
by Rouslan Placella 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8d4f21ef9aec0eed4df4d1009257b3ffbee97d5 https://github.com/phpmyadmin/phpmyadmin/commit/f8d4f21ef9aec0eed4df4d10092… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M tbl_export.php Log Message: ----------- Revert "Fixed missing Codemirror for inline query edit when exporting a result set" This reverts commit 3998a38900130f3d4de53f431e4e865e182ea638. Commit: 322ea313bc8b94f9f69bac4874d3d73b6c536e96 https://github.com/phpmyadmin/phpmyadmin/commit/322ea313bc8b94f9f69bac4874d… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M Documentation.html M po/de.po M po/es.po M po/fr.po M po/ja.po M po/lt.po M po/nl.po M po/ro.po M po/si.po M po/tr.po M scripts/decode_bug.php M tbl_export.php Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: 24726360c436efd317f58d0f7cb5ed5cc9aa315f https://github.com/phpmyadmin/phpmyadmin/commit/24726360c436efd317f58d0f7cb… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M tbl_export.php Log Message: ----------- Fixed missing Codemirror for inline query edit when exporting a result set Commit: 4c52281a93cd8eea25ee764f026d6902d4c29e8d https://github.com/phpmyadmin/phpmyadmin/commit/4c52281a93cd8eea25ee764f026… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog Log Message: ----------- Updated changelog Commit: 53d427d0b8780f11742f7f25ae97dedaeb3fabd1 https://github.com/phpmyadmin/phpmyadmin/commit/53d427d0b8780f11742f7f25ae9… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog M libraries/parse_analyze.lib.php Log Message: ----------- bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows) Conflicts: ChangeLog Commit: 24996871589eeba6d87db2e2b3b56af868ae98af https://github.com/phpmyadmin/phpmyadmin/commit/24996871589eeba6d87db2e2b3b… Author: Atul Pratap Singh <atul5(a)users.sourceforge.net> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M libraries/parse_analyze.lib.php Log Message: ----------- Fix typo introduced in 89fc70 Commit: 1dd6b71a78931773894b18e57221360c8d3ac533 https://github.com/phpmyadmin/phpmyadmin/commit/1dd6b71a78931773894b18e5722… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Conflicts: ChangeLog Compare: https://github.com/phpmyadmin/phpmyadmin/compare/49b0ce4...1dd6b71

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f8d4f2: Revert "Fixed missing Codemirror for inline query ...
by Rouslan Placella 02 Apr '12

02 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8d4f21ef9aec0eed4df4d1009257b3ffbee97d5 https://github.com/phpmyadmin/phpmyadmin/commit/f8d4f21ef9aec0eed4df4d10092… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M tbl_export.php Log Message: ----------- Revert "Fixed missing Codemirror for inline query edit when exporting a result set" This reverts commit 3998a38900130f3d4de53f431e4e865e182ea638. Commit: 322ea313bc8b94f9f69bac4874d3d73b6c536e96 https://github.com/phpmyadmin/phpmyadmin/commit/322ea313bc8b94f9f69bac4874d… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M Documentation.html M po/de.po M po/es.po M po/fr.po M po/ja.po M po/lt.po M po/nl.po M po/ro.po M po/si.po M po/tr.po M scripts/decode_bug.php M tbl_export.php Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: 24726360c436efd317f58d0f7cb5ed5cc9aa315f https://github.com/phpmyadmin/phpmyadmin/commit/24726360c436efd317f58d0f7cb… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M tbl_export.php Log Message: ----------- Fixed missing Codemirror for inline query edit when exporting a result set Commit: 4c52281a93cd8eea25ee764f026d6902d4c29e8d https://github.com/phpmyadmin/phpmyadmin/commit/4c52281a93cd8eea25ee764f026… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog Log Message: ----------- Updated changelog Commit: 64e9dd21cbb2e7c61e154edb7a83b6a2c616a6e3 https://github.com/phpmyadmin/phpmyadmin/commit/64e9dd21cbb2e7c61e154edb7a8… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_3_5' Conflicts: ChangeLog Commit: 53d427d0b8780f11742f7f25ae97dedaeb3fabd1 https://github.com/phpmyadmin/phpmyadmin/commit/53d427d0b8780f11742f7f25ae9… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog M libraries/parse_analyze.lib.php Log Message: ----------- bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows) Conflicts: ChangeLog Commit: 24996871589eeba6d87db2e2b3b56af868ae98af https://github.com/phpmyadmin/phpmyadmin/commit/24996871589eeba6d87db2e2b3b… Author: Atul Pratap Singh <atul5(a)users.sourceforge.net> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M libraries/parse_analyze.lib.php Log Message: ----------- Fix typo introduced in 89fc70 Commit: 22f57c7fca8490449f4344eacd9bf1cebdae5fc4 https://github.com/phpmyadmin/phpmyadmin/commit/22f57c7fca8490449f4344eacd9… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge branch 'QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0787ce9...22f57c7

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f8d4f2: Revert "Fixed missing Codemirror for inline query ...
by Rouslan Placella 02 Apr '12

02 Apr '12

Branch: refs/heads/MAINT_3_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8d4f21ef9aec0eed4df4d1009257b3ffbee97d5 https://github.com/phpmyadmin/phpmyadmin/commit/f8d4f21ef9aec0eed4df4d10092… Author: Rouslan Placella <rouslan(a)placella.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M tbl_export.php Log Message: ----------- Revert "Fixed missing Codemirror for inline query edit when exporting a result set" This reverts commit 3998a38900130f3d4de53f431e4e865e182ea638.

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 48c2f5: Merge remote-tracking branch 'origin/master'
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48c2f5906b9be99c8918e6a6bbf64cb110250c4d https://github.com/phpmyadmin/phpmyadmin/commit/48c2f5906b9be99c8918e6a6bbf… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M test/AllSeleniumTests.php M test/selenium/PmaSeleniumPrivilegesTest.php M test/selenium/PmaSeleniumXssTest.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: 6072fa8537bae107294bc46a8cfb6e43a1841eca https://github.com/phpmyadmin/phpmyadmin/commit/6072fa8537bae107294bc46a8cf… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate. Commit: 6158a769ea1f6522f6d6d184c8aca5223795cb4a https://github.com/phpmyadmin/phpmyadmin/commit/6158a769ea1f6522f6d6d184c8a… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate. Commit: 53df6ad399b78e9d2bd7b1948e92ca392cb4ac46 https://github.com/phpmyadmin/phpmyadmin/commit/53df6ad399b78e9d2bd7b1948e9… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 49b0ce447297d4eafe494e9809fa33752315b781 https://github.com/phpmyadmin/phpmyadmin/commit/49b0ce447297d4eafe494e9809f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: 0787ce9587270ad72f5d45b5e069ff82ec97b050 https://github.com/phpmyadmin/phpmyadmin/commit/0787ce9587270ad72f5d45b5e06… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1def297...0787ce9

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6072fa: Translated using Weblate.
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6072fa8537bae107294bc46a8cfb6e43a1841eca https://github.com/phpmyadmin/phpmyadmin/commit/6072fa8537bae107294bc46a8cf… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate. Commit: 6158a769ea1f6522f6d6d184c8aca5223795cb4a https://github.com/phpmyadmin/phpmyadmin/commit/6158a769ea1f6522f6d6d184c8a… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate. Commit: 53df6ad399b78e9d2bd7b1948e92ca392cb4ac46 https://github.com/phpmyadmin/phpmyadmin/commit/53df6ad399b78e9d2bd7b1948e9… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 49b0ce447297d4eafe494e9809fa33752315b781 https://github.com/phpmyadmin/phpmyadmin/commit/49b0ce447297d4eafe494e9809f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/67f5ba5...49b0ce4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6072fa: Translated using Weblate.
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/MAINT_3_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6072fa8537bae107294bc46a8cfb6e43a1841eca https://github.com/phpmyadmin/phpmyadmin/commit/6072fa8537bae107294bc46a8cf… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate. Commit: 6158a769ea1f6522f6d6d184c8aca5223795cb4a https://github.com/phpmyadmin/phpmyadmin/commit/6158a769ea1f6522f6d6d184c8a… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate. Commit: 53df6ad399b78e9d2bd7b1948e92ca392cb4ac46 https://github.com/phpmyadmin/phpmyadmin/commit/53df6ad399b78e9d2bd7b1948e9… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/94eb2dd...53df6ad

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6072fa: Translated using Weblate.
by Yuichiro Takahashi 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6072fa8537bae107294bc46a8cfb6e43a1841eca https://github.com/phpmyadmin/phpmyadmin/commit/6072fa8537bae107294bc46a8cf… Author: Yuichiro Takahashi <yuichiro(a)pop07.odn.ne.jp> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/ja.po Log Message: ----------- Translated using Weblate.

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1def29: PmaSeleniumPrivilegesTest and PmaSeleniumXssTest a...
by Yasitha Pandithawatta 02 Apr '12

02 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1def2973ac759205f8dab1c384c3abe9340ac455 https://github.com/phpmyadmin/phpmyadmin/commit/1def2973ac759205f8dab1c384c… Author: Yasitha Pandithawatta <yasitha4(a)gmail.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M test/AllSeleniumTests.php M test/selenium/PmaSeleniumPrivilegesTest.php M test/selenium/PmaSeleniumXssTest.php Log Message: ----------- PmaSeleniumPrivilegesTest and PmaSeleniumXssTest are fixed

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2012