Git April 2012

git@phpmyadmin.net

29 participants
532 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 648ad3: Merge pull request #12 from alexukf/small_fixes
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 648ad3ebd26ef6ee020387b034e4a6817aca306f https://github.com/phpmyadmin/phpmyadmin/commit/648ad3ebd26ef6ee020387b034e… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M Documentation.html M libraries/transformations.lib.php M libraries/transformations/TEMPLATE M libraries/transformations/application_octetstream__hex.inc.php R libraries/transformations/global.inc.php M libraries/transformations/image_jpeg__inline.inc.php M libraries/transformations/image_jpeg__link.inc.php M libraries/transformations/image_png__inline.inc.php M libraries/transformations/text_plain__dateformat.inc.php M libraries/transformations/text_plain__external.inc.php M libraries/transformations/text_plain__imagelink.inc.php M libraries/transformations/text_plain__link.inc.php M libraries/transformations/text_plain__substr.inc.php Log Message: ----------- Merge pull request #12 from alexukf/small_fixes remove global.inc.php

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4c7d3c: 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: 4c7d3c0e287a383dcc5eebb2f7915e6c72caed87 https://github.com/phpmyadmin/phpmyadmin/commit/4c7d3c0e287a383dcc5eebb2f79… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: 94eb2dd6c53c6fedeec318a81643b9798f5080d5 https://github.com/phpmyadmin/phpmyadmin/commit/94eb2dd6c53c6fedeec318a8164… 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: 67f5ba5bf3059c2afcaa0a28edf9e281c95cc4a2 https://github.com/phpmyadmin/phpmyadmin/commit/67f5ba5bf3059c2afcaa0a28edf… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: 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 Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: 14ed6393716e577a3f898497c8ae2cd834f2f814 https://github.com/phpmyadmin/phpmyadmin/commit/14ed6393716e577a3f898497c8a… 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/517aa61...14ed639

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2db8da: Merge remote-tracking branch 'origin/MAINT_3_5_0' ...
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2db8da2ef9191c2d325a3573f56777b8ebfe29d2 https://github.com/phpmyadmin/phpmyadmin/commit/2db8da2ef9191c2d325a3573f56… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 Commit: 94eb2dd6c53c6fedeec318a81643b9798f5080d5 https://github.com/phpmyadmin/phpmyadmin/commit/94eb2dd6c53c6fedeec318a8164… 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: 67f5ba5bf3059c2afcaa0a28edf9e281c95cc4a2 https://github.com/phpmyadmin/phpmyadmin/commit/67f5ba5bf3059c2afcaa0a28edf… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: 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 Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1d70667...67f5ba5

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2db8da: Merge remote-tracking branch 'origin/MAINT_3_5_0' ...
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/MAINT_3_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2db8da2ef9191c2d325a3573f56777b8ebfe29d2 https://github.com/phpmyadmin/phpmyadmin/commit/2db8da2ef9191c2d325a3573f56… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 Commit: 94eb2dd6c53c6fedeec318a81643b9798f5080d5 https://github.com/phpmyadmin/phpmyadmin/commit/94eb2dd6c53c6fedeec318a8164… 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/e7517ed...94eb2dd

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f9db7e: Merge remote-tracking branch 'origin/QA_3_4' into ...
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f9db7e790cc136b0ba7cc2af51fa3c7fccfed6a0 https://github.com/phpmyadmin/phpmyadmin/commit/f9db7e790cc136b0ba7cc2af51f… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into QA_3_4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8972ac: Verify we got string
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8972ac9c152c476bde8c538757bc443c4747f725 https://github.com/phpmyadmin/phpmyadmin/commit/8972ac9c152c476bde8c538757b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Verify we got string Commit: e7517ed26871a73a5e55c1a161f0ccbd324d6aab https://github.com/phpmyadmin/phpmyadmin/commit/e7517ed26871a73a5e55c1a161f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 1d70667bdbd204e6ec6d56b6dcbc06fed48c1dab https://github.com/phpmyadmin/phpmyadmin/commit/1d70667bdbd204e6ec6d56b6dcb… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: 7464f215aa8bf8915ff9cbca543811b89516e8c4 https://github.com/phpmyadmin/phpmyadmin/commit/7464f215aa8bf8915ff9cbca543… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Commit: 517aa612714449eab640bf6c90f702815ba8cedf https://github.com/phpmyadmin/phpmyadmin/commit/517aa612714449eab640bf6c90f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Coding style Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5b09d0f...517aa61

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8972ac: Verify we got string
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8972ac9c152c476bde8c538757bc443c4747f725 https://github.com/phpmyadmin/phpmyadmin/commit/8972ac9c152c476bde8c538757b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Verify we got string Commit: e7517ed26871a73a5e55c1a161f0ccbd324d6aab https://github.com/phpmyadmin/phpmyadmin/commit/e7517ed26871a73a5e55c1a161f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 1d70667bdbd204e6ec6d56b6dcbc06fed48c1dab https://github.com/phpmyadmin/phpmyadmin/commit/1d70667bdbd204e6ec6d56b6dcb… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/22184cd...1d70667

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8972ac: Verify we got string
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/MAINT_3_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8972ac9c152c476bde8c538757bc443c4747f725 https://github.com/phpmyadmin/phpmyadmin/commit/8972ac9c152c476bde8c538757b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Verify we got string Commit: e7517ed26871a73a5e55c1a161f0ccbd324d6aab https://github.com/phpmyadmin/phpmyadmin/commit/e7517ed26871a73a5e55c1a161f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/911c762...e7517ed

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8972ac: Verify we got string
by Michal Čihař 02 Apr '12

02 Apr '12

Branch: refs/heads/QA_3_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8972ac9c152c476bde8c538757bc443c4747f725 https://github.com/phpmyadmin/phpmyadmin/commit/8972ac9c152c476bde8c538757b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M scripts/decode_bug.php Log Message: ----------- Verify we got string

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 570e7c: Fixed spacing for inline edit link
by Jo Michael 01 Apr '12

01 Apr '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 570e7cdae87e47a3ff931d58aaacd5cd9df400d3 https://github.com/phpmyadmin/phpmyadmin/commit/570e7cdae87e47a3ff931d58aaa… Author: Jo Michael <me(a)mynetx.net> Date: 2012-04-01 (Sun, 01 Apr 2012) Changed paths: M libraries/common.lib.php Log Message: ----------- Fixed spacing for inline edit link Commit: 00b897ba34b6a948ba2187586eeae678c7b34d8a https://github.com/phpmyadmin/phpmyadmin/commit/00b897ba34b6a948ba2187586ee… Author: Jo Michael <me(a)mynetx.net> Date: 2012-04-01 (Sun, 01 Apr 2012) Changed paths: M libraries/core.lib.php M libraries/header_scripts.inc.php Log Message: ----------- Allow js_includes wrapped in IE-conditional comments Commit: 5b09d0f06650c2059e4148d1122be4a0c39d7bda https://github.com/phpmyadmin/phpmyadmin/commit/5b09d0f06650c2059e4148d1122… Author: Jo Michael <me(a)mynetx.net> Date: 2012-04-01 (Sun, 01 Apr 2012) Changed paths: M db_qbe.php M db_tracking.php M js/import.js M js/rte/common.js M libraries/Index.class.php M libraries/common.lib.php M libraries/display_import.lib.php M libraries/display_tbl.lib.php M libraries/rte/rte_list.lib.php M prefs_manage.php M tbl_select.php M tbl_structure.php M themes/original/css/theme_right.css.php M themes/pmahomme/css/theme_right.css.php Log Message: ----------- Cleanup HTML5 validity issues Compare: https://github.com/phpmyadmin/phpmyadmin/compare/844c0e5...5b09d0f

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2012